From 906928ea0f3dfc99546caee6ed27b54a1be275ee Mon Sep 17 00:00:00 2001
From: xiaodaozi <xuexuande@126.com>
Date: Wed, 26 Mar 2025 14:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                | 12 +++++-----
 src/main/resources/application-dev.yml |  8 +++++++
 src/main/resources/application-pro.yml |  9 +++++++
 src/main/resources/application.yml     | 33 +++++++++-----------------
 4 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3edf6c6..d958cce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,11 +192,11 @@
                     </archive>
                     <!-- 打包时从jar包里排除资源文件 -->
                     <excludes>
-                        <exclude>*.yml</exclude>
+                        <!--<exclude>*.yml</exclude>
                         <exclude>*.xml</exclude>
                         <exclude>templates/**</exclude>
                         <exclude>win32-x86-64/**</exclude>
-                        <exclude>win32-x86/**</exclude>
+                        <exclude>win32-x86/**</exclude>-->
                     </excludes>
                     <!-- 指定项目打成jar包输出位置 -->
                     <outputDirectory>${project.build.directory}/output</outputDirectory>
@@ -220,7 +220,7 @@
                 </executions>
             </plugin>
             <!--拷贝资源文件！ 插件maven-jar-plugin只负责打包时排除文件， 而把资源文件拷贝到外部resource目录就需要maven-dependency-plugin插件-->
-            <plugin>
+            <!--<plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -232,16 +232,16 @@
                         <configuration>
                             <resources>
                                 <resource>
-                                    <!--拷贝此目录下的所有文件到指定的外部目录。只负责拷贝，而不是从jar包中排除！-->
+                                    &lt;!&ndash;拷贝此目录下的所有文件到指定的外部目录。只负责拷贝，而不是从jar包中排除！&ndash;&gt;
                                     <directory>src/main/resources</directory>
                                 </resource>
                             </resources>
-                            <!-- 把“<resource><directory>”指定目录中的文件输出到此处指定目录 -->
+                            &lt;!&ndash; 把“<resource><directory>”指定目录中的文件输出到此处指定目录 &ndash;&gt;
                             <outputDirectory>${project.build.directory}/output/resources</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a550450..d9f2fe8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,3 +1,6 @@
+server:
+  port: 5946
+
 dpkj:
   # 医保配置
   chs:
@@ -19,4 +22,9 @@ dpkj:
     # 波特率 串口连接下使用
     baud-rate:
 
+# 自定义app参数
+app:
+  custom:
+    lexMarkServiceIp: http://127.0.0.1
+    lexMarkServicePort: 12346
 
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 7ff80e7..80e656d 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,3 +1,6 @@
+server:
+  port: 5946
+
 dpkj:
   # 医保配置
   chs:
@@ -18,3 +21,9 @@ dpkj:
     port-name:
     # 波特率 串口连接下使用
     baud-rate:
+
+# 自定义app参数
+app:
+  custom:
+    lexMarkServiceIp: http://127.0.0.1
+    lexMarkServicePort: 12346
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index df769d9..a7109ea 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,4 @@
-spring:
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  application:
-    name: ems-express-bridge
-  profiles:
-    #active: '@profile.name@'
-    active: pro
-
 server:
-  port: 5946
   servlet:
     context-path: /api
   tomcat:
@@ -26,11 +12,14 @@ server:
     min-response-size: 1024
     mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 
-
-# 自定义app参数
-app:
-  custom:
-    lexMarkServiceIp: http://127.0.0.1
-    lexMarkServicePort: 12346
-
-
+spring:
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  application:
+    name: ems-express-bridge
+  profiles:
+    active: pro