0819_2.1

cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@@ -172,11 +172,17 @@ public interface TallFeignClient {
     JsonResponse<WpsVo.BusinessFileIdAndPath> getPathByWpsId(@RequestParam(name = "wpsId")Long wpsId);
 
     /**
-     * 通过token获得userId(消息系统用)
+     * 查找wps文件路径
      */
     @GetMapping("/v1/3rd/getFilePath")
     String getWpsFilePath(@RequestParam(name = "businessId") Long businessId,@RequestParam(name = "businessType") byte businessType);
 
+    /**
+     * 通过userId呵taskId查找用户信息
+     */
+    @GetMapping("/users/memberByTask")
+    JsonResponse<MemberVo.MemberInfo> getMemberInfoByUserIdAndTaskId(@RequestParam(name = "userId") Long userId,@RequestParam(name = "taskId") Long taskId);
+
 }
 
 @Slf4j
@@ -284,6 +290,11 @@ class TallFeignClientFallBack implements FallbackFactory<TallFeignClient> {
             public String getWpsFilePath(Long businessId, byte businessType) {
                 return null;
             }
+
+            @Override
+            public JsonResponse<MemberVo.MemberInfo> getMemberInfoByUserIdAndTaskId(Long userId, Long taskId) {
+                return JsonResponse.newInstance().fail();
+            }
         };
     }
 

game/src/main/java/com/ccsens/game/service/ClientService.java

@@ -139,7 +139,7 @@ public class ClientService implements IClientService {
         userJoin.setLocalStartTime(prepare || processing ? gameRecord.getStartTime() + timeMore : 0);
         userJoin.setLocalEndTime(prepare || processing ? gameRecord.getEndTime() + timeMore : 0);
         // 获取头像和用户名
-        JsonResponse<MemberVo.MemberInfo> memberInfo = tallFeignClient.getMemberByUserId(userId, gameRecord.getTaskId());
+        JsonResponse<MemberVo.MemberInfo> memberInfo = tallFeignClient.getMemberInfoByUserIdAndTaskId(userId, gameRecord.getTaskId());
         if (memberInfo.getData() == null) {
             memberInfo = tallFeignClient.getUserByUserId(userId);
         }

game/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test

health/src/main/java/com/ccsens/health/api/DebugController.java

@@ -1,7 +1,6 @@
 package com.ccsens.health.api;
 
 import com.ccsens.util.JsonResponse;
-import com.ccsens.util.WebConstant;
 import com.ccsens.util.wx.WxXcxUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParams;
@@ -37,7 +36,7 @@ public class DebugController {
         color.g = "139";
         color.b = "0";
         WxXcxUtil.getWxCode("pages/index/index"
-                ,"d=1218855229722857472",color,"/home/cloud/tall/uploads/qrCode/00112.png");
+                ,"d=1218855229722857472",color,"/home/cloud/tall/uploads/qrCode/00112.png",null);
 //        WxXcxUtil.getWxCodeTest("pages/index/index?t=eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1ODM4MDc3MzcsInN1YiI6IjEyMTg4NTUyMjk3MjI4NTc0NzIiLCJhdXRoSWQiOiIxMTc3MDQwNjY"
 //                ,"d=1217647686598135808",color,"/home/cloud/tall/uploads/qrCode/158357267174.png");
 

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common