From 90b7f3f405403bf51a67c9778e671f7adc46cdde Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 24 Feb 2022 16:15:30 +0800 Subject: [PATCH] =?UTF-8?q?20220224=E9=83=A8=E7=BD=B2=E7=BB=BF=E8=B0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application-util-greenvalley.yml | 2 +- .../resources/application-greenvalley.yml | 22 +++++++------------ tall/src/main/resources/application.yml | 4 ++-- tall/src/main/resources/druid-greenvalley.yml | 9 ++++---- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/cloudutil/src/main/resources/application-util-greenvalley.yml b/cloudutil/src/main/resources/application-util-greenvalley.yml index 0551b88f..50075339 100644 --- a/cloudutil/src/main/resources/application-util-greenvalley.yml +++ b/cloudutil/src/main/resources/application-util-greenvalley.yml @@ -19,7 +19,7 @@ eureka: client: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 - defaultZone: http://admin:admin@82.157.24.76:7010/eureka/ + defaultZone: http://admin:admin@82.156.116.247:7010/eureka/ # defaultZone: http://admin:admin@49.232.6.143:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server diff --git a/tall/src/main/resources/application-greenvalley.yml b/tall/src/main/resources/application-greenvalley.yml index 61d1bfff..33dc6679 100644 --- a/tall/src/main/resources/application-greenvalley.yml +++ b/tall/src/main/resources/application-greenvalley.yml @@ -12,9 +12,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: host: 127.0.0.1 - password: sd12345 + password: 111111 port: 5672 - username: yu + username: admin redis: database: 0 host: 127.0.0.1 @@ -31,17 +31,11 @@ swagger: enable: true eureka: instance: -# ip-address: 82.156.116.247 - ip-address: 82.157.24.76 + ip-address: 82.156.116.247 - -# 平台信息 0绿谷 1创时代 -platforms: 1 -file: - path: /home/wikiwiki/uploads/ - domain: https://www.sxwikionline.com/gateway/wiki/ - imgDomain: https://www.sxwikionline.com/gateway/wiki/uploads/upload/ - -#gatewayUrl: http://82.156.116.247 /gateway/ -#notGatewayUrl: http://82.156.116.247 / +gatewayUrl: https://www.sxgreenvalley.com/gateway/ +notGatewayUrl: https://www.sxgreenvalley.com/ smsCode: 1 +file: + domain: https://www.sxgreenvalley.com/gateway/tall/v1.0/ + imgDomain: https://www.sxgreenvalley.com/gateway/tall/v1.0/uploads \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..9e02c3e8 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: greenvalley + include: util-greenvalley,common diff --git a/tall/src/main/resources/druid-greenvalley.yml b/tall/src/main/resources/druid-greenvalley.yml index fd0ed8d5..4164732a 100644 --- a/tall/src/main/resources/druid-greenvalley.yml +++ b/tall/src/main/resources/druid-greenvalley.yml @@ -15,8 +15,7 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: -# password: 6ba13d9930a6ad888a3704376c920a75 + password: 6ba13d9930a6ad888a3704376c920a75 poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -28,8 +27,8 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 -# url: jdbc:mysql://82.157.24.76/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true - url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://82.157.24.76:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + # url: jdbc:mysql://49.232.6.143:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL - env: CCSENS_ENTERPRISE \ No newline at end of file + env: CCSENS_GREENVALLEY \ No newline at end of file