diff --git a/talkonlineweb/pom.xml b/talkonlineweb/pom.xml index d88c825..05dabcf 100644 --- a/talkonlineweb/pom.xml +++ b/talkonlineweb/pom.xml @@ -143,11 +143,10 @@ - - - - + + + @@ -160,20 +159,6 @@ pom import - - - - - - - - - - - - - - @@ -246,6 +231,30 @@ - + + + + dev + + true + + + dev + + + + com.github.amuguelove + p6spy-spring-boot-autoconfigure + 1.0.0 + + + + + prod + + prod + + + diff --git a/talkonlineweb/src/main/resources/application-dev.yml b/talkonlineweb/src/main/resources/application-dev.yml new file mode 100644 index 0000000..5411957 --- /dev/null +++ b/talkonlineweb/src/main/resources/application-dev.yml @@ -0,0 +1,12 @@ +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 + username: platform + password: platform123 +uploadPath: /data/talkonline/upload/ +imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/ +#微信支付通知地址 +notify.url: https://dev-talk-api.healthbaby.com.cn/order/payNotify \ No newline at end of file diff --git a/talkonlineweb/src/main/resources/application-prod.yml b/talkonlineweb/src/main/resources/application-prod.yml new file mode 100644 index 0000000..163012c --- /dev/null +++ b/talkonlineweb/src/main/resources/application-prod.yml @@ -0,0 +1,22 @@ +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 + username: platform + password: platform123 + +excludePath: login,test1,test2 +uploadPath: /data/talkonline/upload/ +imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/ + +#环信配置 +hx.APPKEY: 1123170414115195#talkonline +hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw +hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg +hx.org_name: 1123170414115195 +hx.app_name: talkonline +hx.hxuser: test +hx.hxpasswd: passwd + +#微信支付通知地址 +notify.url: https://dev-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 66ca597..7163345 100644 --- a/talkonlineweb/src/main/resources/application.yml +++ b/talkonlineweb/src/main/resources/application.yml @@ -4,21 +4,14 @@ server: spring: application: name: talkonlineweb - datasource: - driver-class-name: com.mysql.jdbc.Driver -# driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 -# url: jdbc:p6spy:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 - username: platform - password: platform123 jackson: date-format: yyyy-MM-dd HH:mm:ss mvc: throw-exception-if-no-handler-found: true resources: add-mappings: false -# profiles: -# active: + profiles: + active: dev logging: config: classpath:logback-spring.xml @@ -27,13 +20,10 @@ uploadPath: /data/talkonline/upload/ imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/ #环信配置 -hx.APPKEY: 1123170414115195#talkonline -hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw -hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg -hx.org_name: 1123170414115195 -hx.app_name: talkonline +hx.APPKEY: 1135210903239178#demo +hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA +hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w +hx.org_name: 1135210903239178 +hx.app_name: demo hx.hxuser: test -hx.hxpasswd: passwd - -#微信支付通知地址 -notify.url: https://dev-talk-api.healthbaby.com.cn/order/payNotify \ No newline at end of file +hx.hxpasswd: passwd \ No newline at end of file diff --git a/talkonlineweb/src/main/resources/spy.properties b/talkonlineweb/src/main/resources/spy.properties new file mode 100644 index 0000000..f035706 --- /dev/null +++ b/talkonlineweb/src/main/resources/spy.properties @@ -0,0 +1,24 @@ +#3.2.1???? +modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory +#3.2.1????????? +#modulelist=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory +# ??????? +logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger +#???????? +appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger +# ???????? sql +#appender=com.p6spy.engine.spy.appender.Slf4JLogger +# ?? p6spy driver ?? +deregisterdrivers=true +# ??JDBC URL?? +useprefix=true +# ???? Log ??,????????error,info,batch,debug,statement,commit,rollback,result,resultset. +excludecategories=info,debug,result,commit,resultset +# ???? +dateformat=yyyy-MM-dd HH:mm:ss +# ??????? +#driverlist=org.h2.Driver +# ?????SQL?? +outagedetection=true +# ?SQL???? 2 ? +outagedetectioninterval=2 \ No newline at end of file