Merge branch '3.6.x'

CodeCasterX · CodeCasterX · commit 5b0d67d225a6 · 2025-12-31T15:43:02.000+08:00
diff --git a/.claude/project-rules.md b/.claude/project-rules.md
@@ -189,7 +189,69 @@ Bash("OWNER_GROUP=$(ls -l README.md | awk '{print $3\":\"$4}') && sudo chown $OW
 
 ## Git 提交和版本控制规范
 
-### 规则 3: 禁止自动提交代码
+### 规则 3: Commit Message 格式规范
+
+**⚠️ 重要规则（CRITICAL）：**
+
+本项目的提交信息**必须使用中文作为核心内容**，遵循以下格式：
+
+**标准格式：**
+```
+<type>: <中文描述>
+
+<可选的详细说明>
+
+🤖 Generated with [Claude Code](https://claude.com/claude-code)
+
+Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
+```
+
+**Type 类型（使用英文）：**
+- `feat`: 新功能
+- `fix`: Bug 修复
+- `docs`: 文档更新
+- `style`: 代码格式调整（不影响代码逻辑）
+- `refactor`: 重构（既不是新功能也不是 Bug 修复）
+- `perf`: 性能优化
+- `test`: 测试相关
+- `chore`: 构建过程或辅助工具的变动（包括依赖升级）
+- `revert`: 回滚之前的提交
+
+**子类型（可选）：**
+- `chore(deps)`: 依赖升级，格式：`chore(deps): 升级 <package> 到 v<version>`
+
+**示例：**
+```bash
+# 新功能
+feat: 添加用户认证功能
+
+# Bug 修复
+fix: 修复登录失败的问题
+
+# 文档更新
+docs: 更新 API 文档
+
+# 依赖升级
+chore(deps): 升级 fastjson2 到 v2.0.60
+
+# 代码重构
+refactor: 重构用户服务模块
+
+# 性能优化
+perf: 优化数据库查询性能
+
+# 构建相关
+chore: 更新构建脚本
+```
+
+**强制要求：**
+1. 描述部分**必须使用中文**
+2. Type 类型使用英文小写
+3. 描述要简洁明了，概括核心变更
+4. 多个变更应该分多次提交
+5. 必须在提交消息末尾添加 Claude Code 签名
+
+### 规则 4: 禁止自动提交代码
 
 **⚠️ 重要规则（CRITICAL）：**
 
diff --git a/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/src/main/java/modelengine/fit/value/fastjson/FastJsonValueHandler.java b/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/src/main/java/modelengine/fit/value/fastjson/FastJsonValueHandler.java
@@ -1,11 +1,12 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
- *  This file is a part of the ModelEngine Project.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+/*
+ * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * This file is a part of the ModelEngine Project.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
 
 package modelengine.fit.value.fastjson;
 
+import com.alibaba.fastjson2.JSONException;
 import com.alibaba.fastjson2.JSONPath;
 
 import modelengine.fitframework.annotation.Component;
@@ -21,15 +22,25 @@
  */
 @Component
 public class FastJsonValueHandler implements ValueFetcher, ValueSetter {
+    private static final String $ = "$";
+
     @Override
     public Object fetch(Object object, String propertyPath) {
         if (object == null) {
             return null;
         }
-        if (StringUtils.isBlank(propertyPath)) {
+        if (isObjectSelf(propertyPath)) {
             return object;
-        } else {
+        }
+        if (object instanceof String) {
+            return null;
+        }
+        try {
             return JSONPath.eval(object, this.getParsedPath(propertyPath));
+        } catch (JSONException e) {
+            throw new IllegalArgumentException(StringUtils.format(
+                    "Failed to fetch value by JSONPath. [propertyPath={0}]",
+                    propertyPath), e);
         }
     }
 
@@ -38,20 +49,32 @@ public Object set(Object object, String propertyPath, Object value) {
         if (object == null) {
             return null;
         }
-        if (StringUtils.isBlank(propertyPath)) {
+        if (isObjectSelf(propertyPath)) {
             return value;
         }
-        JSONPath.set(object, this.getParsedPath(propertyPath), value);
-        return object;
+        if (object instanceof String) {
+            return object;
+        }
+        try {
+            JSONPath.set(object, this.getParsedPath(propertyPath), value);
+            return object;
+        } catch (JSONException e) {
+            throw new IllegalArgumentException(StringUtils.format("Failed to set value by JSONPath. [propertyPath={0}]",
+                    propertyPath), e);
+        }
+    }
+
+    private static boolean isObjectSelf(String propertyPath) {
+        return StringUtils.isBlank(propertyPath) || $.equals(propertyPath);
     }
 
     private String getParsedPath(String propertyPath) {
-        if (propertyPath.startsWith("$")) {
+        if (propertyPath.startsWith($)) {
             return propertyPath;
         } else if (propertyPath.startsWith("[")) {
-            return "$" + propertyPath;
+            return $ + propertyPath;
         } else {
-            return "$." + propertyPath;
+            return $ + "." + propertyPath;
         }
     }
 }
diff --git a/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/src/test/java/modelengine/fit/value/fastjson/FastJsonValueFetcherTest.java b/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/src/test/java/modelengine/fit/value/fastjson/FastJsonValueFetcherTest.java
@@ -1,8 +1,8 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
- *  This file is a part of the ModelEngine Project.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+/*
+ * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * This file is a part of the ModelEngine Project.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
 
 package modelengine.fit.value.fastjson;
 
@@ -79,6 +79,29 @@ void shouldReturnNullGivenPropertyPathIsNotEmpty() {
         }
     }
 
+    @Nested
+    @DisplayName("当 object 为 JSON 字符串时")
+    class GivenObjectIsJsonString {
+        private Object object;
+
+        @BeforeEach
+        void setup() {
+            this.object = "{\"k1\":{\"k2\":\"v\"}}";
+        }
+
+        @AfterEach
+        void teardown() {
+            this.object = null;
+        }
+
+        @Test
+        @DisplayName("当 propertyPath 不为空时，不自动解析 JSON 字符串")
+        void shouldReturnNullGivenPropertyPathIsNotEmpty() {
+            Object actual = FastJsonValueFetcherTest.this.fetcher.fetch(this.object, "k1.k2");
+            assertThat(actual).isNull();
+        }
+    }
+
     @Nested
     @DisplayName("当 object 为键值对时")
     class GivenObjectIsKeyValuePair {
diff --git a/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/src/test/java/modelengine/fit/value/fastjson/FastJsonValueSetterTest.java b/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/src/test/java/modelengine/fit/value/fastjson/FastJsonValueSetterTest.java
@@ -1,8 +1,8 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
- *  This file is a part of the ModelEngine Project.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+/*
+ * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * This file is a part of the ModelEngine Project.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
 
 package modelengine.fit.value.fastjson;
 
@@ -71,6 +71,29 @@ void shouldReturnReplacedValueGivenPropertyPathIsEmpty() {
         }
     }
 
+    @Nested
+    @DisplayName("当 object 为 JSON 字符串时")
+    class GivenObjectIsJsonString {
+        private Object object;
+
+        @BeforeEach
+        void setup() {
+            this.object = "{\"k1\":{\"k2\":\"v\"}}";
+        }
+
+        @AfterEach
+        void teardown() {
+            this.object = null;
+        }
+
+        @Test
+        @DisplayName("当 propertyPath 不为空时，不自动解析 JSON 字符串")
+        void shouldReturnOriginalStringGivenPropertyPathIsNotEmpty() {
+            Object actual = FastJsonValueSetterTest.this.setter.set(this.object, "k1.k2", "v1");
+            assertThat(actual).isEqualTo(this.object);
+        }
+    }
+
     @Nested
     @DisplayName("当 object 为键值对时")
     class GivenObjectIsKeyValuePair {
