Merge pull request #10 from zhoujingjie/dev

Dev
jctml · Dec 4, 2017 · 1147941 · 1147941
2 parents 47dac35 + ac9173d
commit 1147941
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/xiaoyaoji-plugins/src/main/plugin-resources/plugin.json b/xiaoyaoji-plugins/src/main/plugin-resources/plugin.json
@@ -54,7 +54,7 @@
     "description": "markdown文档",
     "author": "zhoujingjie",
     "createTime": "2017/06/21",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "event":"doc.ev",
     "icon":{
       "icon32x32":"/assets/markdown.png"

diff --git a/xiaoyaoji-plugins/src/main/plugin-resources/web/markdown/edit.jsp b/xiaoyaoji-plugins/src/main/plugin-resources/web/markdown/edit.jsp
@@ -5,6 +5,14 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <link rel="stylesheet" type="text/css" href="${cdn}/assets/simplemd/simplemde.min.css?v=${pluginInfo.version}"/>
+<style>
+    .editor-preview-side ul{
+        padding-left:30px;
+    }
+    .editor-preview-side ul li{
+        list-style:disc;
+    }
+</style>
 <textarea class="hide" id="md-edit">${doc.content}</textarea>
 <script>
     (function(){

diff --git a/xiaoyaoji-plugins/src/main/plugin-resources/web/markdown/view.jsp b/xiaoyaoji-plugins/src/main/plugin-resources/web/markdown/view.jsp
@@ -5,6 +5,14 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <textarea class="hide" id="md-view">${doc.content}</textarea>
+<style>
+    #md-view-html ul{
+        padding-left:30px;
+    }
+    #md-view-html ul li{
+        list-style:disc;
+    }
+</style>
 <div id="md-view-html"></div>
 <script>
     (function(){

diff --git a/xiaoyaoji-web/src/main/java/cn/com/xiaoyaoji/controller/AttachController.java b/xiaoyaoji-web/src/main/java/cn/com/xiaoyaoji/controller/AttachController.java
@@ -68,7 +68,7 @@ public Object upload(@RequestParam("file") List<MultipartFile> files,@RequestPar
     @Ignore
     @GetMapping("/{relatedId}")
     public Object get(@PathVariable String relatedId, @RequestParam String projectId,User user){
-        ServiceTool.checkUserHasAccessPermission(projectId,user);
+        //ServiceTool.checkUserHasAccessPermission(projectId,user);
         List<Attach> attaches= ServiceFactory.instance().getAttachsByRelatedId(relatedId);
         return new _HashMap<>()
                 .add("fileAccess", ConfigUtils.getFileAccessURL())

diff --git a/xiaoyaoji-web/src/main/java/cn/com/xiaoyaoji/controller/DocController.java b/xiaoyaoji-web/src/main/java/cn/com/xiaoyaoji/controller/DocController.java
@@ -271,7 +271,7 @@ public ModelAndView docView(@PathVariable String docId,
         if (user != null) {
             //访问权限
             editPermission = ServiceFactory.instance().checkUserHasProjectEditPermission(user.getId(), doc.getProjectId());
-            AssertUtils.isTrue(editPermission || (!editPermission && !editing),"无操作权限");
+            //AssertUtils.isTrue(editPermission || (!editPermission && !editing),"无操作权限");
         }
 
         List<PluginInfo> pluginInfos = PluginManager.getInstance().getPlugins(Event.DOC_EV);

diff --git a/xiaoyaoji-web/src/main/webapp/WEB-INF/plugins/cn.xiaoyaoji.plugin.zip b/xiaoyaoji-web/src/main/webapp/WEB-INF/plugins/cn.xiaoyaoji.plugin.zip