diff --git a/chushang-modules/chushang-module-auth/auth-service/pom.xml b/chushang-modules/chushang-module-auth/auth-service/pom.xml
index 573053f..c3967e9 100644
--- a/chushang-modules/chushang-module-auth/auth-service/pom.xml
+++ b/chushang-modules/chushang-module-auth/auth-service/pom.xml
@@ -54,7 +54,6 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
**/application.yml
@@ -103,6 +102,37 @@
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+
+
+ src/main/resources
+
+ application.yml
+ bootstrap.yml
+ logback-nacos.xml
+
+ true
+
+
+
+
+ UTF-8
+ ${project.build.directory}/config
+
+
+
+
${project.artifactId}
diff --git a/chushang-modules/chushang-module-gateway/pom.xml b/chushang-modules/chushang-module-gateway/pom.xml
index 55300a1..73b7280 100644
--- a/chushang-modules/chushang-module-gateway/pom.xml
+++ b/chushang-modules/chushang-module-gateway/pom.xml
@@ -79,7 +79,6 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
**/application.yml
@@ -128,6 +127,37 @@
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+
+
+ src/main/resources
+
+ application.yml
+ bootstrap.yml
+ logback-nacos.xml
+
+ true
+
+
+
+
+ UTF-8
+ ${project.build.directory}/config
+
+
+
+
${project.artifactId}
diff --git a/chushang-modules/chushang-module-oss/oss-service/pom.xml b/chushang-modules/chushang-module-oss/oss-service/pom.xml
index 83aec27..49df303 100644
--- a/chushang-modules/chushang-module-oss/oss-service/pom.xml
+++ b/chushang-modules/chushang-module-oss/oss-service/pom.xml
@@ -29,7 +29,6 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
**/application.yml
@@ -78,6 +77,37 @@
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+
+
+ src/main/resources
+
+ application.yml
+ bootstrap.yml
+ logback-nacos.xml
+
+ true
+
+
+
+
+ UTF-8
+ ${project.build.directory}/config
+
+
+
+
${project.artifactId}
diff --git a/chushang-modules/chushang-module-system/system-service/pom.xml b/chushang-modules/chushang-module-system/system-service/pom.xml
index f8e41d3..dd6329c 100644
--- a/chushang-modules/chushang-module-system/system-service/pom.xml
+++ b/chushang-modules/chushang-module-system/system-service/pom.xml
@@ -33,7 +33,6 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
**/application.yml
@@ -82,6 +81,37 @@
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+
+
+ src/main/resources
+
+ application.yml
+ bootstrap.yml
+ logback-nacos.xml
+
+ true
+
+
+
+
+ UTF-8
+ ${project.build.directory}/config
+
+
+
+
${project.artifactId}
diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java
index bd15aa5..a235b4a 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java
+++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java
@@ -6,8 +6,6 @@ import com.chushang.common.core.exception.ResultException;
import com.chushang.common.core.text.Convert;
import com.chushang.common.core.util.StringUtils;
import com.chushang.common.mybatis.enums.Operator;
-import com.chushang.datascope.constants.ScopeConstants;
-import com.chushang.datascope.enums.ScopeKeyWord;
import com.chushang.system.entity.dto.ListDeptDTO;
import com.chushang.system.entity.po.SysDept;
import com.chushang.system.entity.vo.TreeSelect;
diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/application.yml b/chushang-modules/chushang-module-system/system-service/src/main/resources/application.yml
index 7ad0418..787c3f8 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/resources/application.yml
+++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/application.yml
@@ -1,7 +1,7 @@
server:
#开启优雅停机
shutdown: graceful
- port: 8085
+ port: 8084
servlet:
context-path: /system
tomcat: