Merge branch 'feature' into 'release'

2024/6/17 aiApiResultConversion中null异常处理

See merge request !104

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceAiMark.java

@@ -141,6 +141,7 @@ public class TaskServiceAiMark implements TaskService {
 
     private AiApiResult aiApiResultConversion(String s) {
         JSONObject res = JSONObject.parseObject(s);
+        if (Objects.nonNull(res)) {
             JSONObject feiHeiRes = res.getJSONObject("feihe-compet-tagger");
             if (Objects.nonNull(feiHeiRes)) {
                 JSONObject result = feiHeiRes.getJSONObject("result");
@@ -162,6 +163,7 @@ public class TaskServiceAiMark implements TaskService {
                     }
                 }
             }
+        }
         return null;
     }