fix : 客服消息修改

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <客服系统16> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <客服系统, 图片上传接口修改> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/KfMsgController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import reactor.util.function.Tuple2;
 
 import java.util.List;
 
@@ -35,8 +36,8 @@ public class KfMsgController {
     @ApiOperation(value = "发送图片消息 (参数按照发送消息的参数给, 外加图片文件)")
     @PostMapping(value = "/upload/msg")
     @PreAuthorize(permissionKey = "manage:kf:uploadMsg")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = String.class)})
-    public ResultVO<String> uploadMsg(String param, MultipartFile files) {
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Tuple2.class)})
+    public ResultVO<Tuple2<String, String>> uploadMsg(String param, MultipartFile files) {
         return ResultVO.ok(kfMsgContentService.uploadMsg(JsonUtil.toObj(param, KfApiParam.class), files));
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IKfMsgContentService.java

@@ -5,6 +5,7 @@ import com.zanxiang.game.module.manage.pojo.params.KfApiParam;
 import com.zanxiang.game.module.manage.pojo.vo.KfGameVO;
 import com.zanxiang.game.module.mybatis.entity.KfMsgContent;
 import org.springframework.web.multipart.MultipartFile;
+import reactor.util.function.Tuple2;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface IKfMsgContentService extends IService<KfMsgContent> {
      * @param files : 文件
      * @return : 返回发送结果
      */
-    String uploadMsg(KfApiParam param, MultipartFile files);
+    Tuple2<String, String> uploadMsg(KfApiParam param, MultipartFile files);
 
     /**
      * 获取游戏列表

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/KfMsgContentServiceImpl.java

@@ -31,6 +31,8 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.util.UriComponentsBuilder;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 
 import java.net.URI;
 import java.util.Collections;
@@ -61,8 +63,7 @@ public class KfMsgContentServiceImpl extends ServiceImpl<KfMsgContentMapper, KfM
     private IGameAppletService gameAppletService;
 
     @Override
-    public String uploadMsg(KfApiParam param, MultipartFile files) {
-        log.error("发送图片消息参数, param : {}", JsonUtil.toString(param));
+    public Tuple2<String, String> uploadMsg(KfApiParam param, MultipartFile files) {
         //查询用户授权信息
         KfUser kfUser = kfUserService.getKfUser(SecurityUtil.getUserId(), param.getAppId());
         //图片上传腾讯
@@ -73,9 +74,10 @@ public class KfMsgContentServiceImpl extends ServiceImpl<KfMsgContentMapper, KfM
         Map<String, Object> paramMap = param.getParam();
         paramMap.put("msg_content", uploadResult);
         paramMap.put("msg_id", uploadResultMap.get("msg_id"));
-        log.error("解析出来的参数, paramMap : {}", JsonUtil.toString(paramMap));
         //腾讯api
-        return this.commKfApi(kfUser, param.getAction().getValue(), KfApiEnum.getApiUrl(param.getAction()), paramMap);
+        String apiResult = this.commKfApi(kfUser, param.getAction().getValue(), KfApiEnum.getApiUrl(param.getAction()), paramMap);
+        //返回图片上传结果和消息发送结果
+        return Tuples.of(uploadResult, apiResult);
     }
 
     private String imgUploadApi(KfUser kfUser, MultipartFile files) {