Merge remote-tracking branch 'origin/develop' into develop

src/main/resources/application-dev.yml

@@ -4,4 +4,4 @@ spring:
     password: Test123!
     url: jdbc:mysql://${MYSQL_HOST:116.63.67.122}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
 dc_client:
-  host: http://data-center:2400/dc #http://139.9.194.252:2400/dc  # http://192.168.0.3:2400/dc  # http://apidev.sycdev.com/dc
\ No newline at end of file
+  host: http://139.9.194.252:2400/dc #http://139.9.194.252:2400/dc  # http://192.168.0.3:2400/dc  # http://apidev.sycdev.com/dc
\ No newline at end of file

src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     name: slm-bi
   profiles:
     active:
-      - test
+      - dev
   freemarker:
     cache: false
     template-loader-path: classpath:/templates/ftl/