diff --git a/pom.xml b/pom.xml
index 0f590a7..d958cce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,13 +191,13 @@
-
-
-
-
-
-
-
+
+
+
${project.build.directory}/output
@@ -220,7 +220,7 @@
-
+
+ <!–拷贝此目录下的所有文件到指定的外部目录。只负责拷贝,而不是从jar包中排除!–>
src/main/resources
-
+ <!– 把“”指定目录中的文件输出到此处指定目录 –>
${project.build.directory}/output/resources
-
+ -->
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