From 14c4218f17d6d58f0fa530ff2204dd66aaeddb0c Mon Sep 17 00:00:00 2001
From: zhaowenyuan <zhaowenyuan@163.com>
Date: Thu, 6 Jun 2024 16:45:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=20=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chushang-module-auth/auth-service/pom.xml | 32 ++++++++++++++++++-
 .../chushang-module-gateway/pom.xml           | 32 ++++++++++++++++++-
 .../chushang-module-oss/oss-service/pom.xml   | 32 ++++++++++++++++++-
 .../system-service/pom.xml                    | 32 ++++++++++++++++++-
 .../system/service/ISysDeptService.java       |  2 --
 .../src/main/resources/application.yml        |  2 +-
 6 files changed, 125 insertions(+), 7 deletions(-)

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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <excludes>
                         <exclude>**/application.yml</exclude>
@@ -103,6 +102,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 该插件的作用是用于复制指定的文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 复制配置文件 -->
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>application.yml</include>
+                                        <include>bootstrap.yml</include>
+                                        <include>logback-nacos.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <nonFilteredFileExtensions>
+                            </nonFilteredFileExtensions>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <excludes>
                         <exclude>**/application.yml</exclude>
@@ -128,6 +127,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 该插件的作用是用于复制指定的文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 复制配置文件 -->
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>application.yml</include>
+                                        <include>bootstrap.yml</include>
+                                        <include>logback-nacos.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <nonFilteredFileExtensions>
+                            </nonFilteredFileExtensions>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <excludes>
                         <exclude>**/application.yml</exclude>
@@ -78,6 +77,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 该插件的作用是用于复制指定的文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 复制配置文件 -->
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>application.yml</include>
+                                        <include>bootstrap.yml</include>
+                                        <include>logback-nacos.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <nonFilteredFileExtensions>
+                            </nonFilteredFileExtensions>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <excludes>
                         <exclude>**/application.yml</exclude>
@@ -82,6 +81,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 该插件的作用是用于复制指定的文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 复制配置文件 -->
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>application.yml</include>
+                                        <include>bootstrap.yml</include>
+                                        <include>logback-nacos.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <nonFilteredFileExtensions>
+                            </nonFilteredFileExtensions>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
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: