wms / wms_henanqingyuan · Commits

Commit f66bec7a632c42eb20aac52d5baf89f15b86844d

Authored by xqs
2 parents aacc8318 fdcf40a0

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

Inline Side-by-side
Showing 3 changed files with 82 additions and 18 deletions
src/main/resources/application-dev.yml 0 → 100644
  View file @f66bec7
  1 +# \u6570\u636E\u6E90\u914D\u7F6E
  2 +spring:
  3 + datasource:
  4 + type: com.alibaba.druid.pool.DruidDataSource
  5 + driverClassName: com.mysql.cj.jdbc.Driver
  6 + druid:
  7 + # \u4E3B\u5E93\u6570\u636E\u6E90
  8 + master:
  9 + url: jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
  10 + username: softhuaheng
  11 + password: HHrobot123.
  12 + # \u4ECE\u5E93\u6570\u636E\u6E90
  13 + slave:
  14 + # \u4ECE\u6570\u636E\u6E90\u5F00\u5173/\u9ED8\u8BA4\u5173\u95ED
  15 + enabled: false
  16 + url:
  17 + username:
  18 + password:
  19 + # \u521D\u59CB\u8FDE\u63A5\u6570
  20 + initialSize: 5
  21 + # \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
  22 + minIdle: 10
  23 + # \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
  24 + maxActive: 20
  25 + # \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
  26 + maxWait: 60000
  27 + # \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
  28 + timeBetweenEvictionRunsMillis: 60000
  29 + # \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
  30 + minEvictableIdleTimeMillis: 300000
  31 + # \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
  32 + maxEvictableIdleTimeMillis: 900000
  33 + # \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
  34 + validationQuery: SELECT 1 FROM DUAL
  35 + testWhileIdle: true
  36 + testOnBorrow: false
  37 + testOnReturn: false
  38 + webStatFilter:
  39 + enabled: true
  40 + statViewServlet:
  41 + enabled: true
  42 + # \u8BBE\u7F6E\u767D\u540D\u5355\uFF0C\u4E0D\u586B\u5219\u5141\u8BB8\u6240\u6709\u8BBF\u95EE
  43 + allow:
  44 + url-pattern: /druid/*
  45 + # \u63A7\u5236\u53F0\u7BA1\u7406\u7528\u6237\u540D\u548C\u5BC6\u7801
  46 + login-username:
  47 + login-password:
  48 + filter:
  49 + stat:
  50 + enabled: true
  51 + # \u6162SQL\u8BB0\u5F55
  52 + log-slow-sql: true
  53 + slow-sql-millis: 1000
  54 + merge-sql: true
  55 + wall:
  56 + config:
  57 + multi-statement-allow: true
  58 +
  59 +#\u65E5\u5FD7\u914D\u7F6E
  60 +logging:
  61 + level:
  62 + com.huaheng: debug
  63 + org.springframework: warn
  64 + spring.springboot.dao: DEBUG
  65 +
  66 +server:
  67 + port: 8888
  68 + servlet:
  69 + context-path: /twms/
src/main/resources/application-druid.properties
  View file @f66bec7
@@ -39,4 +39,12 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/monitor/druid/* @@ -39,4 +39,12 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/monitor/druid/*
39 spring.datasource.druid.filter.stat.log-slow-sql=true 39 spring.datasource.druid.filter.stat.log-slow-sql=true
40 spring.datasource.druid.filter.stat.slow-sql-millis=1000 40 spring.datasource.druid.filter.stat.slow-sql-millis=1000
41 spring.datasource.druid.filter.stat.merge-sql=false 41 spring.datasource.druid.filter.stat.merge-sql=false
42 -spring.datasource.druid.filter.wall.config.multi-statement-allow=true  
43 \ No newline at end of file 42 \ No newline at end of file
  43 +spring.datasource.druid.filter.wall.config.multi-statement-allow=true
  44 +#\u65E5\u5FD7\u914D\u7F6E
  45 +logging.level.com.huaheng=debug
  46 +logging.level.org.springframework=warn
  47 +logging.level.spring.springboot.dao=DEBUG
  48 +
  49 +#\u6D4B\u8BD5\u670D\u52A1\u7AEF\u53E3\u3001\u6D4B\u8BD5\u9879\u76EEcontextPath
  50 +server.port=8888
  51 +server.servlet.context-path=/twms/
src/main/resources/application.yml
  View file @f66bec7
  1 +spring:
  2 + profiles:
  3 + active: dev
  4 +---
1 #项目相关配置 5 #项目相关配置
2 #名称 6 #名称
3 huaheng: 7 huaheng:
@@ -11,19 +15,8 @@ huaheng: @@ -11,19 +15,8 @@ huaheng:
11 # 获取ip地址开关 15 # 获取ip地址开关
12 addressEnabled: false 16 addressEnabled: false
13 17
14 -#开发环境配置  
15 #测试服务端口、测试项目contextPath 18 #测试服务端口、测试项目contextPath
16 server: 19 server:
17 - port: 8888  
18 - servlet:  
19 - context-path: /twms/  
20 - #示例服务端口、示例项目contextPath  
21 - #server.port=8889  
22 - #server.servlet.context-path=/ewms/  
23 - #正式服务端口、正式项目contextPath  
24 - #server.port=8016  
25 - #server.servlet.context-path=/wms/  
26 - # tomcat的URI编码  
27 tomcat: 20 tomcat:
28 uri-encoding: UTF-8 21 uri-encoding: UTF-8
29 # tomcat最大线程数，默认为200 22 # tomcat最大线程数，默认为200
@@ -31,12 +24,6 @@ server: @@ -31,12 +24,6 @@ server:
31 # Tomcat启动初始化的线程数，默认值25 24 # Tomcat启动初始化的线程数，默认值25
32 min-spare-threads: 30 25 min-spare-threads: 30
33 26
34 -#日志配置  
35 -logging:  
36 - level:  
37 - com.huaheng: debug  
38 - org.springframework: warn  
39 - spring.springboot.dao: DEBUG  
40 27
41 # 用户配置 28 # 用户配置
42 user: 29 user: