Merge branch 'leng_dev' into big

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
 

pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/PigxJobAdminApplication.java

@@ -7,10 +7,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author xuxueli 2018-10-28 00:38:13
  */
 @SpringBootApplication
-public class PigXxlJobAdminApplication {
+public class PigxJobAdminApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(PigXxlJobAdminApplication.class, args);
+		SpringApplication.run(PigxJobAdminApplication.class, args);
 	}
 
 }