周伟鹏 / cnlive_shenhe · Commits

Commit 8bea6e86b5c63e10bc5f4759723c1eedd2f64b74

Authored by 王言钊
2 parents d4e853e8 24b52a70

Merge branch 'dev'

Inline Side-by-side
Showing 4 changed files with 57 additions and 38 deletions
src/main/resources/application-dev.properties
  View file @8bea6e8
@@ -6,20 +6,20 @@ spring.datasource.password=M345sdfss4! @@ -6,20 +6,20 @@ spring.datasource.password=M345sdfss4!
6 6
7 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 7 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8 8
9 -server.tomcat.protocol_header=x-forwarded-proto  
10 -server.use-forward-headers=true 9 +#server.tomcat.protocol_header=x-forwarded-proto
  10 +#server.use-forward-headers=true
11 11
12 -spring.jpa.properties.hibernate.hbm2ddl.auto=update  
13 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
14 -spring.jpa.show-sql= true 12 +#spring.jpa.properties.hibernate.hbm2ddl.auto=update
  13 +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  14 +#spring.jpa.show-sql= true
15 15
16 -server.tomcat.uri-encoding=UTF-8  
17 -spring.http.encoding.charset=UTF-8  
18 -spring.http.encoding.enabled=true  
19 -spring.http.encoding.force=true 16 +#server.tomcat.uri-encoding=UTF-8
  17 +#spring.http.encoding.charset=UTF-8
  18 +#spring.http.encoding.enabled=true
  19 +#spring.http.encoding.force=true
20 20
21 -spring.thymeleaf.mode=LEGACYHTML5  
22 -spring.thymeleaf.cache=false 21 +#spring.thymeleaf.mode=LEGACYHTML5
  22 +#spring.thymeleaf.cache=false
23 #spring.thymeleaf.encoding=UTF-8 23 #spring.thymeleaf.encoding=UTF-8
24 #spring.thymeleaf.content-type=text/html 24 #spring.thymeleaf.content-type=text/html
25 #\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762 25 #\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
@@ -27,8 +27,8 @@ spring.thymeleaf.cache=false @@ -27,8 +27,8 @@ spring.thymeleaf.cache=false
27 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql 27 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
28 #logging.level.com.cnlive.shenhe.mapper=debug 28 #logging.level.com.cnlive.shenhe.mapper=debug
29 29
30 -mybatis.mapper-locations=classpath:mapper/*.xml  
31 -mybatis.type-aliases-package=com.cnlive.shenhe.entity 30 +#mybatis.mapper-locations=classpath:mapper/*.xml
  31 +#mybatis.type-aliases-package=com.cnlive.shenhe.entity
32 32
33 #rabbitmq\u76F8\u5173\u914D\u7F6E 33 #rabbitmq\u76F8\u5173\u914D\u7F6E
34 spring.rabbitmq.host=10.254.174.131 34 spring.rabbitmq.host=10.254.174.131
src/main/resources/application-prod.properties
  View file @8bea6e8
@@ -7,24 +7,24 @@ spring.datasource.password=83BwiCoq @@ -7,24 +7,24 @@ spring.datasource.password=83BwiCoq
7 7
8 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 8 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
9 9
10 -server.tomcat.protocol_header=x-forwarded-proto  
11 -server.use-forward-headers=true 10 +#server.tomcat.protocol_header=x-forwarded-proto
  11 +#server.use-forward-headers=true
12 12
13 -spring.jpa.properties.hibernate.hbm2ddl.auto=update  
14 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
15 -spring.jpa.show-sql= true 13 +#spring.jpa.properties.hibernate.hbm2ddl.auto=update
  14 +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  15 +#spring.jpa.show-sql= true
16 16
17 -server.tomcat.uri-encoding=UTF-8  
18 -spring.http.encoding.charset=UTF-8  
19 -spring.http.encoding.enabled=true  
20 -spring.http.encoding.force=true 17 +#server.tomcat.uri-encoding=UTF-8
  18 +#spring.http.encoding.charset=UTF-8
  19 +#spring.http.encoding.enabled=true
  20 +#spring.http.encoding.force=true
21 21
22 22
23 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql 23 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
24 #logging.level.com.cnlive.shenhe.mapper=debug 24 #logging.level.com.cnlive.shenhe.mapper=debug
25 25
26 -mybatis.mapper-locations=classpath:mapper/*.xml  
27 -mybatis.type-aliases-package=com.cnlive.shenhe.entity 26 +#mybatis.mapper-locations=classpath:mapper/*.xml
  27 +#mybatis.type-aliases-package=com.cnlive.shenhe.entity
28 28
29 #rabbitmq\u76F8\u5173\u914D\u7F6E 29 #rabbitmq\u76F8\u5173\u914D\u7F6E
30 spring.rabbitmq.host=10.254.176.11 30 spring.rabbitmq.host=10.254.176.11
src/main/resources/application-test.properties
  View file @8bea6e8
@@ -6,20 +6,20 @@ spring.datasource.password=M345sdfss4! @@ -6,20 +6,20 @@ spring.datasource.password=M345sdfss4!
6 6
7 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 7 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8 8
9 -server.tomcat.protocol_header=x-forwarded-proto  
10 -server.use-forward-headers=true 9 +#server.tomcat.protocol_header=x-forwarded-proto
  10 +#server.use-forward-headers=true
11 11
12 -spring.jpa.properties.hibernate.hbm2ddl.auto=update  
13 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
14 -spring.jpa.show-sql= true 12 +#spring.jpa.properties.hibernate.hbm2ddl.auto=update
  13 +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  14 +#spring.jpa.show-sql= true
15 15
16 -server.tomcat.uri-encoding=UTF-8  
17 -spring.http.encoding.charset=UTF-8  
18 -spring.http.encoding.enabled=true  
19 -spring.http.encoding.force=true 16 +#server.tomcat.uri-encoding=UTF-8
  17 +#spring.http.encoding.charset=UTF-8
  18 +#spring.http.encoding.enabled=true
  19 +#spring.http.encoding.force=true
20 20
21 -spring.thymeleaf.mode=LEGACYHTML5  
22 -spring.thymeleaf.cache=false 21 +#spring.thymeleaf.mode=LEGACYHTML5
  22 +#spring.thymeleaf.cache=false
23 #spring.thymeleaf.encoding=UTF-8 23 #spring.thymeleaf.encoding=UTF-8
24 #spring.thymeleaf.content-type=text/html 24 #spring.thymeleaf.content-type=text/html
25 #\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762 25 #\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
@@ -27,8 +27,8 @@ spring.thymeleaf.cache=false @@ -27,8 +27,8 @@ spring.thymeleaf.cache=false
27 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql 27 #\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
28 #logging.level.com.cnlive.shenhe.mapper=debug 28 #logging.level.com.cnlive.shenhe.mapper=debug
29 29
30 -mybatis.mapper-locations=classpath:mapper/*.xml  
31 -mybatis.type-aliases-package=com.cnlive.shenhe.entity 30 +#mybatis.mapper-locations=classpath:mapper/*.xml
  31 +#mybatis.type-aliases-package=com.cnlive.shenhe.entity
32 32
33 #rabbitmq\u76F8\u5173\u914D\u7F6E 33 #rabbitmq\u76F8\u5173\u914D\u7F6E
34 spring.rabbitmq.host=10.254.174.131 34 spring.rabbitmq.host=10.254.174.131
src/main/resources/application.properties
  View file @8bea6e8
1 spring.profiles.active=@environment@ 1 spring.profiles.active=@environment@
2 2
  3 +# thymeleaf\u3001tomcat\u3001mybatis \u76F8\u5173\u516C\u5171\u914D\u7F6E
3 spring.thymeleaf.mode=LEGACYHTML5 4 spring.thymeleaf.mode=LEGACYHTML5
4 spring.thymeleaf.encoding=UTF-8 5 spring.thymeleaf.encoding=UTF-8
5 -spring.thymeleaf.content-type=text/html 6 +spring.thymeleaf.servlet.content-type=text/html
6 spring.thymeleaf.cache=false 7 spring.thymeleaf.cache=false
  8 +
  9 +server.tomcat.max-http-post-size=-1
  10 +server.max-http-header-size=10240
  11 +
  12 +server.tomcat.protocol_header=x-forwarded-proto
  13 +server.use-forward-headers=true
  14 +
  15 +spring.jpa.properties.hibernate.hbm2ddl.auto=update
  16 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  17 +spring.jpa.show-sql= true
  18 +
  19 +server.tomcat.uri-encoding=UTF-8
  20 +spring.http.encoding.charset=UTF-8
  21 +spring.http.encoding.enabled=true
  22 +spring.http.encoding.force=true
  23 +
  24 +mybatis.mapper-locations=classpath:mapper/*.xml
  25 +mybatis.type-aliases-package=com.cnlive.shenhe.entity
7 \ No newline at end of file 26 \ No newline at end of file