diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..4e44bca --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,69 @@ +# \u6570\u636E\u6E90\u914D\u7F6E +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # \u4E3B\u5E93\u6570\u636E\u6E90 + master: + url: jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + username: softhuaheng + password: HHrobot123. + # \u4ECE\u5E93\u6570\u636E\u6E90 + slave: + # \u4ECE\u6570\u636E\u6E90\u5F00\u5173/\u9ED8\u8BA4\u5173\u95ED + enabled: false + url: + username: + password: + # \u521D\u59CB\u8FDE\u63A5\u6570 + initialSize: 5 + # \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF + minIdle: 10 + # \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF + maxActive: 20 + # \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4 + maxWait: 60000 + # \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 + timeBetweenEvictionRunsMillis: 60000 + # \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2 + minEvictableIdleTimeMillis: 300000 + # \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2 + maxEvictableIdleTimeMillis: 900000 + # \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # \u8BBE\u7F6E\u767D\u540D\u5355\uFF0C\u4E0D\u586B\u5219\u5141\u8BB8\u6240\u6709\u8BBF\u95EE + allow: + url-pattern: /druid/* + # \u63A7\u5236\u53F0\u7BA1\u7406\u7528\u6237\u540D\u548C\u5BC6\u7801 + login-username: + login-password: + filter: + stat: + enabled: true + # \u6162SQL\u8BB0\u5F55 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + +#\u65E5\u5FD7\u914D\u7F6E +logging: + level: + com.huaheng: debug + org.springframework: warn + spring.springboot.dao: DEBUG + +server: + port: 8888 + servlet: + context-path: /twms/ diff --git a/src/main/resources/application-druid.properties b/src/main/resources/application-druid.properties index 54782c1..28d06d0 100644 --- a/src/main/resources/application-druid.properties +++ b/src/main/resources/application-druid.properties @@ -39,4 +39,12 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/monitor/druid/* spring.datasource.druid.filter.stat.log-slow-sql=true spring.datasource.druid.filter.stat.slow-sql-millis=1000 spring.datasource.druid.filter.stat.merge-sql=false -spring.datasource.druid.filter.wall.config.multi-statement-allow=true \ No newline at end of file +spring.datasource.druid.filter.wall.config.multi-statement-allow=true +#\u65E5\u5FD7\u914D\u7F6E +logging.level.com.huaheng=debug +logging.level.org.springframework=warn +logging.level.spring.springboot.dao=DEBUG + +#\u6D4B\u8BD5\u670D\u52A1\u7AEF\u53E3\u3001\u6D4B\u8BD5\u9879\u76EEcontextPath +server.port=8888 +server.servlet.context-path=/twms/ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5354a21..ed7db5d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,7 @@ +spring: + profiles: + active: dev +--- #项目相关配置 #名称 huaheng: @@ -11,19 +15,8 @@ huaheng: # 获取ip地址开关 addressEnabled: false -#开发环境配置 #测试服务端口、测试项目contextPath server: - port: 8888 - servlet: - context-path: /twms/ - #示例服务端口、示例项目contextPath - #server.port=8889 - #server.servlet.context-path=/ewms/ - #正式服务端口、正式项目contextPath - #server.port=8016 - #server.servlet.context-path=/wms/ - # tomcat的URI编码 tomcat: uri-encoding: UTF-8 # tomcat最大线程数,默认为200 @@ -31,12 +24,6 @@ server: # Tomcat启动初始化的线程数,默认值25 min-spare-threads: 30 -#日志配置 -logging: - level: - com.huaheng: debug - org.springframework: warn - spring.springboot.dao: DEBUG # 用户配置 user: