Merge branch 'develop'

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

@@ -38,7 +38,7 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "需求类型名称")
     private String requirementTypeName;
     @ApiModelProperty(value = "用户id")
-    @NotNull(message = "用户id不能为空", groups = {Insert.class})
+    //@NotNull(message = "用户id不能为空", groups = {Insert.class})
     private Integer userAccountId;
     @ApiModelProperty(value = "发布者姓名")
     @NotNull(message = "发布者姓名不能为空", groups = {Insert.class})

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

@@ -22,7 +22,7 @@ public class TenderApplyVO implements Serializable {
     @NotNull(message = "招标id不能为空", groups = {Create.class})
     private Integer tenderNewsId;
     @ApiModelProperty(value = "用户id")
-    @NotNull(message = "用户id不能为空", groups = {Create.class})
+    //@NotNull(message = "用户id不能为空", groups = {Create.class})
     private Integer userAccountId;
     @ApiModelProperty(value = "招标详情id")
     @NotNull(message = "招标详情id不能为空", groups = {Create.class})

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 75c6aedf979acbf6ec7a72adedaf09ff33625b54
+  newTag: 5d25259ef9da37095bc71626ae5fcd63d20504a2

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

@@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/18 14:26
@@ -23,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"需求相关"})
 @RestController
 @RequestMapping("/requirements/")
-public class RequirementsController {
+public class RequirementsController extends BaseController{
 
     @Autowired
     private RequirementsService requirementsService;
@@ -38,7 +40,8 @@ public class RequirementsController {
     @ApiOperation(value = "需求发布")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("publish")
-    public ResultBody publish(@Validated(value = {Insert.class})@RequestBody RequirementsInfoVO requirementsInfoVO){
+    public ResultBody publish(@Validated(value = {Insert.class})@RequestBody RequirementsInfoVO requirementsInfoVO, HttpServletRequest request){
+        requirementsInfoVO.setUserAccountId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
         return requirementsService.publish(requirementsInfoVO);
     }
 
@@ -52,8 +55,8 @@ public class RequirementsController {
     @ApiOperation(value = "需求已解决")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("solveRequire")
-    public ResultBody solveRequire(@RequestParam Integer requirementsInfoId, @RequestParam Integer userAccountId){
-        return requirementsService.solveRequire(requirementsInfoId, userAccountId);
+    public ResultBody solveRequire(@RequestParam Integer requirementsInfoId, HttpServletRequest request){
+        return requirementsService.solveRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
 }

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

@@ -93,7 +93,8 @@ public class TenderController extends BaseController{
     @ApiOperation(value = "合作申请提交")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping(value = "apply")
-    public ResultBody addTenderApply(@Validated(value = {Create.class})@RequestBody TenderApplyVO tenderApplyVO){
+    public ResultBody addTenderApply(@Validated(value = {Create.class})@RequestBody TenderApplyVO tenderApplyVO, HttpServletRequest request){
+        tenderApplyVO.setUserAccountId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
         return tenderService.addTenderApply(tenderApplyVO);
     }
 

release-service/src/main/resources/application-prod.yml

@@ -143,7 +143,7 @@ ribbon:
 
 iuav:
   userapp:
-    url: http://127.0.0.1:35150
+    url: http://cms-svc:35150
 
 #mmc:
 #  appid: 80001