Pull request #4601: REPORT-53691 & REPORT-53706 & REPORT-53711

Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0

* commit 'fedbde7969cb301d2444b6ca7d0414ce6021bd1e':
  REPORT-53711 设计器用户登录策略调整-插件无法安装
  增加对验证码长度的校验
  修复引导页面无法关闭的问题

designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@@ -9,6 +9,7 @@ import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
+import com.fr.plugin.manage.control.PluginExtraInfo;
 import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
@@ -206,7 +207,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                 JSONObject latestPluginInfo = PluginUtils.getLatestPluginInfo(id);
                 String latestPluginVersion = (String) latestPluginInfo.get("version");
                 PluginMarker toPluginMarker = PluginMarker.create(id, latestPluginVersion);
-                PluginManager.getController().download(pluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
+                PluginManager.getController().download(pluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane), PluginExtraInfo.newBuilder().username(DesignerEnvManager.getEnvManager().getDesignerLoginUsername()).build());
             } catch (Exception e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -20,6 +20,7 @@ import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.context.PluginMarkerAdapter;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.control.PluginControllerHelper;
+import com.fr.plugin.manage.control.PluginExtraInfo;
 import com.fr.plugin.manage.control.PluginTask;
 import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -42,7 +43,7 @@ public class PluginOperateUtils {
         PluginMarker marker = updateMarker2Online(pluginMarker);
         //下载插件
         PluginTask pluginTask = PluginTask.installTask(marker);
-        PluginControllerHelper.installOnline(pluginMarker, new InstallOnlineCallback(pluginTask, jsCallback));
+        PluginControllerHelper.installOnline(pluginMarker, new InstallOnlineCallback(pluginTask, jsCallback), PluginExtraInfo.newBuilder().username(DesignerEnvManager.getEnvManager().getDesignerLoginUsername()).build());
     }
 
     public static PluginMarker updateMarker2Online(PluginMarker pluginMarker) {
@@ -76,7 +77,7 @@ public class PluginOperateUtils {
             //当前已经安装的相同ID插件marker
             PluginMarker currentMarker = PluginMarkerAdapter.create(PluginUtils.getInstalledPluginMarkerByID(pluginMarker.getPluginID()), pluginName);
             PluginTask pluginTask = PluginTask.updateTask(currentMarker, toPluginMarker);
-            PluginControllerHelper.updateOnline(currentMarker, toPluginMarker, new UpdateOnlineCallback(pluginTask, jsCallback));
+            PluginControllerHelper.updateOnline(currentMarker, toPluginMarker, new UpdateOnlineCallback(pluginTask, jsCallback), PluginExtraInfo.newBuilder().username(DesignerEnvManager.getEnvManager().getDesignerLoginUsername()).build());
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@@ -9,6 +9,7 @@ import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
+import com.fr.plugin.manage.control.PluginExtraInfo;
 import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
@@ -180,7 +181,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
                 JSONObject latestPluginInfo = PluginUtils.getLatestPluginInfo(pluginMarker.getPluginID());
                 String latestPluginVersion = (String) latestPluginInfo.get("version");
                 PluginMarker toPluginMarker = PluginMarker.create(pluginMarker.getPluginID(), latestPluginVersion);
-                PluginManager.getController().download(pluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
+                PluginManager.getController().download(pluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane), PluginExtraInfo.newBuilder().username(DesignerEnvManager.getEnvManager().getDesignerLoginUsername()).build());
             } catch (Exception e) {
             }
 

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -22,6 +22,7 @@ import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.control.PluginControllerHelper;
+import com.fr.plugin.manage.control.PluginExtraInfo;
 import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.manage.control.ProgressCallback;
@@ -345,7 +346,7 @@ public class VersionCheckUtils {
                         FineLoggerFactory.getLogger().info("installPlugin: " + result.getCurrentTask().getMarker().getPluginID());
                     }
                 }
-            });
+            }, PluginExtraInfo.newBuilder().username(DesignerEnvManager.getEnvManager().getDesignerLoginUsername()).build());
         }
         try {
             latch.await();

designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppUtils.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.app;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.UIExpandDialog;
 import com.fr.design.extra.exe.callback.InstallOnlineCallback;
@@ -13,6 +14,7 @@ import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.context.PluginMarkerAdapter;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.control.PluginControllerHelper;
+import com.fr.plugin.manage.control.PluginExtraInfo;
 import com.fr.plugin.manage.control.PluginTask;
 import com.fr.stable.StringUtils;
 import com.fr.stable.TemplateIOErrorContextHolder;
@@ -198,7 +200,7 @@ public class DesignerAppUtils {
         Collection<PluginMarkerAdapter> uninstallPlugins = stringPluginMarkerAdapterMultimap.get(TemplateIOErrorContextHolder.NOT_INSTALLED_PLUGIN);
         for (PluginMarker uninstallPlugin : uninstallPlugins) {
             PluginTask pluginTask = PluginTask.installTask(uninstallPlugin);
-            PluginControllerHelper.installOnline(uninstallPlugin, new InstallOnlineCallback(pluginTask));
+            PluginControllerHelper.installOnline(uninstallPlugin, new InstallOnlineCallback(pluginTask), PluginExtraInfo.newBuilder().username(DesignerEnvManager.getEnvManager().getDesignerLoginUsername()).build());
         }
     }
 }