Merge branch 'feature' into 'release'

调整User权限展示异常问题

See merge request !209

src/main/java/com/zhiwei/brandkbs2/Brandkbs2Application.java

@@ -26,7 +26,7 @@ public class Brandkbs2Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Brandkbs2Application.class, args);
-        logger.info("Brandkbs启动完成....2023/2/15");
+        logger.error("Brandkbs启动完成....2023/2/15");
     }
 
 }

src/main/java/com/zhiwei/brandkbs2/pojo/UserRole.java

@@ -56,6 +56,11 @@ public class UserRole {
      */
     private Integer exportAmount;
 
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+        this.key = Tools.concat(projectId, roleId);
+    }
+
     public UserRole(String projectId, int roleId, Long expiredTime, Integer exportAmount) {
         this.projectId = projectId;
         this.roleId = roleId;

src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectWarnServiceImpl.java

@@ -94,7 +94,7 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         TYPE_SEARCH.put("抖音热搜", "douyin");
         TYPE_SEARCH.put("知乎热搜", "zhihu");
         TYPE_SEARCH.put("B站热搜", "bilibili-ranking");
-        TYPE_SEARCH.put("快手热搜", "kuaishou");
+        TYPE_SEARCH.put("快手热榜", "kuaishou");
     }
 
     @Override