From ab95fdd0d06f409b4f41ff9696f292248e86d9bc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 14 七月 2025 10:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
index 307070f..8ae3b7c 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
@@ -3,11 +3,13 @@
import cn.lili.base.Result;
import cn.lili.group.Add;
import cn.lili.group.Update;
+import cn.lili.modules.lmk.domain.form.ActivityAuditRecordForm;
import cn.lili.modules.lmk.domain.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.CustomerBlackForm;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.CustomerBlackQuery;
+import cn.lili.modules.lmk.service.ActivityAuditRecordService;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.CustomerBlackService;
import io.swagger.annotations.Api;
@@ -16,6 +18,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@@ -34,16 +37,36 @@
private final ActivityService activityService;
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) ActivityForm form) {
- return activityService.add(form);
+ private final ActivityAuditRecordService activityAuditRecordService;
+
+ @PostMapping("/audit")
+ public Result auditActivity(@RequestBody @Validated(Add.class) ActivityAuditRecordForm form){
+ return activityAuditRecordService.addOrUpdateAuditActivity(form);
}
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody ActivityForm form) {
+ form.setActivityContent(addVideoControls(form.getActivityContent()));
+ return activityService.add(form,true);
+ }
+
+ public static String addVideoControls(String html) {
+ if (html == null || html.isEmpty()) {
+ return html;
+ }
+
+ // 鍖归厤鎵�鏈夋湭鍖呭惈 controls 灞炴�х殑 <video> 鏍囩
+ String regex = "<video\\b(?![^>]*\\bcontrols\\b)([^>]*)>";
+ String replacement = "<video controls=\"controls\"$1>";
+
+ return html.replaceAll(regex, replacement);
+ }
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) ActivityForm form) {
- return activityService.update(form);
+ public Result update(@RequestBody ActivityForm form) {
+ form.setActivityContent(addVideoControls(form.getActivityContent()));
+ return activityService.update(form,true);
}
@DeleteMapping("/{id}")
--
Gitblit v1.8.0