Merge remote-tracking branch 'origin/develop' into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/enums/ClientEnum.java

@@ -13,8 +13,8 @@ import java.util.Map;
  */
 public enum ClientEnum {
 
-    ADMIN(1, "tuoheng-air-monitor-admin"),
-    MP(2, "tuoheng-air-monitor-mp");
+    ADMIN(1, "tuoheng-airmonitor-admin"),
+    MP(2, "tuoheng-airmonitor-mp");
 
     ClientEnum(int code, String description) {
         this.code = code;

tuoheng-service/tuoheng-admin/src/main/resources/application-local.yml

@@ -26,13 +26,13 @@ spring:
       name: DataSource-air-monitor-admin-local
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 填写你数据库的url、登录名、密码和数据库名
-#      url: jdbc:mysql://localhost:3306/tuoheng_air_monitor?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
+#      url: jdbc:mysql://localhost:3306/tuoheng_airmonitor?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
 #      username: root
 #      password: 123456
       url: jdbc:mysql://192.168.11.13:3306/tuoheng_airmonitor?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
       username: root
       password: idontcare
-#      url: jdbc:mysql://rm-uf6z740323e8053pj4o.mysql.rds.aliyuncs.com:3306/tuoheng_air_monitor?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
+#      url: jdbc:mysql://rm-uf6z740323e8053pj4o.mysql.rds.aliyuncs.com:3306/tuoheng_airmonitor?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false
 #      username: root
 #      password: TH22#2022
       filter: