diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml index fa82aa6e..dc4707dd 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml @@ -1,16 +1,18 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true + url: jdbc:mysql://39.104.100.138:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root - password: root -# cloud: -# nacos: -# discovery: -# server-addr: 127.0.0.1:8848 + password: yxt_mysql_138 + cloud: + nacos: + discovery: + namespace: supervise + server-addr: 39.104.100.138:8848 + register-enabled: false redis: database: 3 # Redis数据库索引(默认为0) - host: 127.0.0.1 + host: 39.104.100.138 jedis: pool: max-active: -1 #连接池最大连接数(使用负值表示没有限制) diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-pro.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-pro.yml index 7b6d5d1c..b84422d5 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-pro.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-pro.yml @@ -1,12 +1,13 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://120.46.172.184:3306/anrui_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root - password: '@anrui18033887500' + password: 1LAiGz$t1*Iw cloud: nacos: discovery: + namespace: supervise server-addr: 127.0.0.1:8848 redis: database: 3 # Redis数据库索引(默认为0) @@ -24,8 +25,10 @@ spring: image: xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/ upload: - path: D:/anrui/upload/ + path: D:/webapps/supervise/static/upload/ url: - prefix: http://120.46.172.184/api/upload/ + prefix: https://supervise.yxtsoft.com/downfile/ login: - path: D:\images\pic-click + path: D:\\images\\pic-click + + diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml index fc2d0a76..0582ad46 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml @@ -1,33 +1,37 @@ +server: + port: 17003 + spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true + url: jdbc:mysql://172.18.0.4:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root - password: 1LAiGz$t1*Iw -# cloud: -# nacos: -# discovery: -# server-addr: 127.0.0.1:8848 + password: yxt_mysql_138 + cloud: + nacos: + discovery: + 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: - xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/ + xlsxtmpl: /home/lzh/webapps/supervise/xlsx-tmpl/ upload: - path: D:/webapps/supervise/static/upload/ + path: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload/ url: - prefix: http://8.130.39.13:7003/upload/ + prefix: http://jg.yyundong.com/upload/ login: - path: D:\\images\\pic-click + path: /home/lzh/webapps/supervise/images/pic-click diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml index 3f3bc859..b90d8925 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml @@ -4,6 +4,7 @@ spring: profiles: active: devv # active: test +# active: pro messages: # 国际化资源文件路径 basename: i18n/messages