Merge pull request #16001 in DESIGN/design from fbp/release to fbp/feature

* commit '0233a31732eab041d47431dc2aedb34a67225421':
  REPORT-141155 FR12埋点-远程设计切换埋点appid字段没有记录
  REPORT-145453 【fr-fbp】ssh和ssl的数据连接，去获取密钥等文件时，路径深的时候选择后路径有问题

designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java

@@ -6,6 +6,7 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.security.ssl.Ssl;
 import com.fr.data.security.ssl.SslException;
 import com.fr.data.security.ssl.SslType;
+import com.fr.data.security.ssl.SslUtils;
 import com.fr.data.security.ssl.impl.NormalSsl;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.data.datapane.connect.SshPane.KeyFileUITextField;
@@ -19,6 +20,7 @@ import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
@@ -47,6 +49,7 @@ public class SslPane extends BasicPane {
     private final UIButton fileChooserButtonClientKey = new UIButton();
     private final UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca"));
     private final JPanel sslSettingPane;
+    private static final String TRIM = SslUtils.CERTIFICATES + ProjectConstants.FORWARD_SLASH;
 
     public SslPane() {
         initDotButtons();
@@ -151,7 +154,11 @@ public class SslPane extends BasicPane {
                 if (file == null) {
                     textField.setText(StringUtils.EMPTY);
                 } else {
-                    textField.setText(file.getPath());
+                    String path = file.getPath();
+                    if (path.startsWith(TRIM)) {
+                        path = path.substring(TRIM.length());
+                    }
+                    textField.setText(path);
                 }
             }
             fileChooser.removeAllFilter();

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();
+    }
 }