diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index 7cd528010..32419158f 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -78,10 +78,6 @@
mysql
mysql-connector-java
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
org.springframework.boot
diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml
index 89154956b..21e1f7041 100644
--- a/pigx-common/pigx-common-security/pom.xml
+++ b/pigx-common/pigx-common-security/pom.xml
@@ -45,6 +45,10 @@
org.springframework.cloud
spring-cloud-starter-security
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+
com.pig4cloud
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/EnablePigxFeignClients.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/EnablePigxFeignClients.java
index db8d46698..24e1901ec 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/EnablePigxFeignClients.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/EnablePigxFeignClients.java
@@ -17,8 +17,6 @@
package com.pig4cloud.pigx.common.security.feign;
-import com.pig4cloud.pigx.admin.api.feign.RemoteLogService;
-import com.pig4cloud.pigx.admin.api.feign.RemoteUserService;
import org.springframework.cloud.openfeign.EnableFeignClients;
import java.lang.annotation.*;
@@ -51,7 +49,7 @@ public @interface EnablePigxFeignClients {
*
* @return the array of 'basePackages'.
*/
- String[] basePackages() default {};
+ String[] basePackages() default {"com.pig4cloud.pigx"};
/**
* Type-safe alternative to {@link #basePackages()} for specifying the packages to
@@ -78,5 +76,5 @@ public @interface EnablePigxFeignClients {
*
* @return
*/
- Class>[] clients() default {RemoteUserService.class, RemoteLogService.class};
+ Class>[] clients() default {};
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java
index 63f4cd797..98798244d 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java
@@ -90,9 +90,7 @@ public class OauthClientDetailsController {
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('sys_client_del')")
public R delete(@PathVariable String id) {
- SysOauthClientDetails sysOauthClientDetails = new SysOauthClientDetails();
- sysOauthClientDetails.setClientId(id);
- return new R<>(sysOauthClientDetailsService.deleteById(sysOauthClientDetails));
+ return new R<>(sysOauthClientDetailsService.deleteClientDetailsById(id));
}
/**
@@ -104,6 +102,6 @@ public class OauthClientDetailsController {
@PutMapping
@PreAuthorize("@pms.hasPermission('sys_client_edit')")
public R edit(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) {
- return new R<>(sysOauthClientDetailsService.updateById(sysOauthClientDetails));
+ return new R<>(sysOauthClientDetailsService.updateClientDetailsById(sysOauthClientDetails));
}
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java
index 0e1aaf999..df81a1012 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java
@@ -32,4 +32,19 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails;
*/
public interface SysOauthClientDetailsService extends IService {
+ /**
+ * 通过ID删除客户端
+ *
+ * @param id
+ * @return
+ */
+ Boolean deleteClientDetailsById(String id);
+
+ /**
+ * 根据客户端信息
+ *
+ * @param sysOauthClientDetails
+ * @return
+ */
+ Boolean updateClientDetailsById(SysOauthClientDetails sysOauthClientDetails);
}
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 7ed8a5280..aa496916e 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
@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails;
import com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper;
import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService;
+import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
/**
@@ -36,4 +38,27 @@ import org.springframework.stereotype.Service;
@Service
public class SysOauthClientDetailsServiceImpl extends ServiceImpl implements SysOauthClientDetailsService {
+ /**
+ * 通过ID删除客户端
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ @CacheEvict(value = SecurityConstants.CLIENT_DETAILS_KEY, key = "#id")
+ public Boolean deleteClientDetailsById(String id) {
+ return this.deleteById(id);
+ }
+
+ /**
+ * 根据客户端信息
+ *
+ * @param clientDetails
+ * @return
+ */
+ @Override
+ @CacheEvict(value = SecurityConstants.CLIENT_DETAILS_KEY, key = "#clientDetails.clientId")
+ public Boolean updateClientDetailsById(SysOauthClientDetails clientDetails) {
+ return this.updateById(clientDetails);
+ }
}