zh

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -257,8 +257,8 @@ public class UtilsController {
     }
 
     public static void main(String[] args) {
-//        String url = "4.38 wfb:/ 复制打开抖音身 https://v.douyin.com/YT98hjf/，看看【酸味真火的作品】坚持总会有收获的# 意想不到的情侣健身 https://v.douyin.com/YT982Sf/";
-//      System.out.println( RegexUtils.get("(https://)(.*?)(/)(.*?)(/)",url,0));
+        String url = "0.79 NjP:/ 测试1  https://v.douyin.com/FuhWaKvhkhkhttps://v.douyin.com/FuhWaKvhkh复制admin复制此链接，打开Dou音搜索，直接观看视频！https://v.douyin.com/FuhWaKvhkhhttps://v.douyin.com/FuhWaKvhkhhttps://v.douyin.com/FuhWaKvhkh";
+      System.out.println( RegexUtils.get("(http|https)://[A-Za-z0-9_\\-\\+.:?&@=/%#,;]*",url,0));
 //        String a = m.find() ? m.group(1) : url;
 //        System.out.println(a);
 //        int b = StringUtils.countOccurrencesOf(a, "https://v.douyin");

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -405,7 +405,7 @@ public class TaskController {
     @PostMapping("/dele")
     @AdminTokenValid
     @AdminCheckAuthorityAnnotation(jurisdictionId = "135")
-    public Result del(@Validated @RequestBody DelTaskParam param) {
+    public Result dele(@Validated @RequestBody DelTaskParam param) {
         Task task = taskService.getById(param.getId());
         if (task.getStatus() !=0){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"只支持未上线的任务删除");

src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java

@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 /**
@@ -50,6 +51,7 @@ public class TopicActivityController {
     static class AddTopicParam {
         @Schema(title = "标题")
         @NotNull(message = "title不能为空")
+        @Size(max=64,min = 1,message = "标题长度在不超过64")
         private String title;
         @Schema(title = "副标题")
         private String subtitle;
@@ -113,6 +115,7 @@ public class TopicActivityController {
         @Schema(title = "动态id")
         private Integer id;
         @Schema(title = "标题")
+        @Size(max=64,min = 1,message = "标题长度在不超过64")
         private String title;
         @Schema(title = "副标题")
         private String subtitle;
@@ -159,6 +162,7 @@ public class TopicActivityController {
     public Result list(@Validated @RequestBody ListTopicParam param) {
         QueryWrapper<TopicActivity> qw = new QueryWrapper<>();
         qw.like(param.getKeyword() != null, "title", param.getKeyword());
+        qw.orderByDesc("showAtIndex");
         qw.orderByAsc("sortWeight");
         qw.orderByDesc("updateAt", "creatAt");
         if (param.getShowAtIndex() != null && param.getShowAtIndex() == true) {

src/main/java/com/zh/project0512/controller/wxApp/RankUController.java

@@ -76,7 +76,7 @@ public class RankUController {
         Page pg = MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize());
         QueryWrapper<UserEffectRecords> qw = new QueryWrapper<>();
         LocalDateTime now = param.getDateTime() != null ? LocalDateTime.now() : param.getDateTime();
-        qw.eq("date_format(t1.creatAt, '%Y-%m-%d')", now.toLocalDate());
+        qw.eq("date_format(t1.createAt, '%Y-%m-%d')", now.toLocalDate());
         IPage page = (param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg, qw) : userEffectRecordsMapper.rankByUser(pg, qw);
         return Result.success(page.getRecords(), "请求成功");
     }

src/main/java/com/zh/project0512/controller/wxApp/TopicActivityUController.java

@@ -43,11 +43,13 @@ public class TopicActivityUController {
     @PostMapping("/list")
     public Result list(@RequestBody(required = false) JSONObject obj) {
         QueryWrapper<TopicActivity> qw = new QueryWrapper<>();
-        qw.orderByAsc("sortWeight");
-        qw.orderByDesc("updateAt","creatAt");
         if(obj.getBoolean("showAtIndex") !=null && obj.getBoolean("showAtIndex") == true){
             qw.eq("showAtIndex",1);
+            qw.orderByDesc("showAtIndex");
         }
+        qw.orderByAsc("sortWeight");
+        qw.orderByDesc("updateAt","creatAt");
+
         return Result.success(topicActivityService.page(MybatisPlusUtil.SetPage(obj),qw));
     }
 

src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java

@@ -98,7 +98,7 @@ public class VideoUController {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "已提交过该平台视频");
         }
         // 校验并提取链接
-        String s = RegexUtils.get("(https://)(.*?)(/)(.*?)(/)",param.getUrl(),0);
+        String s = RegexUtils.get("(http|https)://[A-Za-z0-9_\\\\-\\\\+.:?&@=/%#,;]*\"",param.getUrl(),0);
         if(null == s){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "视频链接有误");
         }else if(param.getType() == 1&&0==StringUtils.countOccurrencesOf(s,"https://v.douyin")){

src/main/java/com/zh/project0512/model/Task.java

@@ -19,6 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 /**
  * <p>
@@ -43,8 +44,9 @@ public class Task extends Model {
     /**
      * 标题
      */
-    @Schema(title="标题",description = "标题不能为空")
+    @Schema(title="标题",description = "标题不能为空，限制64个字符内")
     @NotNull(message = "标题不能为空",groups = {TaskValidGroup1.class})
+    @Size(max=64,min = 1,message = "标题长度在不超过64")
     private String title;
 
     /**

src/main/java/com/zh/project0512/model/TopicActivity.java

@@ -12,6 +12,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Size;
+
 /**
  * <p>
  *
@@ -32,7 +34,8 @@ public class TopicActivity extends Model {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @Schema(title = "标题")
+    @Schema(title = "标题",description = "限制64个字符内")
+    @Size(max=64,min = 1,message = "标题长度在不超过64")
     private String title;
 
     @Schema(title = "副标题")