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

pigx-register/src/main/resources/application.yml

@@ -5,8 +5,8 @@ server:
 
 db:
   num: 1
-  user: ${MYSQL-USER:root}
-  password: ${MYSQL-PWD:root}
+  user: ${MYSQL_USER:root}
+  password: ${MYSQL_PWD:root}
   url:
     0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true