From c1c311faaddaa2a1f3241efd486c2d97199dcaa5 Mon Sep 17 00:00:00 2001 From: liupopo Date: Fri, 20 Oct 2023 17:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=B8=AD=E5=BF=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt_supervise/README.md | 1 - .../src/main/resources/application-dev.yml | 22 +++++++------ .../src/main/resources/application-pro.yml | 4 +-- .../src/main/resources/application-test.yml | 32 +++++++++++++++++++ .../src/main/resources/application.yml | 4 ++- 5 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-test.yml diff --git a/yxt_supervise/README.md b/yxt_supervise/README.md index a903d5b7..bbc9c811 100644 --- a/yxt_supervise/README.md +++ b/yxt_supervise/README.md @@ -35,7 +35,6 @@ supervise -- 根项目 │ ├────────────riskindicatorslevel -- 风险指标等级 │ ├────────────riskindicatorstype -- 风险指标类型 │ ├────────────risklist -- 风险清单 - │ ├────supervise-supplychain -- 供应链 │ ├────supervise-system -- 系统管理 （7008） │ ├────yxt-adapter -- 适配器 │ ├────────supervise-crm-api diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-dev.yml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-dev.yml index 5a3cae28..91bd5bdc 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-dev.yml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-dev.yml @@ -1,15 +1,18 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_enterprisecentre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + url: jdbc:mysql://39.104.100.138:3306/supervise_enterprisecentre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root - password: root - 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: 6 # Redis数据库索引（默认为0） - host: 127.0.0.1 + database: 3 # Redis数据库索引（默认为0） + host: 39.104.100.138 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制） @@ -19,8 +22,9 @@ spring: password: port: 6379 timeout: 0 # 连接超时时间（毫秒） + image: upload: - path: static/upload/ + path: D:\supervise\upload\ url: - prefix: http://127.0.0.1:8080/upload/ \ No newline at end of file + prefix: http://127.0.0.1:8112/upload/ \ No newline at end of file diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-pro.yml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-pro.yml index 1c09b0f7..f3e41907 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-pro.yml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-pro.yml @@ -21,6 +21,6 @@ spring: timeout: 0 # 连接超时时间（毫秒） image: upload: - path: static/upload/ + path: D:/webapps/supervise/static/upload/ url: - prefix: http://127.0.0.1:8080/upload/ \ No newline at end of file + prefix: https://supervise.yxtsoft.com/downfile/ \ No newline at end of file diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-test.yml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-test.yml new file mode 100644 index 00000000..1e5cfbd6 --- /dev/null +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application-test.yml @@ -0,0 +1,32 @@ +server: + port: 18080 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://172.18.0.4:3306/supervise_enterprisecentre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: yxt_mysql_138 + nacos: + discovery: + namespace: supervise + server-addr: 172.18.0.5:8848 + redis: + database: 3 # Redis数据库索引（默认为0） + host: 172.18.0.7 + jedis: + pool: + max-active: -1 #连接池最大连接数（使用负值表示没有限制） + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + min-idle: 0 # 连接池中的最小空闲连接 + password: + port: 6379 + timeout: 0 # 连接超时时间（毫秒） + + +image: + upload: + path: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload/ + url: + prefix: http://jg.yyundong.com/upload/ \ No newline at end of file diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application.yml b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application.yml index c07d590a..e13989e5 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application.yml +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/resources/application.yml @@ -4,7 +4,9 @@ spring: application: name: yxt-supervise-enterprisecentre profiles: - active: pro + active: dev +# active: test +# active: pro messages: basename: i18n/messages servlet: