liquanyu / talkonline

Download as
Browse Code »

Commit 25e329c4a73d0db81b92880809f08bcc074a2915

Authored by changpengfei
1 parent e868fc0343
Exists in master and in 1 other branch dev

修改系统配置文件

Showing 5 changed files with 94 additions and 37 deletions

talkonlineweb/pom.xml View file @ 25e329c
... ... @@ -143,11 +143,10 @@
143 143 </exclusion>
144 144 </exclusions>
145 145 </dependency>
146   - <!-- 环信 -->
147 146 <!-- <dependency>-->
148   -<!-- <groupId>com.easemob.im</groupId>-->
149   -<!-- <artifactId>im-sdk-core</artifactId>-->
150   -<!-- <version>0.3.0</version>-->
  147 +<!-- <groupId>com.github.amuguelove</groupId>-->
  148 +<!-- <artifactId>p6spy-spring-boot-autoconfigure</artifactId>-->
  149 +<!-- <version>1.0.0</version>-->
151 150 <!-- </dependency>-->
152 151 </dependencies>
153 152  
... ... @@ -160,20 +159,6 @@
160 159 <type>pom</type>
161 160 <scope>import</scope>
162 161 </dependency>
163   -<!-- <dependency>-->
164   -<!-- <groupId>io.netty</groupId>-->
165   -<!-- <artifactId>netty-bom</artifactId>-->
166   -<!-- <version>4.1.59.Final</version>-->
167   -<!-- <type>pom</type>-->
168   -<!-- <scope>import</scope>-->
169   -<!-- </dependency>-->
170   -<!-- <dependency>-->
171   -<!-- <groupId>io.projectreactor</groupId>-->
172   -<!-- <artifactId>reactor-bom</artifactId>-->
173   -<!-- <version>2020.0.4</version>-->
174   -<!-- <type>pom</type>-->
175   -<!-- <scope>import</scope>-->
176   -<!-- </dependency>-->
177 162 </dependencies>
178 163 </dependencyManagement>
179 164  
180 165  
... ... @@ -246,7 +231,31 @@
246 231 </plugin>
247 232  
248 233 </plugins>
249   - </build>
250 234  
  235 + </build>
  236 + <profiles>
  237 + <profile>
  238 + <id>dev</id>
  239 + <activation>
  240 + <activeByDefault>true</activeByDefault>
  241 + </activation>
  242 + <properties>
  243 + <env>dev</env>
  244 + </properties>
  245 + <dependencies>
  246 + <dependency>
  247 + <groupId>com.github.amuguelove</groupId>
  248 + <artifactId>p6spy-spring-boot-autoconfigure</artifactId>
  249 + <version>1.0.0</version>
  250 + </dependency>
  251 + </dependencies>
  252 + </profile>
  253 + <profile>
  254 + <id>prod</id>
  255 + <properties>
  256 + <env>prod</env>
  257 + </properties>
  258 + </profile>
  259 + </profiles>
251 260 </project>
talkonlineweb/src/main/resources/application-dev.yml View file @ 25e329c
  1 +debug: true
  2 +
  3 +spring:
  4 + datasource:
  5 + driver-class-name: com.p6spy.engine.spy.P6SpyDriver
  6 + url: jdbc:p6spy:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
  7 + username: platform
  8 + password: platform123
  9 +uploadPath: /data/talkonline/upload/
  10 +imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/
  11 +#微信支付通知地址
  12 +notify.url: https://dev-talk-api.healthbaby.com.cn/order/payNotify
talkonlineweb/src/main/resources/application-prod.yml View file @ 25e329c
  1 +spring:
  2 + datasource:
  3 +# driver-class-name: com.mysql.jdbc.Driver
  4 + url: jdbc:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
  5 + username: platform
  6 + password: platform123
  7 +
  8 +excludePath: login,test1,test2
  9 +uploadPath: /data/talkonline/upload/
  10 +imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/
  11 +
  12 +#环信配置
  13 +hx.APPKEY: 1123170414115195#talkonline
  14 +hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw
  15 +hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg
  16 +hx.org_name: 1123170414115195
  17 +hx.app_name: talkonline
  18 +hx.hxuser: test
  19 +hx.hxpasswd: passwd
  20 +
  21 +#微信支付通知地址
  22 +notify.url: https://dev-talk-api.healthbaby.com.cn/order/payNotify
talkonlineweb/src/main/resources/application.yml View file @ 25e329c
... ... @@ -4,21 +4,14 @@
4 4 spring:
5 5 application:
6 6 name: talkonlineweb
7   - datasource:
8   - driver-class-name: com.mysql.jdbc.Driver
9   -# driver-class-name: com.p6spy.engine.spy.P6SpyDriver
10   - url: jdbc:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
11   -# url: jdbc:p6spy:mysql://119.90.57.26:3306/talkonline?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
12   - username: platform
13   - password: platform123
14 7 jackson:
15 8 date-format: yyyy-MM-dd HH:mm:ss
16 9 mvc:
17 10 throw-exception-if-no-handler-found: true
18 11 resources:
19 12 add-mappings: false
20   -# profiles:
21   -# active:
  13 + profiles:
  14 + active: dev
22 15 logging:
23 16 config: classpath:logback-spring.xml
24 17  
25 18  
... ... @@ -27,14 +20,11 @@
27 20 imgUrlPre: https://dev-talk.healthbaby.com.cn/upload/
28 21  
29 22 #环信配置
30   -hx.APPKEY: 1123170414115195#talkonline
31   -hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw
32   -hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg
33   -hx.org_name: 1123170414115195
34   -hx.app_name: talkonline
  23 +hx.APPKEY: 1135210903239178#demo
  24 +hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA
  25 +hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w
  26 +hx.org_name: 1135210903239178
  27 +hx.app_name: demo
35 28 hx.hxuser: test
36 29 hx.hxpasswd: passwd
37   -
38   -#微信支付通知地址
39   -notify.url: https://dev-talk-api.healthbaby.com.cn/order/payNotify
talkonlineweb/src/main/resources/spy.properties View file @ 25e329c
  1 +#3.2.1????
  2 +modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
  3 +#3.2.1?????????
  4 +#modulelist=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory
  5 +# ???????
  6 +logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
  7 +#????????
  8 +appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
  9 +# ???????? sql
  10 +#appender=com.p6spy.engine.spy.appender.Slf4JLogger
  11 +# ?? p6spy driver ??
  12 +deregisterdrivers=true
  13 +# ??JDBC URL??
  14 +useprefix=true
  15 +# ???? Log ??,????????error,info,batch,debug,statement,commit,rollback,result,resultset.
  16 +excludecategories=info,debug,result,commit,resultset
  17 +# ????
  18 +dateformat=yyyy-MM-dd HH:mm:ss
  19 +# ???????
  20 +#driverlist=org.h2.Driver
  21 +# ?????SQL??
  22 +outagedetection=true
  23 +# ?SQL???? 2 ?
  24 +outagedetectioninterval=2