From c28562847cac651343c553aaf956fa790794a385 Mon Sep 17 00:00:00 2001
From: yuanly <its123>
Date: Sat, 28 May 2022 21:53:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=96=B0=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AFbug=E4=BF=AE=E5=A4=8D=EF=BC=9B=202=E3=80=81=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=97=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/SysClientController.java |  1 +
 .../SysOauthClientDetailsServiceImpl.java     | 53 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java
index 5c2564ee5..ad504283a 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java
@@ -129,6 +129,7 @@ public class SysClientController {
 	 * 同步缓存字典
 	 * @return R
 	 */
+	@Inner(false)
 	@SysLog("同步终端")
 	@PutMapping("/sync")
 	public R sync() {
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
index fca40e2c3..1ed1f97e5 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
@@ -79,6 +79,28 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
 	@Override
 	@CacheEvict(value = CacheConstants.CLIENT_DETAILS_KEY, key = "#clientDetailsDTO.clientId")
 	public Boolean updateClientById(SysOauthClientDetailsDTO clientDetailsDTO) {
+		this.insertOrUpdate(clientDetailsDTO);
+		return Boolean.TRUE;
+	}
+
+	/**
+	 * 添加客户端
+	 * @param clientDetailsDTO
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean saveClient(SysOauthClientDetailsDTO clientDetailsDTO) {
+		this.insertOrUpdate(clientDetailsDTO);
+		return Boolean.TRUE;
+	}
+
+	/**
+	 * 插入或更新客户端对象
+	 * @param clientDetailsDTO
+	 * @return
+	 */
+	private SysOauthClientDetails insertOrUpdate(SysOauthClientDetailsDTO clientDetailsDTO){
 		// copy dto 对象
 		SysOauthClientDetails clientDetails = new SysOauthClientDetails();
 		BeanUtils.copyProperties(clientDetailsDTO, clientDetails);
@@ -92,35 +114,10 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
 		clientDetails.setAdditionalInformation(informationObj.toString());
 
 		// 更新数据库
-		baseMapper.updateById(clientDetails);
+		saveOrUpdate(clientDetails);
 		// 更新Redis
 		SpringContextHolder.publishEvent(new ClientDetailsInitRunner.ClientDetailsInitEvent(clientDetails));
-		return Boolean.TRUE;
-	}
-
-	/**
-	 * 添加客户端
-	 * @param clientDetailsDTO
-	 * @return
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean saveClient(SysOauthClientDetailsDTO clientDetailsDTO) {
-		// copy dto 对象
-		SysOauthClientDetails clientDetails = new SysOauthClientDetails();
-		BeanUtils.copyProperties(clientDetailsDTO, clientDetails);
-
-		// 获取扩展信息,插入开关相关
-		String information = clientDetailsDTO.getAdditionalInformation();
-		JSONUtil.parseObj(information).set(CommonConstants.CAPTCHA_FLAG, clientDetailsDTO.getCaptchaFlag())
-				.set(CommonConstants.ENC_FLAG, clientDetailsDTO.getEncFlag())
-				.set(CommonConstants.ONLINE_QUANTITY, clientDetailsDTO.getOnlineQuantity());
-
-		// 插入数据
-		this.baseMapper.insert(clientDetails);
-		// 更新Redis
-		SpringContextHolder.publishEvent(new ClientDetailsInitRunner.ClientDetailsInitEvent(clientDetails));
-		return Boolean.TRUE;
+		return clientDetails;
 	}
 
 	/**
@@ -156,6 +153,8 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
 	@Override
 	@CacheEvict(value = CacheConstants.CLIENT_DETAILS_KEY, allEntries = true)
 	public R syncClientCache() {
+		// 更新Redis
+		SpringContextHolder.publishEvent(new ClientDetailsInitRunner.ClientDetailsInitEvent(this));
 		return R.ok();
 	}