Fix custom parameter comment data compatibility issue

README.md

@@ -1,5 +1,4 @@
-# 域名临时切换为 http://123.56.41.127/  ！！！！
-[官网在线使用地址 http://123.56.41.127/](http://123.56.41.127/)
+[官网在线使用地址 http://api.crap.cn](http://api.crap.cn)
 
 # CrapApi
 [官网在线使用地址crap.cn](http://crap.cn)
@@ -24,11 +23,16 @@ CrapApi是完全免费开源项目，源码在GitHub、码云上可以获取，
 ```
 ```
 当然项目发展离不开你的支持，如果觉得项目确实不错，可以在码云上捐赠！
-付费用户群：263949884，捐助100元及以上可加入付费用户群，可享有需求优先解决、协助部署、二次开发帮助，官网账号升级（添加赞助标识等）
+付费用户群：263949884，捐助100元及以上可加入付费用户群，可享有需求优先解决、协助部署、二次开发帮助）
 所有捐赠将用于阿里云服务器采购、CDN、RDS数据库、带宽升级等网站性能优化！
 ```
 <img width = "100%" height="200" src="http://api.crap.cn/resources/upload/images/2018-11/30125847sFDcfL.CAV.5gLaDc.1.png?ddd"/>
 
+[CrapApi用户]
+```
+阿里巴巴
+拉勾
+```
 
 [CrapApi能做什么？]
 ```
@@ -53,7 +57,7 @@ Windows系统：2G内存以上，jdk7及以上，Tomcat7及以上，mysql5.6及
 [演示&帮助文档&部署文档]
 ```
 帮助文档地址：http://api.crap.cn
-用户交流群：254450938[1群] 535449678[2群]
+用户交流群：959969432[3群] 
 ```
 
 [主要技术]
@@ -73,18 +77,6 @@ API接口管理系统,API接口管理,在线API接口管理,API接口调试工
 
 <img width = "100" height = "100" align=left  src="http://api.crap.cn/resources/images/wepay.jpg"/>
 
-```
-各位好，我是Nico，一名年纪轻轻就秃了头的程序猿，
-好人有好报，求各位打赏，帮我集资买瓶生发水吧!
-打赏10元，你的程序从此告别bug；打赏50元，你的头发茂盛的想亚马逊丛林；
-打赏100元，加入"穿着特步相亲也能轻松俘获女神的VIP QQ群（263949884），
-Nico将竭诚为你提供协助部署、升级帮助、问题解答等各种羞羞的服务...
-或者
-如果你宁愿情人节独自在办公室加班修bug，也不给我买生发水
-至少帮我在 Gitee 或 GitHub 上点个赞好不好？
-:)
-```
-
 
 最新消息：</br>
 [2016 年9月获得码云推荐]</br>

api/.gitignore

@@ -8,3 +8,4 @@
 .project
 .settings
 .classpath
+**/*.DS_Store

api/pom.xml

@@ -13,7 +13,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<!-- 编译时的编码 -->
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-		<spring_version>4.2.0.RELEASE</spring_version>
+		<spring_version>5.2.3.RELEASE</spring_version>
 		<mybatis.version>3.4.6</mybatis.version>
 		<mybatis-generator-core.version>1.3.7</mybatis-generator-core.version>
 		<mybatis-spring.version>1.3.2</mybatis-spring.version>
@@ -24,7 +24,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <!-- 25.1-android 兼容1.7 25.1-jre 1.8及以上-->
-            <version>25.1-android</version>
+            <version>27.1-jre</version>
         </dependency>
 
 		<!-- aliyun oss -->
@@ -110,12 +110,12 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.4.1</version>
+			<version>2.9.10.3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.1.1</version>
+			<version>1.3.3</version>
 		</dependency>
 		<!-- Spring -->
 		<dependency>
@@ -236,7 +236,7 @@
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>2.0.2</version>
+			<version>2.0.15</version>
 		</dependency>
 		<!-- End:get text from pdf -->
 		<!-- get text from doc -->
@@ -279,7 +279,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.25</version>
 		</dependency>
 		<!-- 定时认为quartz
 		<dependency>
@@ -335,6 +335,12 @@
             <version>2.3.28</version>
         </dependency>
 
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.6</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

api/src/main/java/cn/crap/ability/ProjectAbility.java

@@ -0,0 +1,44 @@
+package cn.crap.ability;
+
+import cn.crap.adapter.ProjectUserAdapter;
+import cn.crap.dto.LoginInfoDto;
+import cn.crap.enu.ProjectUserType;
+import cn.crap.model.ProjectPO;
+import cn.crap.model.ProjectUserPO;
+import cn.crap.service.ProjectService;
+import cn.crap.service.ProjectUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目能力
+ * @author Ehsan
+ * @date 2020/2/29 23:11
+ */
+@Service
+public class ProjectAbility {
+
+    @Autowired
+    private ProjectService projectService;
+
+    @Autowired
+    private ProjectUserService projectUserService;
+
+    /**
+     * 添加项目:需要将自己设置为项目用户，查询的时候可以不需要关联查询
+     * @param project
+     * @return
+     * @throws Exception
+     */
+    public boolean addProject(ProjectPO project, LoginInfoDto user) throws Exception{
+        if (projectService.insert(project)) {
+            ProjectUserPO projectUser = ProjectUserAdapter.getInitProjectUserPO(project, user);
+            projectUser.setType(ProjectUserType.CREATOR.getByteType());
+            projectUser.setSequence(project.getSequence());
+            projectUser.setProjectName(project.getName());
+            return projectUserService.insert(projectUser);
+        }
+        return false;
+    }
+
+}

api/src/main/java/cn/crap/adapter/ArticleAdapter.java

@@ -1,18 +1,12 @@
 package cn.crap.adapter;
 
-import cn.crap.dto.ArticleDto;
+import cn.crap.dto.ArticleDTO;
 import cn.crap.dto.SearchDto;
-import cn.crap.enu.ArticleStatus;
-import cn.crap.enu.ArticleType;
-import cn.crap.enu.LuceneSearchType;
-import cn.crap.enu.ProjectType;
-import cn.crap.framework.SpringContextHolder;
+import cn.crap.enu.*;
 import cn.crap.model.Article;
 import cn.crap.model.ArticleWithBLOBs;
-import cn.crap.model.Module;
-import cn.crap.model.Project;
-import cn.crap.service.tool.ModuleCache;
-import cn.crap.service.tool.ProjectCache;
+import cn.crap.model.ModulePO;
+import cn.crap.model.ProjectPO;
 import cn.crap.utils.*;
 
 import java.util.ArrayList;
@@ -25,12 +19,12 @@
  * Avoid exposing sensitive data and modifying data that is not allowed to be modified
  */
 public class ArticleAdapter {
-    public static ArticleDto getDto(Article model, Module module, Project project){
+    public static ArticleDTO getDto(Article model, ModulePO module, ProjectPO project){
         if (model == null){
             return null;
         }
 
-		ArticleDto dto = new ArticleDto();
+		ArticleDTO dto = new ArticleDTO();
 		BeanUtil.copyProperties(model, dto);
 
 		dto.setCanCommentName(new Byte("1").equals(model.getCanComment()) ? "是" : "否");
@@ -49,15 +43,15 @@ public static ArticleDto getDto(Article model, Module module, Project project){
 		return dto;
     }
 
-	public static ArticleDto getDtoWithBLOBs(ArticleWithBLOBs model, Module module, Project project) {
+	public static ArticleDTO getDtoWithBLOBs(ArticleWithBLOBs model, ModulePO module, ProjectPO project) {
 		if (model == null) {
 			return null;
 		}
-		ArticleDto dto = getDto(model, module, project);
+		ArticleDTO dto = getDto(model, module, project);
 		dto.setContent(model.getContent());
 		dto.setMarkdown(model.getMarkdown());
         dto.setUseMarkdown(false);
-		if (AttributeUtils.getAttributeMap(model.getAttributes()).containsKey(IAttributeConst.MARK_DOWN)){
+		if (AttributeUtils.containAttr(model.getAttributes(), AttributeEnum.MARK_DOWN)){
             dto.setUseMarkdown(true);
         }
 		dto.setStatusName(ArticleStatus.getNameByValue(model.getStatus()));
@@ -69,7 +63,7 @@ public static ArticleDto getDtoWithBLOBs(ArticleWithBLOBs model, Module module,
      * @param dto
      * @return
      */
-    public static ArticleWithBLOBs getModel(ArticleDto dto){
+    public static ArticleWithBLOBs getModel(ArticleDTO dto){
         if (dto == null){
             return null;
         }
@@ -80,22 +74,22 @@ public static ArticleWithBLOBs getModel(ArticleDto dto){
         return model;
     }
 
-    public static List<ArticleDto> getDtoWithBLOBs(List<ArticleWithBLOBs> models, Module module){
+    public static List<ArticleDTO> getDtoWithBLOBs(List<ArticleWithBLOBs> models, ModulePO module){
         if (models == null){
             return new ArrayList<>();
         }
-        List<ArticleDto> dtos = new ArrayList<>();
+        List<ArticleDTO> dtos = new ArrayList<>();
         for (ArticleWithBLOBs model : models){
             dtos.add(getDtoWithBLOBs(model, module, null));
         }
         return dtos;
     }
 
-	public static List<ArticleDto> getDto(List<Article> models, Module module, Project project){
+	public static List<ArticleDTO> getDto(List<Article> models, ModulePO module, ProjectPO project){
 		if (models == null){
 			return new ArrayList<>();
 		}
-		List<ArticleDto> dtos = new ArrayList<>();
+		List<ArticleDTO> dtos = new ArrayList<>();
 		for (Article model : models){
 			dtos.add(getDto(model, module, project));
 		}
@@ -118,31 +112,19 @@ public static List<SearchDto> getSearchDto(List<ArticleWithBLOBs> models){
 	}
 
 	public static SearchDto getSearchDto(ArticleWithBLOBs model){
-        ModuleCache moduleCache = SpringContextHolder.getBean("moduleCache", ModuleCache.class);
-        ProjectCache projectCache = SpringContextHolder.getBean("projectCache", ProjectCache.class);
-        Project project = projectCache.get(model.getProjectId());
-        SearchDto dto = new SearchDto();
-		String modelId = model.getId();
-		dto.setId(modelId);
-		dto.setCreateTime(model.getCreateTime());
-		dto.setContent(MyString.getStr(model.getBrief()) + MyString.getStr(model.getContent()));
-		dto.setModuleName(moduleCache.get(modelId).getName());
-		dto.setTitle(model.getName());
-		dto.setType("Article");
-		String articleUrl = "#/article/detail?projectId=%s&modelId=%s&type=%s&id=%s";
-		dto.setUrl(String.format(articleUrl, model.getProjectId(), model.getModuleId(), model.getType(), modelId));
-		dto.setVersion("");
-		dto.setProjectId(model.getProjectId());
-
-		dto.setNeedCreateIndex(false);
-        if(LuceneSearchType.Yes.getByteValue().equals(project.getLuceneSearch())){
-            dto.setNeedCreateIndex(true);
-        }
+		ProjectPO project = ServiceFactory.getInstance().getProjectCache().get(model.getProjectId());
+		boolean open = false;
+		if(LuceneSearchType.Yes.getByteValue().equals(project.getLuceneSearch())){
+			open = true;
+		}
 
 		// 私有项目不能建立索引
 		if(project.getType() == ProjectType.PRIVATE.getType()){
-			dto.setNeedCreateIndex(false);
+			open = false;
 		}
-		return dto;
+
+		return new SearchDto(model.getProjectId(), model.getModuleId(), model.getId(), model.getName(),
+                model.getType().equals(ArticleType.ARTICLE.name()) ? TableId.ARTICLE : TableId.DICTIONARY,
+				MyString.getStr(model.getBrief()) + MyString.getStr(model.getContent()), null,  open, model.getCreateTime());
 	}
 }

api/src/main/java/cn/crap/adapter/BugAdapter.java

@@ -1,16 +1,15 @@
 package cn.crap.adapter;
 
 import cn.crap.dto.BugDTO;
-import cn.crap.enu.BugPriority;
-import cn.crap.enu.BugSeverity;
-import cn.crap.enu.BugStatus;
-import cn.crap.enu.BugType;
+import cn.crap.dto.SearchDto;
+import cn.crap.enu.*;
 import cn.crap.model.BugPO;
-import cn.crap.model.Module;
-import cn.crap.model.Project;
+import cn.crap.model.ModulePO;
+import cn.crap.model.ProjectPO;
 import cn.crap.utils.BeanUtil;
 import cn.crap.utils.DateFormartUtil;
 import cn.crap.utils.MyString;
+import cn.crap.utils.ServiceFactory;
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
@@ -24,7 +23,7 @@
  * Avoid exposing sensitive data and modifying data that is not allowed to be modified
  */
 public class BugAdapter {
-    public static BugDTO getDto(BugPO model, Module module, Project project){
+    public static BugDTO getDto(BugPO model, ModulePO module, ProjectPO project){
         if (model == null){
             return null;
         }
@@ -57,7 +56,7 @@ public static BugPO getPO(BugDTO bugDTO){
     }
 
 
-    public static BugDTO getDTO(Project project, Module module){
+    public static BugDTO getDTO(ProjectPO project, ModulePO module){
         Assert.notNull(project, "project 不能为空");
         BugPO bugPO = new BugPO();
         bugPO.setType(BugType.FUNCTION.getByteValue());
@@ -94,4 +93,35 @@ public static List<BugDTO> getDto(List<BugPO> models){
         }
         return dtos;
     }
+
+    public static List<SearchDto> getSearchDto(List<BugPO> models){
+        if (models == null){
+            return new ArrayList<>();
+        }
+        List<SearchDto> dtos = new ArrayList<>();
+        for (BugPO model : models){
+            try {
+                dtos.add(getSearchDto(model));
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+        return dtos;
+    }
+
+    public static SearchDto getSearchDto(BugPO model){
+        ProjectPO project = ServiceFactory.getInstance().getProjectCache().get(model.getProjectId());
+        boolean open = false;
+        if(LuceneSearchType.Yes.getByteValue().equals(project.getLuceneSearch())){
+            open = true;
+        }
+
+        // 私有项目不能建立索引
+        if(project.getType() == ProjectType.PRIVATE.getType()){
+            open = false;
+        }
+
+        return new SearchDto(model.getProjectId(), model.getModuleId(), model.getId(), model.getName(), TableId.BUG,
+                 MyString.getStr(model.getContent()), null,  open, model.getCreateTime());
+    }
 }