From 1e978a61f7db38474a585f2159b12f9331c6234b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 24 Oct 2018 15:33:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82pigxclientdetails=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SysOauthClientDetailsService.java | 15 +++++++++++ .../SysOauthClientDetailsServiceImpl.java | 25 +++++++++++++++++++ 2 files changed, 40 insertions(+) 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); + } } From 474de50460dbd5568fd111c41149199f69814bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 24 Oct 2018 15:34:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82pigxclientdetails=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/controller/OauthClientDetailsController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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)); } } From d709e1a6ce8128a2384ffe7b281cc2a40f0040d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 24 Oct 2018 15:35:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96pom=20=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-auth/pom.xml | 4 ---- pigx-common/pigx-common-security/pom.xml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 84db1e3dd..ac2634a4c 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -72,10 +72,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 From 96631b8195e907ac0e6ba1752e311f743fcdbc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 24 Oct 2018 21:30:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96feign=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/security/feign/EnablePigxFeignClients.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 {}; }