修改文档功能

jctml · Mar 23, 2018 · 4afc95d · 4afc95d
1 parent 821fc74
commit 4afc95d
Show file tree

Hide file tree

Showing 52 changed files with 907 additions and 396 deletions.
diff --git a/plugin-attachment/src/main/java/cn/xiaoyaoji/plugin/attachment/AttachmentPlugin.java b/plugin-attachment/src/main/java/cn/xiaoyaoji/plugin/attachment/AttachmentPlugin.java
@@ -2,14 +2,15 @@
 
 import cn.xiaoyaoji.core.common.Result;
 import cn.xiaoyaoji.core.plugin.Plugin;
+import cn.xiaoyaoji.core.plugin.doc.DocEvPlugin;
 import cn.xiaoyaoji.core.util.AssertUtils;
 import cn.xiaoyaoji.core.util.StringUtils;
 import cn.xiaoyaoji.data.DataFactory;
 import cn.xiaoyaoji.event.ApplicationEventMulticaster;
 import cn.xiaoyaoji.extension.file.FileUtils;
 import cn.xiaoyaoji.extension.file.MetaData;
-import cn.xiaoyaoji.service.ServiceFactory;
 import cn.xiaoyaoji.plugin.attachment.model.Attachment;
+import cn.xiaoyaoji.service.ServiceFactory;
 import org.apache.commons.dbutils.handlers.BeanListHandler;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
@@ -45,7 +46,7 @@
  * @author zhoujingjie
  * Date 2018-01-27
  */
-public class AttachmentPlugin extends Plugin {
+public class AttachmentPlugin extends DocEvPlugin {
     private Logger logger = LoggerFactory.getLogger(getClass());
     private String tableName = "plugin_attachment";
     /**
@@ -170,4 +171,5 @@ public void delete(String id) {
         }
         DataFactory.instance().delete(tableName, id);
     }
+
 }
diff --git a/plugin-attachment/src/main/plugin-resources/plugin.json b/plugin-attachment/src/main/plugin-resources/plugin.json
@@ -1,22 +1,29 @@
 [
   {
-    "id":"cn.xiaoyaoji.plugin.attachment",
+    "id": "cn.xiaoyaoji.plugin.attachment",
     "name": "附件",
+    "shortName": "附件",
     "clazz": "cn.xiaoyaoji.plugin.attachment.AttachmentPlugin",
     "description": "支持附件上传",
     "author": "zhoujingjie",
     "createTime": "2017/06/21",
     "version": "2.2",
-    "events":["docEdit","docView"],
-    "icon":{
-      "icon32x32":"/assets/http.png"
+    "events": [
+      "docEdit",
+      "docView"
+    ],
+    "icon": {
+      "icon32x32": "/assets/http.png"
     },
-    "dependency":{
-      "min":"2.3.0"
+    "dependency": {
+      "min": "2.3.0"
     },
-    "config":{
-      "excludeContentTypes":""
+    "config": {
+      "excludeContentTypes": ""
     },
-    "supportPageTypes":["sys.http","sys.websocket"]
+    "supportPageTypes": [
+      "sys.http",
+      "sys.websocket"
+    ]
   }
 ]
diff --git a/plugin-attachment/src/main/plugin-resources/web/edit.js b/plugin-attachment/src/main/plugin-resources/web/edit.js
@@ -13,9 +13,9 @@
             created: function () {
                 this.pluginId = null;
                 this.loadData();
-                if(!xyj.page.editMode){
+                /*if(!xyj.page.editMode){
                     $('#plugin-attachment').insertBefore($('#doc-demo'));
-                }
+                }*/
             },
             methods: {
                 loadData: function () {

diff --git a/plugin-doc/src/main/java/cn/xiaoyaoji/plugin/doc/FolderDocPlugin.java b/plugin-doc/src/main/java/cn/xiaoyaoji/plugin/doc/FolderDocPlugin.java
@@ -9,14 +9,4 @@
 public class FolderDocPlugin extends DocEvPlugin{
 
 
-    @Override
-    public String getEditPage() {
-        return "folder/edit.jsp";
-    }
-
-    @Override
-    public String getViewPage() {
-        return "folder/view.jsp";
-    }
-
 }
diff --git a/plugin-history/src/main/java/cn/xiaoyaoji/plugin/history/HistoryPlugin.java b/plugin-history/src/main/java/cn/xiaoyaoji/plugin/history/HistoryPlugin.java
@@ -1,7 +1,6 @@
 package cn.xiaoyaoji.plugin.history;
 
-import cn.xiaoyaoji.core.plugin.Plugin;
-import cn.xiaoyaoji.core.plugin.doc.DocExtensionPlugin;
+import cn.xiaoyaoji.core.plugin.doc.DocEvPlugin;
 import cn.xiaoyaoji.core.util.ResultUtils;
 import cn.xiaoyaoji.data.DataFactory;
 import cn.xiaoyaoji.data.bean.TableNames;
@@ -33,7 +32,7 @@
  * @author zhoujingjie
  * Date 2018-03-20
  */
-public class HistoryPlugin extends DocExtensionPlugin {
+public class HistoryPlugin extends DocEvPlugin {
     private String TABLE_NAME = "plugin_history";
 
     @Override
@@ -75,19 +74,4 @@ public Object httpRequest(String path, HttpServletRequest request, HttpServletRe
         }
         return null;
     }
-
-    @Override
-    public String getExtensionName() {
-        return getPluginInfo().getConfig().getOrDefault("extensionName", "历史记录");
-    }
-
-    @Override
-    public String getEditPage() {
-        return "/web/view.jsp";
-    }
-
-    @Override
-    public String getViewPage() {
-        return "/web/view.jsp";
-    }
 }
diff --git a/plugin-history/src/main/plugin-resources/plugin.json b/plugin-history/src/main/plugin-resources/plugin.json
@@ -8,8 +8,8 @@
     "createTime": "2018/03/20",
     "version": "2.3.0",
     "events": [
-      "docViewTab",
-      "docEditTab"
+      "docView",
+      "docEdit"
     ],
     "icon": {
       "icon32x32": "/assets/icon.png"

diff --git a/plugin-login/src/main/java/cn/xiaoyaoji/plugin/login/github/GithubLoginPlugin.java b/plugin-login/src/main/java/cn/xiaoyaoji/plugin/login/github/GithubLoginPlugin.java
@@ -5,7 +5,7 @@
 import cn.xiaoyaoji.data.bean.Thirdparty;
 import cn.xiaoyaoji.data.bean.User;
 import cn.xiaoyaoji.service.ServiceFactory;
-import cn.xiaoyaoji.utils.PluginUtils;
+import cn.xiaoyaoji.core.plugin.PluginUtils;
 import org.apache.log4j.Logger;
 
 import javax.servlet.ServletException;

diff --git a/plugin-login/src/main/java/cn/xiaoyaoji/plugin/login/qq/QQLoginPlugin.java b/plugin-login/src/main/java/cn/xiaoyaoji/plugin/login/qq/QQLoginPlugin.java
@@ -5,7 +5,7 @@
 import cn.xiaoyaoji.data.bean.Thirdparty;
 import cn.xiaoyaoji.data.bean.User;
 import cn.xiaoyaoji.service.ServiceFactory;
-import cn.xiaoyaoji.utils.PluginUtils;
+import cn.xiaoyaoji.core.plugin.PluginUtils;
 import org.apache.log4j.Logger;
 
 import javax.servlet.ServletException;

diff --git a/plugin-login/src/main/java/cn/xiaoyaoji/plugin/login/weibo/WeiboLoginPlugin.java b/plugin-login/src/main/java/cn/xiaoyaoji/plugin/login/weibo/WeiboLoginPlugin.java
@@ -5,7 +5,7 @@
 import cn.xiaoyaoji.data.bean.Thirdparty;
 import cn.xiaoyaoji.data.bean.User;
 import cn.xiaoyaoji.service.ServiceFactory;
-import cn.xiaoyaoji.utils.PluginUtils;
+import cn.xiaoyaoji.core.plugin.PluginUtils;
 import org.apache.log4j.Logger;
 
 import javax.servlet.ServletException;

diff --git a/xiaoyaoji-biz/src/main/java/cn/xiaoyaoji/core/plugin/Event.java b/xiaoyaoji-biz/src/main/java/cn/xiaoyaoji/core/plugin/Event.java
@@ -27,14 +27,6 @@ public enum Event {
      * 文档导入
      */
     docImport,
-    /**
-     * 文档查看模式的tab
-     */
-    docViewTab,
-    /**
-     * 文档编辑模式的tab
-     */
-    docEditTab,
     /**
      * 登录
      */

diff --git a/xiaoyaoji-biz/src/main/java/cn/xiaoyaoji/core/plugin/PlatformPluginManager.java b/xiaoyaoji-biz/src/main/java/cn/xiaoyaoji/core/plugin/PlatformPluginManager.java
@@ -0,0 +1,101 @@
+package cn.xiaoyaoji.core.plugin;
+
+import cn.xiaoyaoji.core.plugin.doc.DocImportPlugin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ┏┓　　　┏┓
+ * ┏┛┻━━━┛┻┓
+ * ┃　　　　　　　┃
+ * ┃　　　━　　　┃
+ * ┃　┳┛　┗┳　┃
+ * ┃　　　　　　　┃
+ * ┃　　　┻　　　┃
+ * ┃　　　　　　　┃
+ * ┗━┓　　　┏━┛
+ * 　　┃　　　┃神兽保佑
+ * 　　┃　　　┃代码无BUG！
+ * 　　┃　　　┗━━━┓
+ * 　　┃　　　　　　　┣┓
+ * 　　┃　　　　　　　┏┛
+ * 　　┗┓┓┏━┳┓┏┛
+ * 　　　┃┫┫　┃┫┫
+ * 　　　┗┻┛　┗┻┛
+ * <p>
+ * 系统平台插件
+ *
+ * @author zhoujingjie
+ * Date 2018-03-21
+ */
+public class PlatformPluginManager {
+    private static PlatformPluginManager instance = new PlatformPluginManager();
+
+    private PlatformPluginManager() {
+
+    }
+
+    public static PlatformPluginManager getInstance() {
+        return instance;
+    }
+
+
+    /**
+     * 获取登录插件
+     *
+     * @return list
+     */
+    public List<PluginInfo<LoginPlugin>> getLoginPlugins() {
+        List<PluginInfo> pluginInfos = PluginManager.getInstance().getPlugins(Event.login);
+        List<PluginInfo<LoginPlugin>> temp = new ArrayList<>(pluginInfos.size());
+        for (PluginInfo item : pluginInfos) {
+            temp.add(item);
+        }
+        return temp;
+    }
+
+    /**
+     * 获取所有导入插件
+     */
+    public List<PluginInfo<DocImportPlugin>> getImportPlugins() {
+        List<PluginInfo> list = PluginManager.getInstance().getPlugins(Event.docImport);
+        List<PluginInfo<DocImportPlugin>> temp = new ArrayList<>(list.size());
+        for (PluginInfo item : list) {
+            temp.add(item);
+        }
+        return temp;
+    }
+
+    /**
+     * 获取导入插件
+     *
+     * @param pluginId 插件id
+     * @return 插件
+     */
+    public PluginInfo<DocImportPlugin> getImportPlugin(String pluginId) {
+        for (PluginInfo<DocImportPlugin> item : getImportPlugins()) {
+            if (item.getId().equals(pluginId)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 获取登录插件
+     *
+     * @param pluginId 插件id
+     * @return 登录插件
+     */
+    public PluginInfo<LoginPlugin> getLoginPlugin(String pluginId) {
+        for (PluginInfo<LoginPlugin> item : getLoginPlugins()) {
+            if (item.getId().equals(pluginId)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/xiaoyaoji-biz/src/main/java/cn/xiaoyaoji/core/plugin/PluginInfo.java b/xiaoyaoji-biz/src/main/java/cn/xiaoyaoji/core/plugin/PluginInfo.java
@@ -14,6 +14,7 @@
 public class PluginInfo<T extends Plugin> {
     private String id;
     private String name;
+    private String shortName;
     private String description;
     private String author;
     private String createTime;
@@ -189,5 +190,17 @@ public Set<Event> getEvents() {
     public void setEvents(Set<Event> events) {
         this.events = events;
     }
+
+    public String getShortName() {
+        if(shortName == null) {
+            return getName();
+        }
+        return shortName;
+    }
+
+    public PluginInfo setShortName(String shortName) {
+        this.shortName = shortName;
+        return this;
+    }
 }