Преглед на файлове

chore: auto bump version and changelog [skip ci]

iwt преди 1 месец
родител
ревизия
a928e1f4ca

+ 1 - 1
cfc-backend/src/test/java/com/etotem/cfc/integration/EnergySystemFlowTest.java

@@ -204,7 +204,7 @@ public class EnergySystemFlowTest {
                 .thenThrow(new RuntimeException("能量不足,当前可用:300,需要:5000"));
 
         // === When:尝试兑换 ===
-        Result<Boolean> result = energyController.deductForWish(deductRequest, CHILD_ID);
+        Result<Boolean> result = energyController.deductForWish(deductRequest, CHILD_ID, null);
 
         // === Then:返回错误 ===
         assertEquals(500, result.getCode());

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-c08211a5071095a026aba90e66ae0635e2cbdffc
+bdedf86b46fb0f14075493ee311cd502433ebe13

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

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.813",
+  "version": "1.0.814",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.813",
+      "version": "1.0.814",
       "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.814",
+  "version": "1.0.815",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -4,6 +4,20 @@
 
 ---
 
+## v1.0.815 (2026-08-05)
+
+### 新功能
+- 家庭邀请流程改为申请审批制
+
+### 其他
+- - 后端: requestJoinByCode 兼容 token/inviteCode/familyId 三种输入
+- - 后端: FamilyJoinRequestService.createJoinRequest 支持 UUID token 识别
+- - 前端: invite/join.vue 展示邀请人头像, 改为提交申请+轮询审批流程
+- - 前端: FamilyMemberStrip.vue 加 isAdmin prop、红点徽章、审批弹窗(通过/拒绝)
+- - 前端: api.js 补充 pending-requests/approve-request/reject-request/my-request API
+- 
+
+
 ## v1.0.814 (2026-08-05)
 
 ### 新功能

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

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.814
+> 当前版本: v1.0.815
 
 ## 历史版本
 
@@ -8,6 +8,20 @@
 
 ---
 
+## v1.0.815 (2026-08-05)
+
+### 新功能
+- 家庭邀请流程改为申请审批制
+
+### 其他
+- - 后端: requestJoinByCode 兼容 token/inviteCode/familyId 三种输入
+- - 后端: FamilyJoinRequestService.createJoinRequest 支持 UUID token 识别
+- - 前端: invite/join.vue 展示邀请人头像, 改为提交申请+轮询审批流程
+- - 前端: FamilyMemberStrip.vue 加 isAdmin prop、红点徽章、审批弹窗(通过/拒绝)
+- - 前端: api.js 补充 pending-requests/approve-request/reject-request/my-request API
+- 
+
+
 ## v1.0.814 (2026-08-05)
 
 ### 新功能