From 66c3f1af6f0007cc732412cc2a7bca7a5b603768 Mon Sep 17 00:00:00 2001 From: liupopo Date: Thu, 26 Oct 2023 09:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-devv.yml | 7 +------ .../wh-manage-xxs/src/main/resources/application-pro.yml | 7 +------ .../src/main/resources/application-test.yml | 2 -- .../wh-manage-xxs/src/main/resources/application.yml | 9 +++++---- .../wh-manage-xxs/src/main/resources/logback-spring.xml | 2 +- 5 files changed, 8 insertions(+), 19 deletions(-) diff --git a/warehousing-system/project/wh-manage-xxs/src/main/resources/application-devv.yml b/warehousing-system/project/wh-manage-xxs/src/main/resources/application-devv.yml index 4a4292aa..2452c5ad 100644 --- a/warehousing-system/project/wh-manage-xxs/src/main/resources/application-devv.yml +++ b/warehousing-system/project/wh-manage-xxs/src/main/resources/application-devv.yml @@ -1,14 +1,9 @@ spring: resources: static-locations: file:D://supervise - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 datasource: url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true username: root - #password: 1LAiGz$t1*Iw password: root redis: database: 3 # Redis数据库索引（默认为0） @@ -19,6 +14,6 @@ spring: max-idle: 8 #连接池中的最大空闲连接 max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 + password: port: 6379 timeout: 0 # 连接超时时间（毫秒） \ No newline at end of file diff --git a/warehousing-system/project/wh-manage-xxs/src/main/resources/application-pro.yml b/warehousing-system/project/wh-manage-xxs/src/main/resources/application-pro.yml index 6c9039d5..d0d738c1 100644 --- a/warehousing-system/project/wh-manage-xxs/src/main/resources/application-pro.yml +++ b/warehousing-system/project/wh-manage-xxs/src/main/resources/application-pro.yml @@ -1,15 +1,10 @@ spring: resources: static-locations: file:D://supervise - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 datasource: - url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true + url: jdbc:mysql://127.0.0.1:3306/warehouse_xxs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true username: root password: 1LAiGz$t1*Iw - #password: root redis: database: 3 # Redis数据库索引（默认为0） diff --git a/warehousing-system/project/wh-manage-xxs/src/main/resources/application-test.yml b/warehousing-system/project/wh-manage-xxs/src/main/resources/application-test.yml index 2bf78373..aeb9593c 100644 --- a/warehousing-system/project/wh-manage-xxs/src/main/resources/application-test.yml +++ b/warehousing-system/project/wh-manage-xxs/src/main/resources/application-test.yml @@ -1,12 +1,10 @@ spring: resources: static-locations: file:D://supervise - datasource: url: jdbc:mysql://39.104.100.138:3306/warehouse_xxs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true username: root password: yxt_mysql_138 - #password: root redis: database: 3 # Redis数据库索引（默认为0） diff --git a/warehousing-system/project/wh-manage-xxs/src/main/resources/application.yml b/warehousing-system/project/wh-manage-xxs/src/main/resources/application.yml index c4144f07..1aa701f3 100644 --- a/warehousing-system/project/wh-manage-xxs/src/main/resources/application.yml +++ b/warehousing-system/project/wh-manage-xxs/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9050 + port: 9051 servlet: context-path: / multipart: @@ -8,10 +8,11 @@ server: max-request-size: 200MB spring: application: - name: supervise-wm + name: supervise-wm-xxs profiles: - active: test - #active: pro + active: devv +# active: test +# active: pro messages: basename: i18n/messages diff --git a/warehousing-system/project/wh-manage-xxs/src/main/resources/logback-spring.xml b/warehousing-system/project/wh-manage-xxs/src/main/resources/logback-spring.xml index 62a203f2..975587f4 100644 --- a/warehousing-system/project/wh-manage-xxs/src/main/resources/logback-spring.xml +++ b/warehousing-system/project/wh-manage-xxs/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - +