From 5188b99995532196ceb0323a63e60007a3bbc38f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 21 Dec 2022 20:51:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8F=92=E4=BB=B6):=20=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=89=E8=A3=85=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/plugins/config/PluginRunner.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java b/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java
index db6abc5044..6fa4b9267c 100644
--- a/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java
+++ b/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java
@@ -6,6 +6,7 @@ import io.dataease.plugins.common.base.domain.MyPlugin;
 import io.dataease.service.sys.PluginService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -53,7 +54,7 @@ public class PluginRunner implements ApplicationRunner {
                     MyPlugin plugin = discardPlugins.get(i);
                     pluginService.uninstall(plugin.getPluginId());
                 }
-            }catch (Exception e) {
+            } catch (Exception e) {
                 LogUtil.error(e.getMessage(), e);
             }
 
@@ -73,10 +74,17 @@ public class PluginRunner implements ApplicationRunner {
 
 
             String jarPath = jarFile.getAbsolutePath();
+            if (!StringUtils.equals("default", store) && !jarFile.exists()) {
+                version = "1.0-SNAPSHOT";
+                path = pluginDir + store + "/" + moduleName + "-" + version + ".jar";
+                plugin.setVersion(version);
+                jarFile = new File(path);
+                jarPath = jarFile.getAbsolutePath();
+            }
             try {
                 if (jarFile.exists()) {
                     pluginService.loadJar(jarPath, plugin);
-                }else {
+                } else {
                     LogUtil.error("插件路径不存在 {} ", jarPath);
                 }
             } catch (Exception e) {