diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml index 714d99a6..c779245f 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml @@ -6,45 +6,43 @@ spring: datasource: master: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true -# url: jdbc:mysql://8.130.39.13:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: root -# password: 1LAiGz$t1*Iw + password: yxt_mysql_138 supplychain: 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 -# url: jdbc:mysql://8.130.39.13:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: root -# password: 1LAiGz$t1*Iw + password: yxt_mysql_138 warehouse: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://8.130.39.13:3306/warehouse2?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/warehouse2?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 crm: 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&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: root + password: yxt_mysql_138 system: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://8.130.39.13:3306/supervise_auth?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/supervise_auth?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 rms: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://8.130.39.13:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/supervise_rms?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: 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-report/supervise-report-biz/src/main/resources/application-pro.yml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-pro.yml index f629067d..1c359234 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-pro.yml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-pro.yml @@ -6,12 +6,12 @@ spring: datasource: master: 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 + url: jdbc:mysql://127.0.0.1:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root password: 1LAiGz$t1*Iw - report: + supplychain: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root password: 1LAiGz$t1*Iw warehouse: @@ -24,6 +24,16 @@ spring: 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: 1LAiGz$t1*Iw + system: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/supervise_auth?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: 1LAiGz$t1*Iw + rms: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: 1LAiGz$t1*Iw cloud: nacos: discovery: @@ -40,9 +50,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-report/supervise-report-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-test.yml index f3789955..25ebe9ac 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-test.yml @@ -6,55 +6,56 @@ spring: datasource: master: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 supplychain: 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 + url: jdbc:mysql://172.18.0.4:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 warehouse: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/warehouse2?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 crm: 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&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 system: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_auth?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/supervise_auth?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + password: yxt_mysql_138 rms: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/supervise_rms?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: https://supervise.yxtsoft.com/downfile/ + prefix: http://jg.yyundong.com/upload/ diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application.yml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application.yml index ac8a04e8..df7207f5 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application.yml @@ -15,8 +15,8 @@ spring: # brokers: localhost:9092 #kafka的网络位置 # auto-create-topics: true profiles: -# active: devv - active: test + active: devv +# active: test # active: pro messages: # 国际化资源文件路径