Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/UpdateTaskUrlVO.java

+package com.mmc.csf.infomation.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Admin
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UpdateTaskUrlVO {
+    private Integer id;
+    @ApiModelProperty(value = "完成任务图片", example = "http://")
+    private String taskUrl;
+    @ApiModelProperty(value = "需求id", example = "83")
+    private Integer requirementsInfoId;
+}

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 2bf86c979f43eeda276e796f9b2d6f8fa17deea8
+  newTag: 5fe08a84d8b68023c3454815e98013081971855e

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -231,8 +231,8 @@ public class RequirementsController extends BaseController {
     @ApiOperation(value = "new——小程序-—飞手端--继续上传图片")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("updateTaskUrl")
-    public ResultBody updateTaskUrl(@ApiParam(value = "完成任务图片", required = true) @RequestParam String taskUrl, @ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
-        return requirementsService.updateTaskUrl(taskUrl,requirementsInfoId);
+    public ResultBody updateTaskUrl(@RequestBody UpdateTaskUrlVO updateTaskUrlVO) {
+        return requirementsService.updateTaskUrl(updateTaskUrlVO.getTaskUrl(),updateTaskUrlVO.getRequirementsInfoId());
     }
     @ApiOperation(value = "new——小程序-—发布者--订单结算")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -3182,6 +3182,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
             return ResultBody.success();
         }
+        taskUrl = taskUrl.replace("\\","");
         // 解析为JSON数组
         JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
         JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);