Просмотр исходного кода

Merge branch 'dev-lqc' into test

lqc 4 лет назад
Родитель
Сommit
38a9824521

+ 5 - 2
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -50,13 +51,13 @@ public class FosterwxCashWorkClientController {
 
     @PostMapping("/getTaskInfo")
     @ApiOperation(value = "返回凌晨到当前时间的未发送的数据,主体 昵称/团队id 昵称 两两一组必须有数据")
-    public Object getTaskInfo(FosterwxWorkServeHandle handle) {
+    public Object getTaskInfo(@RequestBody FosterwxWorkServeHandle handle) {
         log.info("客户端请求的信息:{}", handle);
 
         String errInfo = checkParam(handle);
 
         // 报错的的情况返回报错信息
-        if (!errInfo.isEmpty()) return AjaxResult.error(errInfo);
+        if (null != errInfo && !errInfo.isEmpty()) return AjaxResult.error(errInfo);
 
         // 根据参数获取账号信息
         FosterwxMobile fosterwxMobile = getAccountInfo(handle);
@@ -134,6 +135,8 @@ public class FosterwxCashWorkClientController {
 
             return fosterwxMobile;
         }
+
+        return null;
     }
 
     /**

+ 1 - 0
src/main/resources/application-local.properties

@@ -71,6 +71,7 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxFlowList/list,\
   /pangu/fosterwxStation/login,\
   /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/server/getTaskInfo,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0

+ 1 - 0
src/main/resources/application-prod.properties

@@ -65,6 +65,7 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxFlowList/list,\
   /pangu/fosterwxStation/login,\
   /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/server/getTaskInfo,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72.redis.rds.aliyuncs.com:6379/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=

+ 1 - 0
src/main/resources/application-test.properties

@@ -66,6 +66,7 @@ xxl-sso.excluded.paths=/healthy,\
 /pangu/fosterwxFlowList/list,\
 /pangu/fosterwxStation/login,\
 /pangu/fosterwxMobilePool/getOutOfServerList,\
+/pangu/server/getTaskInfo,\
 /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0