Merge branch 'release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/constant/CommonConstant.java
#	src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
#	src/main/java/com/ai/da/controller/PortfolioController.java
#	src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
#	src/main/java/com/ai/da/service/PortfolioService.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

src/main/java/com/ai/da/controller/PortfolioController.java

@@ -6,6 +6,9 @@ import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
+import com.ai.da.model.vo.CommentVO;
+import com.ai.da.model.vo.PortfolioVO;
+import com.ai.da.model.vo.UserLikeChooseVO;
 import com.ai.da.service.PortfolioService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,7 +31,7 @@ public class PortfolioController {
 
     @ApiOperation(value = "发布作品集")
     @PostMapping("/publish")
-    public Response<Boolean> preLogin(@RequestParam("file") MultipartFile canvas, @RequestParam("data") String data) {
+    public Response<Long> preLogin(@RequestParam("file") MultipartFile canvas, @RequestParam("data") String data) {
         return Response.success(portfolioService.publish(canvas, data));
     }
 
@@ -144,4 +147,11 @@ public class PortfolioController {
         return Response.success(portfolioService.getFollowerList(getFollowListDTO));
     }
 
+
+/*    @ApiOperation(value = "按标签名查询作品")
+    @GetMapping("/queryPortfolioByTag")
+    public Response<List<PortfolioVO>> queryPortfolioByTag(@RequestParam(value = "tagName", required = false) String tagName,
+                                                           @RequestParam(value = "tagId", required = false) Long tagId) {
+        return Response.success(portfolioService.queryPortfolioByTag(tagName, tagId));
+    }*/
 }

src/main/java/com/ai/da/controller/TagsController.java

@@ -0,0 +1,31 @@
+package com.ai.da.controller;
+
+
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.Product;
+import com.ai.da.mapper.primary.entity.Tags;
+import com.ai.da.service.ProductService;
+import com.ai.da.service.TagsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@CrossOrigin //开放前端的跨域访问
+@Api(tags = "标签管理")
+@RestController
+@RequestMapping("/api/tags")
+public class TagsController {
+
+    @Resource
+    private TagsService tagsService;
+
+    @ApiOperation("获取标签")
+    @GetMapping("/getTags")
+    public Response<List<Tags>> getTags(@RequestParam("userInput") String userInput) {
+        return Response.success(tagsService.getTags(userInput));
+    }
+}