Merge remote-tracking branch 'origin/master'

master
hengming.lhm 7 years ago
commit 222b6da3b8
  1. 4
      src/main/resources/application-dev.properties
  2. 2
      src/main/resources/application-prod.properties
  3. 2
      src/main/resources/application-test.properties
  4. 4
      src/main/resources/application.properties

@ -1,5 +1,5 @@
# \u5F00\u53D1\u73AF\u5883\u914D\u7F6E # 开发环境配置
# \u6570\u636E\u6E90\u914D\u7F6E\uFF0C\u8BF7\u4FEE\u6539\u4E3A\u4F60\u9879\u76EE\u7684\u5B9E\u9645\u914D\u7F6E # 数据源配置,请修改为你项目的实际配置
spring.datasource.url=jdbc:mysql://localhost:3306/test spring.datasource.url=jdbc:mysql://localhost:3306/test
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=123456

@ -1 +1 @@
# \u751F\u4EA7\u73AF\u5883\u914D\u7F6E # 生产环境配置

@ -1 +1 @@
# \u6D4B\u8BD5\u73AF\u5883\u914D\u7F6E # 测试环境配置

@ -1,6 +1,6 @@
spring.profiles.active=dev spring.profiles.active=dev
# \u6240\u6709\u73AF\u5883\u901A\u7528\u7684\u914D\u7F6E\uFF0C\u653E\u5728\u8FD9\u91CC # 所有环境通用的配置,放在这里
# 404 \u4EA4\u7ED9\u5F02\u5E38\u5904\u7406\u5668\u5904\u7406 # 404 交给异常处理器处理
spring.mvc.throw-exception-if-no-handler-found=true spring.mvc.throw-exception-if-no-handler-found=true
spring.resources.add-mappings=false spring.resources.add-mappings=false
Loading…
Cancel
Save