From 5bbd3b728d7aa46dd8e023c97275ae72a0ae5a7b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 8 Jul 2022 10:51:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E8=BF=81=E7=A7=BB=E5=88=B0tomcat=E7=9A=84logs?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-pro.properties | 34 ++++++++----------- .../resources/application-test1.properties | 4 --- .../resources/application-test2.properties | 4 --- .../src/main/resources/logback-spring.xml | 2 +- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index f1454161..db6a4274 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -1,4 +1,4 @@ -# 本地环境 +# \u672C\u5730\u73AF\u5883 server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true @@ -15,39 +15,35 @@ 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 logging.level.com.glxp.api.admin.erp.second=debug -#logback配置 -logging.path=output/logs -# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 -#logging.file=D:/udi.log file_path=D:/udi/udiwms/udiwmsfile/ #file_path=/home/glxp/udiwms -#UDI数据下载 +#UDI\u6570\u636E\u4E0B\u8F7D UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs -#中转服务IP地址 +#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740 #SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER SPSYNC_IP=http://127.0.0.1:9989 #SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER #UDI_SERVER_URL=http://127.0.0.1:9995 -##端口号 -# Redis数据库索引（默认为0） +##\u7AEF\u53E3\u53F7 +# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09 spring.redis.database=8 -# Redis服务器地址 +# Redis\u670D\u52A1\u5668\u5730\u5740 spring.redis.host=127.0.0.1 -# Redis服务器连接端口 +# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3 spring.redis.port=6379 -# Redis服务器连接密码（默认为空） +# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 spring.redis.password= -#连接池最大连接数（使用负值表示没有限制） +#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 spring.redis.jedis.pool.max-active=8 -# 连接池最大阻塞等待时间（使用负值表示没有限制） +# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 spring.redis.jedis.pool.max-wait=-1 -# 连接池中的最大空闲连接 +# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5 spring.redis.jedis.pool.max-idle=8 -# 连接池中的最小空闲连接 +# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5 spring.redis.jedis.pool.min-idle=0 -# 连接超时时间（毫秒） +# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 spring.redis.jedis.timeout=300 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 @@ -58,9 +54,9 @@ spring.servlet.multipart.max-request-size=500MB ok.http.connect-timeout=3000 ok.http.read-timeout=3000 ok.http.write-timeout=3000 -# 连接池中整体的空闲连接的最大数量 +# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF ok.http.max-idle-connections=200 -# 连接空闲时间最多为 300 秒 +# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2 ok.http.keep-alive-duration=300 diff --git a/api-admin/src/main/resources/application-test1.properties b/api-admin/src/main/resources/application-test1.properties index 9d629cbd..f18b22f5 100644 --- a/api-admin/src/main/resources/application-test1.properties +++ b/api-admin/src/main/resources/application-test1.properties @@ -15,10 +15,6 @@ 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 logging.level.com.glxp.api.admin.erp.second=debug -#logback\u914D\u7F6E -logging.path=output/logs -# \u4E0D\u6307\u5B9A\u7684\u60C5\u51B5\u4E0B\u9ED8\u8BA4\u751F\u6210\u5728\u9879\u76EE\u6839\u76EE\u5F55\uFF0C\u6309\u7167\u914D\u7F6E\u751F\u6210\u6240\u9700\u7684\u65E5\u5FD7\u540D\u79F0 -#logging.file=D:/udi.log file_path=D:/udi/udiwms/udiwmsfile/ #file_path=/home/glxp/udiwms #UDI\u6570\u636E\u4E0B\u8F7D diff --git a/api-admin/src/main/resources/application-test2.properties b/api-admin/src/main/resources/application-test2.properties index 202f6c6b..530aa472 100644 --- a/api-admin/src/main/resources/application-test2.properties +++ b/api-admin/src/main/resources/application-test2.properties @@ -15,10 +15,6 @@ 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 logging.level.com.glxp.api.admin.erp.second=debug -#logback\u914D\u7F6E -logging.path=output/logs -# \u4E0D\u6307\u5B9A\u7684\u60C5\u51B5\u4E0B\u9ED8\u8BA4\u751F\u6210\u5728\u9879\u76EE\u6839\u76EE\u5F55\uFF0C\u6309\u7167\u914D\u7F6E\u751F\u6210\u6240\u9700\u7684\u65E5\u5FD7\u540D\u79F0 -#logging.file=D:/udi.log file_path=D:/udi/udiwms/udiwmsfile/ #file_path=/home/glxp/udiwms #UDI\u6570\u636E\u4E0B\u8F7D diff --git a/api-admin/src/main/resources/logback-spring.xml b/api-admin/src/main/resources/logback-spring.xml index c55aa8ae..387321d4 100644 --- a/api-admin/src/main/resources/logback-spring.xml +++ b/api-admin/src/main/resources/logback-spring.xml @@ -3,7 +3,7 @@ logback - +