Home Explore Help
Register Sign In
zhaojiemin
/
tourist
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

配置修改

zjm 5 years ago
parent
62446e97e9
commit
bf256ef700
2 changed files with 217 additions and 207 deletions
Split View Show Diff Stats
  1. 113 108
      src/main/resources/env/prod/application.yml
  2. 104 99
      src/main/resources/env/qa/application.yml

+ 113 - 108
src/main/resources/env/prod/application.yml
View File 

@@ -1,108 +1,113 @@
1 
-# 内嵌服务器配置tomcat,jetty
2 
-server:
3 
-  port: 8800
4 
-
5 
-# mysql
6 
-spring:
7 
-  application:
8 
-    name: TOURIST
9 
-  datasource:
10 
-    type: com.alibaba.druid.pool.DruidDataSource
11 
-    url: jdbc:mysql://10.100.2.12:3306/tourist-dev?useUnicode=true&characterEncoding=utf8&useSSL=false
12 
-    username: root
13 
-    password: Wo4heike
14 
-    driver-class-name: com.mysql.jdbc.Driver
15 
-    # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
16 
-    filters: stat,wall,log4j
17 
-    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
18 
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
19 
-    # 合并多个DruidDataSource的监控数据
20 
-    useGlobalDataSourceStat: true
21 
-
22 
-    # 连接池配置
23 
-    max-active: 200
24 
-    initial-size: 5
25 
-    max-wait: 60000
26 
-    min-idle: 1
27 
-    pool-prepared-statements: true
28 
-    max-open-prepared-statements: 20
29 
-
30 
-    #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
31 
-    time-between-eviction-runs-millis: 60000
32 
-    #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
33 
-    min-evictable-idle-time-millis: 300000
34 
-
35 
-    # 连接有效性检测
36 
-    test-while-idle: true
37 
-    test-on-borrow: false
38 
-    test-on-return: false
39 
-    validation-query: SELECT 1
40 
-
41 
-  jpa:
42 
-    show-sql: true
43 
-  data:
44 
-    jpa:
45 
-      repositories:
46 
-        enabled: true
47 
-  redis:
48 
-    host: 10.100.2.12
49 
-    password: yinghuo
50 
-    port: 6379
51 
-    database: 6
52 
-    pool:
53 
-      min-idle: 5
54 
-  jackson:
55 
-    serialization: true
56 
-    time-zone: GMT+8
57 
-    date-format: java.text.SimpleDateFormat
58 
-
59 
-  http:
60 
-    # 文件上传限制
61 
-    multipart:
62 
-      enabled: true
63 
-      max-file-size: 50mb
64 
-      max-request-size: 200mb
65 
-  thymeleaf:
66 
-    cache: false
67 
-    mode: LEGACYHTML5
68 
-
69 
-mybatis-plus:
70 
-  # 如果是放在src/main/java目录下 classpath:/com/yourpackage/*/mapper/*Mapper.xml
71 
-  # 如果是放在resource目录 classpath:/mapper/*Mapper.xml
72 
-  mapper-locations: classpath:/mapper/*Mapper.xml
73 
-  #实体扫描，多个package用逗号或者分号分隔
74 
-  typeAliasesPackage: com.yingying.tourist.domain
75 
-  global-config:
76 
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
77 
-    id-type: 0
78 
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
79 
-    field-strategy: 2
80 
-    #驼峰下划线转换
81 
-    db-column-underline: true
82 
-    #mp2.3+ 全局表前缀 mp_
83 
-    #table-prefix: t_
84 
-    #刷新mapper 调试神器
85 
-    #refresh-mapper: true
86 
-    #数据库大写下划线转换
87 
-    #capital-mode: true
88 
-    # Sequence序列接口实现类配置
89 
-    # key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
90 
-    #逻辑删除配置（下面3个配置）
91 
-    logic-delete-value: 1
92 
-    logic-not-delete-value: 0
93 
-    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
94 
-    #自定义填充策略接口实现
95 
-    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
96 
-  configuration:
97 
-    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
98 
-    map-underscore-to-camel-case: true
99 
-    cache-enabled: false
100 
-    #配置JdbcTypeForNull, oracle数据库必须配置
101 
-    jdbc-type-for-null: 'null'
102 
-
103 
-# log
104 
-logging:
105 
-  config: classpath:logback.xml
106 
-
107 
-session:
108 
-  domain: wx.yingyinglicai.com
1 
+# 内嵌服务器配置tomcat,jetty
2 
+server:
3 
+  port: 8800
4 
+
5 
+# mysql
6 
+spring:
7 
+  application:
8 
+    name: TOURIST
9 
+  datasource:
10 
+    type: com.alibaba.druid.pool.DruidDataSource
11 
+    url: jdbc:mysql://10.100.2.12:3306/tourist-dev?useUnicode=true&characterEncoding=utf8&useSSL=false
12 
+    username: root
13 
+    password: Wo4heike
14 
+    driver-class-name: com.mysql.jdbc.Driver
15 
+    # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
16 
+    filters: stat,wall,log4j
17 
+    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
18 
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
19 
+    # 合并多个DruidDataSource的监控数据
20 
+    useGlobalDataSourceStat: true
21 
+
22 
+    # 连接池配置
23 
+    max-active: 200
24 
+    initial-size: 5
25 
+    max-wait: 60000
26 
+    min-idle: 1
27 
+    pool-prepared-statements: true
28 
+    max-open-prepared-statements: 20
29 
+
30 
+    #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
31 
+    time-between-eviction-runs-millis: 60000
32 
+    #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
33 
+    min-evictable-idle-time-millis: 300000
34 
+
35 
+    # 连接有效性检测
36 
+    test-while-idle: true
37 
+    test-on-borrow: false
38 
+    test-on-return: false
39 
+    validation-query: SELECT 1
40 
+
41 
+  jpa:
42 
+    show-sql: true
43 
+  data:
44 
+    jpa:
45 
+      repositories:
46 
+        enabled: true
47 
+  redis:
48 
+    host: 10.100.2.12
49 
+    password: yinghuo
50 
+    port: 6379
51 
+    database: 6
52 
+    pool:
53 
+      min-idle: 5
54 
+  jackson:
55 
+    serialization: true
56 
+    time-zone: GMT+8
57 
+    date-format: java.text.SimpleDateFormat
58 
+
59 
+  http:
60 
+    # 文件上传限制
61 
+    multipart:
62 
+      enabled: true
63 
+      max-file-size: 50mb
64 
+      max-request-size: 200mb
65 
+  thymeleaf:
66 
+    cache: false
67 
+    mode: LEGACYHTML5
68 
+
69 
+mybatis-plus:
70 
+  # 如果是放在src/main/java目录下 classpath:/com/yourpackage/*/mapper/*Mapper.xml
71 
+  # 如果是放在resource目录 classpath:/mapper/*Mapper.xml
72 
+  mapper-locations: classpath:/mapper/*Mapper.xml
73 
+  #实体扫描，多个package用逗号或者分号分隔
74 
+  typeAliasesPackage: com.yingying.tourist.domain
75 
+  global-config:
76 
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
77 
+    id-type: 0
78 
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
79 
+    field-strategy: 2
80 
+    #驼峰下划线转换
81 
+    db-column-underline: true
82 
+    #mp2.3+ 全局表前缀 mp_
83 
+    #table-prefix: t_
84 
+    #刷新mapper 调试神器
85 
+    #refresh-mapper: true
86 
+    #数据库大写下划线转换
87 
+    #capital-mode: true
88 
+    # Sequence序列接口实现类配置
89 
+    # key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
90 
+    #逻辑删除配置（下面3个配置）
91 
+    logic-delete-value: 1
92 
+    logic-not-delete-value: 0
93 
+    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
94 
+    #自定义填充策略接口实现
95 
+    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
96 
+  configuration:
97 
+    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
98 
+    map-underscore-to-camel-case: true
99 
+    cache-enabled: false
100 
+    #配置JdbcTypeForNull, oracle数据库必须配置
101 
+    jdbc-type-for-null: 'null'
102 
+
103 
+# log
104 
+logging:
105 
+  config: classpath:logback.xml
106 
+
107 
+session:
108 
+  domain: wx.yingyinglicai.com
109 
+
110 
+weixin:
111 
+  appid: wx00b0504317473c38
112 
+  appSecret: 88d1172e0a53444298efe61c763bf894
113 
+  authorization: false

+ 104 - 99
src/main/resources/env/qa/application.yml
View File 

@@ -1,99 +1,104 @@
1 
-# 内嵌服务器配置tomcat,jetty
2 
-server:
3 
-  port: 8085
4 
-
5 
-# mysql
6 
-spring:
7 
-  application:
8 
-    name: TOURIST
9 
-  datasource:
10 
-    type: com.alibaba.druid.pool.DruidDataSource
11 
-    url: jdbc:mysql://10.100.2.12:3306/tourist-test?useUnicode=true&characterEncoding=utf8&useSSL=false
12 
-    username: root
13 
-    password: Wo4heike
14 
-    driver-class-name: com.mysql.jdbc.Driver
15 
-    # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
16 
-    filters: stat,wall,log4j
17 
-    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
18 
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
19 
-    # 合并多个DruidDataSource的监控数据
20 
-    useGlobalDataSourceStat: true
21 
-
22 
-    # 连接池配置
23 
-    max-active: 200
24 
-    initial-size: 5
25 
-    max-wait: 60000
26 
-    min-idle: 1
27 
-    pool-prepared-statements: true
28 
-    max-open-prepared-statements: 20
29 
-
30 
-    #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
31 
-    time-between-eviction-runs-millis: 60000
32 
-    #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
33 
-    min-evictable-idle-time-millis: 300000
34 
-
35 
-    # 连接有效性检测
36 
-    test-while-idle: true
37 
-    test-on-borrow: false
38 
-    test-on-return: false
39 
-    validation-query: SELECT 1
40 
-
41 
-  redis:
42 
-      host: 10.100.2.12
43 
-      password: yinghuo
44 
-      port: 6379
45 
-      database: 6
46 
-      pool:
47 
-        min-idle: 5
48 
-  jackson:
49 
-    serialization: true
50 
-    time-zone: GMT+8
51 
-    date-format: java.text.SimpleDateFormat
52 
-
53 
-  http:
54 
-    # 文件上传限制
55 
-    multipart:
56 
-      enabled: true
57 
-      max-file-size: 50mb
58 
-      max-request-size: 200mb
59 
-
60 
-mybatis-plus:
61 
-  # 如果是放在src/main/java目录下 classpath:/com/yourpackage/*/mapper/*Mapper.xml
62 
-  # 如果是放在resource目录 classpath:/mapper/*Mapper.xml
63 
-  mapper-locations: classpath:/mapper/*Mapper.xml
64 
-  #实体扫描，多个package用逗号或者分号分隔
65 
-  typeAliasesPackage: com.yingying.tourist.domain
66 
-  global-config:
67 
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
68 
-    id-type: 0
69 
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
70 
-    field-strategy: 2
71 
-    #驼峰下划线转换
72 
-    db-column-underline: true
73 
-    #mp2.3+ 全局表前缀 mp_
74 
-    #table-prefix: t_
75 
-    #刷新mapper 调试神器
76 
-    #refresh-mapper: true
77 
-    #数据库大写下划线转换
78 
-    #capital-mode: true
79 
-    # Sequence序列接口实现类配置
80 
-    # key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
81 
-    #逻辑删除配置（下面3个配置）
82 
-    logic-delete-value: 1
83 
-    logic-not-delete-value: 0
84 
-    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
85 
-    #自定义填充策略接口实现
86 
-    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
87 
-  configuration:
88 
-    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
89 
-    map-underscore-to-camel-case: true
90 
-    cache-enabled: false
91 
-    #配置JdbcTypeForNull, oracle数据库必须配置
92 
-    jdbc-type-for-null: 'null'
93 
-
94 
-# log
95 
-logging:
96 
-  config: classpath:logback.xml
97 
-
98 
-session:
99 
-  domain: wx.yingyinglicai.com
1 
+# 内嵌服务器配置tomcat,jetty
2 
+server:
3 
+  port: 8085
4 
+
5 
+# mysql
6 
+spring:
7 
+  application:
8 
+    name: TOURIST
9 
+  datasource:
10 
+    type: com.alibaba.druid.pool.DruidDataSource
11 
+    url: jdbc:mysql://10.100.2.12:3306/tourist-test?useUnicode=true&characterEncoding=utf8&useSSL=false
12 
+    username: root
13 
+    password: Wo4heike
14 
+    driver-class-name: com.mysql.jdbc.Driver
15 
+    # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
16 
+    filters: stat,wall,log4j
17 
+    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
18 
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
19 
+    # 合并多个DruidDataSource的监控数据
20 
+    useGlobalDataSourceStat: true
21 
+
22 
+    # 连接池配置
23 
+    max-active: 200
24 
+    initial-size: 5
25 
+    max-wait: 60000
26 
+    min-idle: 1
27 
+    pool-prepared-statements: true
28 
+    max-open-prepared-statements: 20
29 
+
30 
+    #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
31 
+    time-between-eviction-runs-millis: 60000
32 
+    #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
33 
+    min-evictable-idle-time-millis: 300000
34 
+
35 
+    # 连接有效性检测
36 
+    test-while-idle: true
37 
+    test-on-borrow: false
38 
+    test-on-return: false
39 
+    validation-query: SELECT 1
40 
+
41 
+  redis:
42 
+      host: 10.100.2.12
43 
+      password: yinghuo
44 
+      port: 6379
45 
+      database: 6
46 
+      pool:
47 
+        min-idle: 5
48 
+  jackson:
49 
+    serialization: true
50 
+    time-zone: GMT+8
51 
+    date-format: java.text.SimpleDateFormat
52 
+
53 
+  http:
54 
+    # 文件上传限制
55 
+    multipart:
56 
+      enabled: true
57 
+      max-file-size: 50mb
58 
+      max-request-size: 200mb
59 
+
60 
+mybatis-plus:
61 
+  # 如果是放在src/main/java目录下 classpath:/com/yourpackage/*/mapper/*Mapper.xml
62 
+  # 如果是放在resource目录 classpath:/mapper/*Mapper.xml
63 
+  mapper-locations: classpath:/mapper/*Mapper.xml
64 
+  #实体扫描，多个package用逗号或者分号分隔
65 
+  typeAliasesPackage: com.yingying.tourist.domain
66 
+  global-config:
67 
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
68 
+    id-type: 0
69 
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
70 
+    field-strategy: 2
71 
+    #驼峰下划线转换
72 
+    db-column-underline: true
73 
+    #mp2.3+ 全局表前缀 mp_
74 
+    #table-prefix: t_
75 
+    #刷新mapper 调试神器
76 
+    #refresh-mapper: true
77 
+    #数据库大写下划线转换
78 
+    #capital-mode: true
79 
+    # Sequence序列接口实现类配置
80 
+    # key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
81 
+    #逻辑删除配置（下面3个配置）
82 
+    logic-delete-value: 1
83 
+    logic-not-delete-value: 0
84 
+    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
85 
+    #自定义填充策略接口实现
86 
+    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
87 
+  configuration:
88 
+    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
89 
+    map-underscore-to-camel-case: true
90 
+    cache-enabled: false
91 
+    #配置JdbcTypeForNull, oracle数据库必须配置
92 
+    jdbc-type-for-null: 'null'
93 
+
94 
+# log
95 
+logging:
96 
+  config: classpath:logback.xml
97 
+
98 
+session:
99 
+  domain: wx.yingyinglicai.com
100 
+
101 
+weixin:
102 
+  appid: wx00b0504317473c38
103 
+  appSecret: 88d1172e0a53444298efe61c763bf894
104 
+  authorization: false