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/resources/mapper/primary/PortfolioMapper.xml

@@ -9,4 +9,14 @@
         from portfolio
         where id = #{originalPortfolioId}
     </select>
+
+    <select id="getByTag" resultType="com.ai.da.mapper.primary.entity.Portfolio">
+        SELECT p.*
+        FROM portfolio p
+                 JOIN t_portfolio_tags pt ON p.id = pt.portfolio_id
+                 JOIN t_tags t ON pt.tag_id = t.id
+        WHERE p.account_id = #{accountId}
+          AND t.tag_name = #{tagName};
+    </select>
+
 </mapper>

src/main/resources/mapper/primary/PortfolioTagsMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ai.da.mapper.primary.PortfolioTagsMapper">
+
+    <delete id="deleteByPortfolioId">
+        DELETE
+        FROM t_portfolio_tags
+        WHERE portfolio_id = #{portfolioId};
+    </delete>
+
+    <insert id="insertIgnore">
+        INSERT
+        IGNORE INTO t_portfolio_tags (portfolio_id, tag_id, create_time)
+        VALUES (#{portfolioId}, #{tagId}, #{time});
+    </insert>
+</mapper>

src/main/resources/mapper/primary/TagsMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ai.da.mapper.primary.TagsMapper">
+
+    <select id="getMatchingTags" resultType="java.util.List">
+        SELECT id, tag_name, MATCH(tag_name) AGAINST(#{userInput}) AS relevance
+        FROM t_tags
+        WHERE MATCH(tag_name) AGAINST(#{userInput})
+        ORDER BY relevance DESC;
+    </select>
+
+    <select id="getTagByPortfolioId" resultType="com.ai.da.mapper.primary.entity.Tags">
+        SELECT t.*
+        FROM t_tags t
+        JOIN t_portfolio_tags pt ON t.id = pt.tag_id
+        WHERE pt.portfolio_id = #{portfolioId};
+    </select>
+
+
+</mapper>