Commit 62efc38259d960a4654405d8e18c8d3be01b22f9

Authored by 张志伟
2 parents a5c2d528 6f8768f2

Merge remote-tracking branch 'origin/test'

.gitignore
1   -.idea
2 1 *.iml
3 2 /*/target/
4 3 **/*.settings/
... ... @@ -11,7 +10,6 @@
11 10 **/*.class
12 11 **/*.pyc
13 12 **/target
14   -**/.idea
15 13 **/*.log
16 14 .settings
17 15 .project
... ... @@ -24,4 +22,6 @@ target
24 22 /bin/
25 23 /*-logs/
26 24 **/banner.txt
27   -**/.DS_Store
28 25 \ No newline at end of file
  26 +**/.DS_Store
  27 +**/.idea/*
  28 +!**/.idea/**.png
29 29 \ No newline at end of file
... ...
.idea/icon.png 0 → 100644

2.89 KB

fw-hestia-server/src/main/resources/application-dev.yml
... ... @@ -21,4 +21,4 @@ nacos:
21 21 plugin:
22 22 namespace: df959b8c-de58-4d02-b9fb-d65ca3be05f3
23 23 p6spy-db:
24   - url: jdbc:p6spy:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
25 24 \ No newline at end of file
  25 + url: jdbc:p6spy:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&useUnicode=true&autoReconnect=true&rewriteBatchedStatements=true&allowMultiQueries=true&useServerPrepStmts=true&cachePrepStmts=true
26 26 \ No newline at end of file
... ...
fw-hestia-server/src/main/resources/application-gray.yml
... ... @@ -8,7 +8,7 @@ spring:
8 8 version: 1.0
9 9 server-addr: 192.168.0.91:8848
10 10 datasource:
11   - url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
  11 + url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&useUnicode=true&autoReconnect=true&rewriteBatchedStatements=true&allowMultiQueries=true&useServerPrepStmts=true&cachePrepStmts=true
12 12 username: root
13 13 password: Feewee_Data2_Root123
14 14 redis:
... ...
fw-hestia-server/src/main/resources/application-prd.yml
... ... @@ -8,7 +8,7 @@ spring:
8 8 version: 1.0
9 9 server-addr: 192.168.0.91:8848
10 10 datasource:
11   - url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
  11 + url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&useUnicode=true&autoReconnect=true&rewriteBatchedStatements=true&allowMultiQueries=true&useServerPrepStmts=true&cachePrepStmts=true
12 12 username: root
13 13 password: Feewee_Data2_Root123
14 14 redis:
... ...
fw-hestia-server/src/main/resources/application-test.yml
... ... @@ -10,7 +10,7 @@ spring:
10 10 namespace: 0ba6d5d6-2a49-4086-b6c3-dbeec01c61a4
11 11 datasource:
12 12 password: mysql@pwd123
13   - url: jdbc:mysql://172.26.154.169:3301/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
  13 + url: jdbc:mysql://172.26.154.169:3301/fw_hestia?characterEncoding=UTF-8&useSSL=false&useUnicode=true&autoReconnect=true&rewriteBatchedStatements=true&allowMultiQueries=true&useServerPrepStmts=true&cachePrepStmts=true
14 14 username: test
15 15 redis:
16 16 host: 172.26.154.169
... ... @@ -50,4 +50,4 @@ logging:
50 50 task:
51 51 switch: 'on'
52 52 p6spy-db:
53   - url: jdbc:p6spy:mysql://172.26.154.169:3301/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
54 53 \ No newline at end of file
  54 + url: jdbc:p6spy:mysql://172.26.154.169:3301/fw_hestia?characterEncoding=UTF-8&useSSL=false&useUnicode=true&autoReconnect=true&rewriteBatchedStatements=true&allowMultiQueries=true&useServerPrepStmts=true&cachePrepStmts=true
55 55 \ No newline at end of file
... ...
fw-hestia-server/src/main/resources/application.yml
... ... @@ -26,7 +26,7 @@ spring:
26 26 connection-test-query: SELECT 1 FROM DUAL
27 27 maximum-pool-size: 30
28 28 password: mysql@pwd123
29   - url: jdbc:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
  29 + url: jdbc:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&useUnicode=true&autoReconnect=true&rewriteBatchedStatements=true&allowMultiQueries=true&useServerPrepStmts=true&cachePrepStmts=true
30 30 username: root
31 31  
32 32 jackson:
... ...
... ... @@ -12,7 +12,7 @@
12 12 <parent>
13 13 <groupId>cn.fw</groupId>
14 14 <artifactId>fw-common-dependencies</artifactId>
15   - <version>3.5.0</version>
  15 + <version>3.6.1</version>
16 16 </parent>
17 17  
18 18 <modules>
... ...