Merge branch 'dev' of 574315408/pigx into dev

pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml

@@ -16,8 +16,8 @@ spring:
   datasource:
     url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: ${MYSQL-PWD:root}
-    password: ${MYSQL-PWD:root}
+    username: ${MYSQL_USER:root}
+    password: ${MYSQL_PWD:root}
   mvc:
     static-path-pattern: /static/**
   freemarker: