UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fencang' into fencang

Browse Source
fencang
anthonyywj2 3 years ago
parent 5260230999 966b9614e8
commit 36ca7a852e
4 changed files with 183 additions and 6 deletions
Show Stats Download Patch File Download Diff File

38
api-admin/pom.xml
Unescape Escape View File

@ -307,11 +307,11 @@
<finalName>SPMS_SERVER</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
@ -340,8 +340,42 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<!--生产-->
<id>pro</id>
<properties>
<profiles.active>pro</profiles.active>
</properties>
<!--是否默认，默认打包开发环境配置-->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!--开发-->
<id>dev</id>
<properties>
<profiles.active>dev</profiles.active>
</properties>
</profile>
<profile>
<!--测试1-->
<id>test1</id>
<properties>
<profiles.active>test1</profiles.active>
</properties>
</profile>
<profile>
<!--测试2-->
<id>test2</id>
<properties>
<profiles.active>test2</profiles.active>
</properties>
</profile>
</profiles>
</project>

72
api-admin/src/main/resources/application-dev.properties
Unescape Escape View File

@ -0,0 +1,72 @@
# \u751F\u4EA7\u73AF\u5883
server.port=9996
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=root
#spring.datasource.password=123456
spring.datasource.hikari.connection-timeout=60000
spring.datasource.hikari.maximum-pool-size=60
spring.datasource.hikari.minimum-idle=10
#server.servlet.context-path=
#logging.level.com.glxp.sale.admin.dao=debug
# \u8DE8\u57DF\u8BBE\u7F6E
cors.allowed-origins=*
cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN
cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS
cors.allowed-Credentials=true
#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6
server.tomcat.max-http-form-post-size=100MB
server.max-http-header-size=100MB
#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB)
spring.servlet.multipart.max-file-size=200MB
spring.servlet.multipart.max-request-size=200MB
server.connectionTimeout=180000
logging.level.com.glxp.sale.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
# \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002
logging.file=D:/glxpdata/udiwms/udiwms.log
#file_path=/home/glxpdata/udiwms
file_path=D:/glxpdata/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=http://127.0.0.1:9994
#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
#UCLOD\u670D\u52A1
#UCLOD_SERVER_URL=http://127.0.0.1:9997
#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER
UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER
#mips\u670D\u52A1\u5730\u5740
UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server
#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997
UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query"
#\u534F\u8C03\u5E73\u53F0\u5BA2\u6237\u7AEF\u5730\u5740
COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload
#\u5185\u5B58\u7801\u751F\u6210
STOCK_PRINT_POST=http://139.159.187.130/UDI_WMS_MC/udiwms/stockprint/post
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
spring.main.allow-bean-definition-overriding=true
# Redis \u6570\u636E\u5E93\u7F16\u53F7
spring.redis.database=4
# Redis \u670D\u52A1\u5668IP
spring.redis.host=127.0.0.1
# Redis \u7AEF\u53E3\u53F7
spring.redis.port=6379
# Redis \u5BC6\u7801
spring.redis.password=
#\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570
spring.redis.jedis.pool.max-active=8
#\u6700\u5927\u7B49\u5F85\u65F6\u95F4
spring.redis.jedis.pool.max-wait=-1
#\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\u6570
spring.redis.jedis.pool.max-idle=8
#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570
spring.redis.jedis.pool.min-idle=0

8
api-admin/src/main/resources/application-test.properties → api-admin/src/main/resources/application-test1.properties
Unescape Escape View File

@ -1,9 +1,9 @@
# \u751F\u4EA7\u73AF\u5883
server.port=9996
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3360/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.password=root
spring.datasource.hikari.connection-timeout=60000
spring.datasource.hikari.maximum-pool-size=60
spring.datasource.hikari.minimum-idle=10
@ -56,9 +56,9 @@ spring.main.allow-bean-definition-overriding=true
# Redis \u6570\u636E\u5E93\u7F16\u53F7
spring.redis.database=4
# Redis \u670D\u52A1\u5668IP
spring.redis.host=127.0.0.1
spring.redis.host=192.168.0.66
# Redis \u7AEF\u53E3\u53F7
spring.redis.port=6379
spring.redis.port=6400
# Redis \u5BC6\u7801
spring.redis.password=
#\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570

71
api-admin/src/main/resources/application-test2.properties
Unescape Escape View File

@ -0,0 +1,71 @@
# \u751F\u4EA7\u73AF\u5883
server.port=9996
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3361/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=root
spring.datasource.hikari.connection-timeout=60000
spring.datasource.hikari.maximum-pool-size=60
spring.datasource.hikari.minimum-idle=10
#server.servlet.context-path=
#logging.level.com.glxp.sale.admin.dao=debug
# \u8DE8\u57DF\u8BBE\u7F6E
cors.allowed-origins=*
cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN
cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS
cors.allowed-Credentials=true
#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6
server.tomcat.max-http-form-post-size=100MB
server.max-http-header-size=100MB
#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB)
spring.servlet.multipart.max-file-size=200MB
spring.servlet.multipart.max-request-size=200MB
server.connectionTimeout=180000
logging.level.com.glxp.sale.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
# \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002
logging.file=D:/glxpdata/udiwms/udiwms.log
#file_path=/home/glxpdata/udiwms
file_path=D:/glxpdata/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=http://127.0.0.1:9994
#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
#UCLOD\u670D\u52A1
#UCLOD_SERVER_URL=http://127.0.0.1:9997
#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER
UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER
#mips\u670D\u52A1\u5730\u5740
UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server
#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997
UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query"
#\u534F\u8C03\u5E73\u53F0\u5BA2\u6237\u7AEF\u5730\u5740
COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload
#\u5185\u5B58\u7801\u751F\u6210
STOCK_PRINT_POST=http://139.159.187.130/UDI_WMS_MC/udiwms/stockprint/post
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
spring.main.allow-bean-definition-overriding=true
# Redis \u6570\u636E\u5E93\u7F16\u53F7
spring.redis.database=4
# Redis \u670D\u52A1\u5668IP
spring.redis.host=192.168.0.66
# Redis \u7AEF\u53E3\u53F7
spring.redis.port=6401
# Redis \u5BC6\u7801
spring.redis.password=
#\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570
spring.redis.jedis.pool.max-active=8
#\u6700\u5927\u7B49\u5F85\u65F6\u95F4
spring.redis.jedis.pool.max-wait=-1
#\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\u6570
spring.redis.jedis.pool.max-idle=8
#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570
spring.redis.jedis.pool.min-idle=0
Write Preview
Loading…
Cancel
Save