Compare commits

..

No commits in common. "58c1975b05283f53831a0bdc961c2fa7fa4f0d31" and "3eb441d41c2283f29f04135ad9126d6b1e533d14" have entirely different histories.

4 changed files with 33 additions and 39 deletions

22
pom.xml
View File

@ -191,13 +191,13 @@
</manifestEntries> </manifestEntries>
</archive> </archive>
<!-- 打包时从jar包里排除资源文件 --> <!-- 打包时从jar包里排除资源文件 -->
<excludes> <!-- <excludes>-->
<!--<exclude>*.yml</exclude> <!-- <exclude>*.yml</exclude>-->
<exclude>*.xml</exclude> <!-- <exclude>*.xml</exclude>-->
<exclude>templates/**</exclude> <!-- <exclude>templates/**</exclude>-->
<exclude>win32-x86-64/**</exclude> <!-- <exclude>win32-x86-64/**</exclude>-->
<exclude>win32-x86/**</exclude>--> <!-- <exclude>win32-x86/**</exclude>-->
</excludes> <!-- </excludes>-->
<!-- 指定项目打成jar包输出位置 --> <!-- 指定项目打成jar包输出位置 -->
<outputDirectory>${project.build.directory}/output</outputDirectory> <outputDirectory>${project.build.directory}/output</outputDirectory>
</configuration> </configuration>
@ -220,7 +220,7 @@
</executions> </executions>
</plugin> </plugin>
<!--拷贝资源文件! 插件maven-jar-plugin只负责打包时排除文件 而把资源文件拷贝到外部resource目录就需要maven-dependency-plugin插件--> <!--拷贝资源文件! 插件maven-jar-plugin只负责打包时排除文件 而把资源文件拷贝到外部resource目录就需要maven-dependency-plugin插件-->
<!--<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<executions> <executions>
<execution> <execution>
@ -232,16 +232,16 @@
<configuration> <configuration>
<resources> <resources>
<resource> <resource>
&lt;!&ndash;拷贝此目录下的所有文件到指定的外部目录。只负责拷贝而不是从jar包中排除&ndash;&gt; <!--拷贝此目录下的所有文件到指定的外部目录。只负责拷贝而不是从jar包中排除-->
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
</resource> </resource>
</resources> </resources>
&lt;!&ndash; 把“<resource><directory>”指定目录中的文件输出到此处指定目录 &ndash;&gt; <!-- 把“<resource><directory>”指定目录中的文件输出到此处指定目录 -->
<outputDirectory>${project.build.directory}/output/resources</outputDirectory> <outputDirectory>${project.build.directory}/output/resources</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin>--> </plugin>
</plugins> </plugins>
</build> </build>

View File

@ -1,6 +1,3 @@
server:
port: 5946
dpkj: dpkj:
# 医保配置 # 医保配置
chs: chs:
@ -22,9 +19,4 @@ dpkj:
# 波特率 串口连接下使用 # 波特率 串口连接下使用
baud-rate: baud-rate:
# 自定义app参数
app:
custom:
lexMarkServiceIp: http://127.0.0.1
lexMarkServicePort: 12346

View File

@ -1,6 +1,3 @@
server:
port: 5946
dpkj: dpkj:
# 医保配置 # 医保配置
chs: chs:
@ -21,9 +18,3 @@ dpkj:
port-name: port-name:
# 波特率 串口连接下使用 # 波特率 串口连接下使用
baud-rate: baud-rate:
# 自定义app参数
app:
custom:
lexMarkServiceIp: http://127.0.0.1
lexMarkServicePort: 12346

View File

@ -1,4 +1,18 @@
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: server:
port: 5946
servlet: servlet:
context-path: /api context-path: /api
tomcat: tomcat:
@ -12,14 +26,11 @@ server:
min-response-size: 1024 min-response-size: 1024
mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
spring:
servlet: # 自定义app参数
multipart: app:
max-file-size: 10MB custom:
max-request-size: 10MB lexMarkServiceIp: http://127.0.0.1
resource: lexMarkServicePort: 12346
static-locations: classpath:/static/,classpath:/public/
application:
name: ems-express-bridge
profiles:
active: pro