Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 1 месяц назад
Родитель
Сommit
71bffd4fb5

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminSettlementController.java

@@ -1,6 +1,6 @@
 package com.etotem.cfc.controller.admin;
 
-import com.etotem.cfc.dto.Result;
+import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.ServiceSettlement;
 import com.etotem.cfc.service.DanSettlementService;
 import org.springframework.web.bind.annotation.*;

+ 8 - 7
cfc-backend/src/main/java/com/etotem/cfc/controller/dan/DanAssessmentExecutionController.java

@@ -1,8 +1,9 @@
 package com.etotem.cfc.controller.dan;
 
-import com.etotem.cfc.dto.*;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.config.JwtConfig;
+import com.etotem.cfc.entity.DanAssessmentExecution;
 import com.etotem.cfc.service.DanAssessmentExecutionService;
-import com.etotem.cfc.util.JwtUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,7 +22,7 @@ public class DanAssessmentExecutionController {
     private DanAssessmentExecutionService executionService;
 
     @Resource
-    private JwtUtil jwtUtil;
+    private JwtConfig jwtConfig;
 
     /**
      * 规划师/评估师完成服务
@@ -33,7 +34,7 @@ public class DanAssessmentExecutionController {
         if (token == null || !token.startsWith("Bearer ")) {
             return Result.error("未提供认证 Token");
         }
-        Long userId = jwtUtil.getUserIdFromToken(token.replace("Bearer ", ""));
+        Long userId = jwtConfig.getUserIdFromToken(token.replace("Bearer ", ""));
         if (userId == null) {
             return Result.error("Token 无效");
         }
@@ -53,7 +54,7 @@ public class DanAssessmentExecutionController {
         if (token == null || !token.startsWith("Bearer ")) {
             return Result.error("未提供认证 Token");
         }
-        Long userId = jwtUtil.getUserIdFromToken(token.replace("Bearer ", ""));
+        Long userId = jwtConfig.getUserIdFromToken(token.replace("Bearer ", ""));
         if (userId == null) {
             return Result.error("Token 无效");
         }
@@ -72,7 +73,7 @@ public class DanAssessmentExecutionController {
         if (token == null || !token.startsWith("Bearer ")) {
             return Result.error("未提供认证 Token");
         }
-        Long userId = jwtUtil.getUserIdFromToken(token.replace("Bearer ", ""));
+        Long userId = jwtConfig.getUserIdFromToken(token.replace("Bearer ", ""));
         if (userId == null) {
             return Result.error("Token 无效");
         }
@@ -98,7 +99,7 @@ public class DanAssessmentExecutionController {
      */
     @PostMapping("/my-list")
     public Result<List<DanAssessmentExecution>> myList(@RequestBody MyExecutionFilter filter, HttpServletRequest request) {
-        Long userId = jwtUtil.getUserIdFromToken(request.getHeader("Authorization"));
+        Long userId = jwtConfig.getUserIdFromToken(request.getHeader("Authorization"));
         List<DanAssessmentExecution> executions = executionService.getByFamilyId(filter.getFamilyId());
         return Result.success(executions);
     }

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-7accc3a8b8d9c396d99b16793bf30f023ccca87f
+a94942d8ae329b7bc38955efbe1381586e2108d6

+ 1 - 1
cfc-web/package.json

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

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

@@ -4,6 +4,35 @@
 
 ---
 
+## v1.0.530 (2026-07-25)
+
+### 重构
+- 更新添加孩子入口导航至家庭成员页面
+- 废弃独立添加孩子页面,重定向至家庭成员
+- 年龄优先判定孩子角色
+
+### 其他
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+
+### 新功能
+- 切换孩子前检查家庭成员中是否有child角色
+- 微信登录自动获取手机号
+
+
 ## v1.0.529 (2026-07-25)
 
 ### Bug 修复

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

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.529
+> 当前版本: v1.0.530
 
 ## 历史版本
 
@@ -8,6 +8,35 @@
 
 ---
 
+## v1.0.530 (2026-07-25)
+
+### 重构
+- 更新添加孩子入口导航至家庭成员页面
+- 废弃独立添加孩子页面,重定向至家庭成员
+- 年龄优先判定孩子角色
+
+### 其他
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+
+### 新功能
+- 切换孩子前检查家庭成员中是否有child角色
+- 微信登录自动获取手机号
+
+
 ## v1.0.529 (2026-07-25)
 
 ### Bug 修复