Merge remote-tracking branch 'origin/fbp/release' into fbp/release

designer-base/src/main/java/com/fr/design/metric/AbstractDesignerMetric.java

@@ -2,7 +2,7 @@ package com.fr.design.metric;
 
 import com.fanruan.carina.Carina;
 import com.fanruan.config.bbs.FineBBSConfigProvider;
-import com.fr.config.MarketConfig;
+import com.fanruan.repository.ConfigRepository;
 import com.fr.design.DesignerEnvManager;
 import com.fr.general.GeneralUtils;
 import com.fr.json.JSONObject;
@@ -34,6 +34,6 @@ public abstract class AbstractDesignerMetric {
         info.put(DESIGNER_ID, DesignerEnvManager.getEnvManager().getUUID());
         info.put(DESIGNER_VERSION, GeneralUtils.getVersion());
         info.put(USERID, Carina.config(FineBBSConfigProvider.class).getBbsUid());
-        info.put(APPID, MarketConfig.getInstance().getCloudOperationMaintenanceId());
+        info.put(APPID, ConfigRepository.getInstance().getAppID());
     }
 }

designer-realize/src/main/java/com/fanruan/config/LocalConfigSource.java

@@ -1,7 +1,8 @@
 package com.fanruan.config;
 
-import com.fr.base.email.EmailCenter;
 import com.fanruan.repository.BaseConfigSource;
+import com.fr.base.email.EmailCenter;
+import com.fr.design.DesignerEnvManager;
 
 /**
  * 本地配置资源
@@ -16,4 +17,9 @@ public class LocalConfigSource extends BaseConfigSource {
     public boolean isEmailConfigValid() {
         return EmailCenter.isEmailConfigValid();
     }
+
+    @Override
+    public String getAppID() {
+        return DesignerEnvManager.getEnvManager().getUUID();
+    }
 }