diff --git a/talkonlineweb/src/main/resources/application-dev.yml b/talkonlineweb/src/main/resources/application-dev.yml index 7689ca2..5411957 100644 --- a/talkonlineweb/src/main/resources/application-dev.yml +++ b/talkonlineweb/src/main/resources/application-dev.yml @@ -3,7 +3,6 @@ debug: true spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver -# url: jdbc:p6spy:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:p6spy:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 username: platform password: platform123 diff --git a/talkonlineweb/src/main/resources/application-prod.yml b/talkonlineweb/src/main/resources/application-prod.yml index 163012c..49bbc12 100644 --- a/talkonlineweb/src/main/resources/application-prod.yml +++ b/talkonlineweb/src/main/resources/application-prod.yml @@ -1,13 +1,13 @@ spring: datasource: -# driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://192.168.1.46:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 username: platform - password: platform123 + password: Platform123 excludePath: login,test1,test2 uploadPath: /data/talkonline/upload/ -imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/ +imgUrlPre: https://talk.healthbaby.com.cn/upload/ #环信配置 hx.APPKEY: 1123170414115195#talkonline @@ -19,4 +19,4 @@ hx.hxuser: test hx.hxpasswd: passwd #微信支付通知地址 -notify.url: https://dev-talk-api.healthbaby.com.cn/order/payNotify \ No newline at end of file +notify.url: https://talk-api.healthbaby.com.cn/order/payNotify \ No newline at end of file diff --git a/talkonlineweb/src/main/resources/application.yml b/talkonlineweb/src/main/resources/application.yml index aad7db1..43002c1 100644 --- a/talkonlineweb/src/main/resources/application.yml +++ b/talkonlineweb/src/main/resources/application.yml @@ -11,19 +11,8 @@ spring: resources: add-mappings: false profiles: - active: dev + active: prod logging: config: classpath:logback-spring.xml excludePath: login,test1,test2 -uploadPath: /data/talkonline/upload/ -imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/ - -#环信配置 -hx.APPKEY: 1135210903239178#demo -hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA -hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w -hx.org_name: 1135210903239178 -hx.app_name: demo -hx.hxuser: test -hx.hxpasswd: passwd \ No newline at end of file