Forráskód Böngészése

chore: auto bump version and changelog [skip ci]

iwt 1 hónapja
szülő
commit
69b35570ab

+ 11 - 11
cfc-backend/src/test/java/com/etotem/cfc/controller/ActivityControllerTest.java

@@ -71,7 +71,7 @@ public class ActivityControllerTest {
         Page<Activity> page = new Page<>(1, 10, 2);
         page.setRecords(records);
 
-        when(activityService.list(isNull(), eq(1), eq(10), isNull()))
+        when(activityService.list(isNull(), isNull(), eq(false), eq(1), eq(10), isNull(), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
@@ -82,7 +82,7 @@ public class ActivityControllerTest {
                 setCode(200);
             }});
 
-        Result<Map<String, Object>> result = controller.list(params, null);
+        Result<Map<String, Object>> result = controller.list(params, null, null);
         assertEquals(200, result.getCode());
         assertNotNull(result.getData());
     }
@@ -98,7 +98,7 @@ public class ActivityControllerTest {
             mockActivity(3L, "体质检测", "published", "body")
         );
 
-        when(activityService.list(eq("body"), eq(1), eq(10), isNull()))
+        when(activityService.list(eq("body"), isNull(), eq(false), eq(1), eq(10), isNull(), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
@@ -109,18 +109,18 @@ public class ActivityControllerTest {
                 setCode(200);
             }});
 
-        Result<Map<String, Object>> result = controller.list(params, null);
+        Result<Map<String, Object>> result = controller.list(params, null, null);
         assertEquals(200, result.getCode());
     }
 
     @Test
-    public void list_FilterByActivityType() {
+    public void list_FilterByStatus() {
         Map<String, Object> params = new HashMap<>();
-        params.put("activityType", "campaign");
+        params.put("status", "ended");
         params.put("page", 1);
         params.put("size", 10);
 
-        when(activityService.list(isNull(), eq(1), eq(10), isNull()))
+        when(activityService.list(isNull(), eq("ended"), eq(false), eq(1), eq(10), isNull(), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", Collections.emptyList());
@@ -131,7 +131,7 @@ public class ActivityControllerTest {
                 setCode(200);
             }});
 
-        Result<Map<String, Object>> result = controller.list(params, null);
+        Result<Map<String, Object>> result = controller.list(params, null, null);
         assertEquals(200, result.getCode());
         assertEquals(0, ((List<?>)result.getData().get("records")).size());
     }
@@ -142,12 +142,12 @@ public class ActivityControllerTest {
         params.put("page", 1);
         params.put("size", 10);
 
-        // 登录用户可看到自己的私有活动
+        // 登录用户可看到自己的私有活动(管理员视角:mine=true 时按发布者过滤)
         List<Activity> records = Collections.singletonList(
             mockActivity(5L, "内部活动", "draft", "mind")
         );
 
-        when(activityService.list(isNull(), eq(1), eq(10), eq(99L)))
+        when(activityService.list(isNull(), isNull(), eq(true), eq(1), eq(10), eq(99L), eq("activity_admin")))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
@@ -158,7 +158,7 @@ public class ActivityControllerTest {
                 setCode(200);
             }});
 
-        Result<Map<String, Object>> result = controller.list(params, 99L);
+        Result<Map<String, Object>> result = controller.list(params, 99L, "activity_admin");
         assertEquals(200, result.getCode());
         assertEquals(1, ((List<?>)result.getData().get("records")).size());
     }

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-d9a4b2132bbb3a2799f8871f49377d6179c8275c
+57bfd5a07907c7a57e93b49a42b0cb87dbb59639

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.725",
+  "version": "1.0.726",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.725",
+      "version": "1.0.726",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.726",
+  "version": "1.0.727",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 10 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,16 @@
 
 ---
 
+## v1.0.727 (2026-08-02)
+
+### Bug 修复
+- 富文本编辑器图片上传路径和网络图片弹窗被遮挡
+
+### 其他
+- - ArticleEdit/ProductEdit/ActivityEdit: onSuccess 内拼接后端 baseURL 生成完整图片 URL
+- 
+
+
 ## v1.0.726 (2026-08-02)
 
 ### Bug 修复

+ 11 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.726
+> 当前版本: v1.0.727
 
 ## 历史版本
 
@@ -8,6 +8,16 @@
 
 ---
 
+## v1.0.727 (2026-08-02)
+
+### Bug 修复
+- 富文本编辑器图片上传路径和网络图片弹窗被遮挡
+
+### 其他
+- - ArticleEdit/ProductEdit/ActivityEdit: onSuccess 内拼接后端 baseURL 生成完整图片 URL
+- 
+
+
 ## v1.0.726 (2026-08-02)
 
 ### Bug 修复