From 1305507bf4659fbd03924dfea7ae55b2aa7e88a2 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 22 Aug 2020 22:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E8=AE=BE=E7=BD=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=98=8E=E6=96=87=E5=AE=89=E5=85=A8=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysClientDetailsController.java | 3 --- .../ruoyi/system/domain/SysClientDetails.java | 16 ++++++++++++++++ .../impl/SysClientDetailsServiceImpl.java | 3 +++ .../mapper/system/SysClientDetailsMapper.xml | 6 +++++- ruoyi-ui/src/views/system/client/index.vue | 8 ++++---- sql/ry_20200822.sql | 5 +++-- 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysClientDetailsController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysClientDetailsController.java index 5db6117..b6f21a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysClientDetailsController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysClientDetailsController.java @@ -17,7 +17,6 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysClientDetails; import com.ruoyi.system.service.ISysClientDetailsService; @@ -68,7 +67,6 @@ public class SysClientDetailsController extends BaseController { return AjaxResult.error("新增终端'" + clientId + "'失败，编号已存在"); } - sysClientDetails.setClientSecret(SecurityUtils.encryptPassword(sysClientDetails.getClientSecret())); return toAjax(sysClientDetailsService.insertSysClientDetails(sysClientDetails)); } @@ -80,7 +78,6 @@ public class SysClientDetailsController extends BaseController @PutMapping public AjaxResult edit(@RequestBody SysClientDetails sysClientDetails) { - sysClientDetails.setClientSecret(SecurityUtils.encryptPassword(sysClientDetails.getClientSecret())); return toAjax(sysClientDetailsService.updateSysClientDetails(sysClientDetails)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientDetails.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientDetails.java index 0606f85..b16c652 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientDetails.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientDetails.java @@ -68,6 +68,11 @@ public class SysClientDetails extends BaseEntity */ private String autoapprove; + /** + * 终端明文安全码 + */ + private String originSecret; + public String getClientId() { return clientId; @@ -178,6 +183,16 @@ public class SysClientDetails extends BaseEntity this.autoapprove = autoapprove; } + public String getOriginSecret() + { + return originSecret; + } + + public void setOriginSecret(String originSecret) + { + this.originSecret = originSecret; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -192,6 +207,7 @@ public class SysClientDetails extends BaseEntity .append("refreshTokenValidity", getRefreshTokenValidity()) .append("additionalInformation", getAdditionalInformation()) .append("autoapprove", getAutoapprove()) + .append("originSecret", getOriginSecret()) .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClientDetailsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClientDetailsServiceImpl.java index 383078d..4449dfd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClientDetailsServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysClientDetailsServiceImpl.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.CacheConstants; +import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysClientDetails; import com.ruoyi.system.mapper.SysClientDetailsMapper; import com.ruoyi.system.service.ISysClientDetailsService; @@ -53,6 +54,7 @@ public class SysClientDetailsServiceImpl implements ISysClientDetailsService @Override public int insertSysClientDetails(SysClientDetails sysClientDetails) { + sysClientDetails.setClientSecret(SecurityUtils.encryptPassword(sysClientDetails.getOriginSecret())); return sysClientDetailsMapper.insertSysClientDetails(sysClientDetails); } @@ -66,6 +68,7 @@ public class SysClientDetailsServiceImpl implements ISysClientDetailsService @CacheEvict(value = CacheConstants.CLIENT_DETAILS_KEY, key = "#sysClientDetails.clientId") public int updateSysClientDetails(SysClientDetails sysClientDetails) { + sysClientDetails.setClientSecret(SecurityUtils.encryptPassword(sysClientDetails.getOriginSecret())); return sysClientDetailsMapper.updateSysClientDetails(sysClientDetails); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientDetailsMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientDetailsMapper.xml index 8a07159..dfe0061 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientDetailsMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientDetailsMapper.xml @@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove from sys_oauth_client_details + select client_id, resource_ids, client_secret, scope, authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, refresh_token_validity, additional_information, autoapprove, origin_secret from sys_oauth_client_details