diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index c70900d14..f67265eea 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -68,6 +68,10 @@
mysql
mysql-connector-java
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+
org.springframework.boot
diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
index c13da06a6..2d2c15907 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
@@ -20,7 +20,7 @@
package com.pig4cloud.pigx.auth.config;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
-import com.pig4cloud.pigx.common.security.compoent.PigxWebResponseExceptionTranslator;
+import com.pig4cloud.pigx.common.security.component.PigxWebResponseExceptionTranslator;
import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml
index 73d9d7df3..aed68dfa4 100644
--- a/pigx-auth/src/main/resources/bootstrap.yml
+++ b/pigx-auth/src/main/resources/bootstrap.yml
@@ -21,6 +21,3 @@ eureka:
client:
service-url:
defaultZone: http://pig:pig@localhost:1025/eureka/
-logging:
- level:
- root: debug
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PermissionService.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PermissionService.java
similarity index 97%
rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PermissionService.java
rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PermissionService.java
index 1c42a2812..4235477b3 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PermissionService.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PermissionService.java
@@ -17,7 +17,7 @@
*
*/
-package com.pig4cloud.pigx.common.security.compoent;
+package com.pig4cloud.pigx.common.security.component;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PigAccessDeniedHandler.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigAccessDeniedHandler.java
similarity index 98%
rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PigAccessDeniedHandler.java
rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigAccessDeniedHandler.java
index 406021199..c1a01fd20 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PigAccessDeniedHandler.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigAccessDeniedHandler.java
@@ -17,7 +17,7 @@
*
*/
-package com.pig4cloud.pigx.common.security.compoent;
+package com.pig4cloud.pigx.common.security.component;
/**
* @author lengleng
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PigxWebResponseExceptionTranslator.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java
similarity index 98%
rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PigxWebResponseExceptionTranslator.java
rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java
index 0aa33d6f2..f5beabd98 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/PigxWebResponseExceptionTranslator.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java
@@ -15,7 +15,7 @@
* Author: lengleng (wangiegie@gmail.com)
*/
-package com.pig4cloud.pigx.common.security.compoent;
+package com.pig4cloud.pigx.common.security.component;
import com.pig4cloud.pigx.common.security.exception.*;
import lombok.extern.slf4j.Slf4j;
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/ResourceAuthExceptionEntryPoint.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/ResourceAuthExceptionEntryPoint.java
similarity index 97%
rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/ResourceAuthExceptionEntryPoint.java
rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/ResourceAuthExceptionEntryPoint.java
index 33d2252bf..41640faf3 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/compoent/ResourceAuthExceptionEntryPoint.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/ResourceAuthExceptionEntryPoint.java
@@ -15,7 +15,7 @@
* Author: lengleng (wangiegie@gmail.com)
*/
-package com.pig4cloud.pigx.common.security.compoent;
+package com.pig4cloud.pigx.common.security.component;
import cn.hutool.http.HttpStatus;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories
index caa397bbd..64b3001e9 100644
--- a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories
+++ b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,5 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- com.pig4cloud.pigx.common.security.compoent.PermissionService,\
- com.pig4cloud.pigx.common.security.compoent.PigAccessDeniedHandler,\
- com.pig4cloud.pigx.common.security.compoent.ResourceAuthExceptionEntryPoint,\
+ com.pig4cloud.pigx.common.security.component.PermissionService,\
+ com.pig4cloud.pigx.common.security.component.PigAccessDeniedHandler,\
+ com.pig4cloud.pigx.common.security.component.ResourceAuthExceptionEntryPoint,\
com.pig4cloud.pigx.common.security.interceptor.PigxFeignClientIntercept
diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml
index b2d2dface..e50f69f8a 100644
--- a/pigx-upms/pigx-upms-api/pom.xml
+++ b/pigx-upms/pigx-upms-api/pom.xml
@@ -38,8 +38,9 @@
com.baomidou
- mybatis-plus-boot-starter
+ mybatis-plus
${mbp.boot.version}
+ compile
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index 0f754dba0..5c9727afc 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -74,6 +74,12 @@
spring-boot-admin-starter-client
${monitor.version}
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mbp.boot.version}
+
mysql
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java
index eaa1d9aad..b5fe5d4d3 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java
@@ -19,8 +19,8 @@
package com.pig4cloud.pigx.admin.config;
-import com.pig4cloud.pigx.common.security.compoent.PigAccessDeniedHandler;
-import com.pig4cloud.pigx.common.security.compoent.ResourceAuthExceptionEntryPoint;
+import com.pig4cloud.pigx.common.security.component.PigAccessDeniedHandler;
+import com.pig4cloud.pigx.common.security.component.ResourceAuthExceptionEntryPoint;
import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;