From 2458cfa92de2cda5ff11a53a965564eae0a5da17 Mon Sep 17 00:00:00 2001 From: liupopo Date: Wed, 18 Oct 2023 16:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9crm=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-devv.yml | 4 +++- .../src/main/resources/application-pro.yml | 9 +++++---- .../src/main/resources/application-test.yml | 20 ++++++++++--------- .../src/main/resources/application.yml | 5 +++-- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-devv.yml index 85c9e277..85702485 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-devv.yml @@ -9,7 +9,9 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + namespace: supervise + server-addr: 39.104.100.138:8848 + register-enabled: false redis: database: 3 # Redis数据库索引（默认为0） host: 127.0.0.1 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-pro.yml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-pro.yml index be94367e..1cd140a8 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-pro.yml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-pro.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: root + password: 1LAiGz$t1*Iw cloud: nacos: discovery: @@ -20,9 +20,10 @@ spring: password: 123456 port: 6379 timeout: 0 # 连接超时时间（毫秒） + image: upload: - path: D:\supervise\upload\ + path: D:/webapps/supervise/static/upload/ url: - prefix: http://127.0.0.1/api/upload/ + prefix: https://supervise.yxtsoft.com/downfile/ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml index 10c17085..91128d03 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application-test.yml @@ -1,31 +1,33 @@ +server: + port: 17004 + spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://122.14.222.186:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true - url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + namespace: supervise + server-addr: 172.18.0.5:8848 redis: database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 + host: 172.18.0.7 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制） max-idle: 8 #连接池中的最大空闲连接 max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 + password: port: 6379 timeout: 0 # 连接超时时间（毫秒） - image: upload: - path: D:/webapps/supervise/static/upload/ + path: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload/ url: - prefix: http://122.14.222.186:7003/upload/ + prefix: http://jg.yyundong.com/upload/ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml index bfc510a5..61cae045 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/resources/application.yml @@ -2,8 +2,9 @@ spring: application: name: supervise-crm profiles: -# active: devv - active: test + active: devv +# active: test +# active: pro messages: # 国际化资源文件路径 basename: i18n/messages