lyhzzz 1 rok temu
rodzic
commit
1a0334ded7

+ 2 - 3
src/main/java/com/fdkankan/openApi/controller/www/TakeLookController.java

@@ -9,6 +9,7 @@ import com.fdkankan.openApi.aop.ValidateApi;
 import com.fdkankan.openApi.common.PageInfo;
 import com.fdkankan.openApi.controller.BaseController;
 import com.fdkankan.openApi.exception.ApiBusinessException;
+import com.fdkankan.openApi.httpclient.callback.ErrorCallback;
 import com.fdkankan.openApi.httpclient.client.FdKKClient;
 import com.fdkankan.openApi.service.www.IUserService;
 import com.fdkankan.openApi.vo.www.FdRoomParam;
@@ -48,9 +49,7 @@ public class TakeLookController extends BaseController {
         if(StringUtils.isBlank(token)){
             throw  new ApiBusinessException(ErrorCode.FAILURE_CODE_3004);
         }
-        JSONObject jsonObject = fdKKClient.roomList(param, token);
-        log.info(jsonObject.toJSONString());
-        return jsonObject;
+        return fdKKClient.roomList(param, token,new ErrorCallback());
     }
 
 }

+ 3 - 2
src/main/java/com/fdkankan/openApi/httpclient/client/FdKKClient.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.annotation.*;
 import com.fdkankan.openApi.common.PageInfo;
 import com.fdkankan.openApi.httpclient.address.FdkkAddressSource;
+import com.fdkankan.openApi.httpclient.callback.ErrorCallback;
 import com.fdkankan.openApi.httpclient.callback.SuccessCondition;
 import com.fdkankan.openApi.vo.www.FdkkLoginVo;
 import com.fdkankan.web.response.Result;
@@ -20,13 +21,13 @@ public interface FdKKClient {
      * 登录
      */
     @Post("/api/sso/user/login")
-    Result<FdkkLoginVo> fdkkLogin(@JSONBody Object param);
+    Result<FdkkLoginVo> fdkkLogin(@JSONBody Object param,ErrorCallback errorCallback);
 
     /**
      * 四维带看房间列表
      */
     @Post("/takelook/roomList")
-    JSONObject roomList(@JSONBody Object param , @Header("token") String token);
+    JSONObject roomList(@JSONBody Object param , @Header("token") String token, ErrorCallback callback);
 
 
 }

+ 2 - 1
src/main/java/com/fdkankan/openApi/service/system/impl/AccountServiceImpl.java

@@ -17,6 +17,7 @@ import com.fdkankan.openApi.constant.CountType;
 import com.fdkankan.openApi.entity.system.Account;
 import com.fdkankan.openApi.entity.system.UserAuthInfo;
 import com.fdkankan.openApi.entity.www.User;
+import com.fdkankan.openApi.httpclient.callback.ErrorCallback;
 import com.fdkankan.openApi.httpclient.client.FdKKClient;
 import com.fdkankan.openApi.mapper.system.IAccountMapper;
 import com.fdkankan.openApi.service.system.IAccountService;
@@ -98,7 +99,7 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
     public ResultData longinV1(LoginParam param) {
         String password = PasswordUtils.decycptPasswordWeb(Base64Converter.encode(param.getPassword()));
         param.setPassword(password);
-        Result<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(param);
+        Result<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(param,new ErrorCallback());
 //        SaLoginModel saLoginModel = new SaLoginModel();
 //        saLoginModel
 //                .setIsLastingCookie(false)

+ 2 - 1
src/main/java/com/fdkankan/openApi/service/www/impl/UserServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.PasswordUtils;
 import com.fdkankan.openApi.entity.www.User;
+import com.fdkankan.openApi.httpclient.callback.ErrorCallback;
 import com.fdkankan.openApi.httpclient.client.FdKKClient;
 import com.fdkankan.openApi.mapper.www.IUserMapper;
 import com.fdkankan.openApi.service.www.IUserService;
@@ -41,7 +42,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     public ResultData login(FdkkLoginParamVo param) {
 
         String password = PasswordUtils.decycptPasswordWeb(Base64Converter.encode(param.getPassword()));
-        Result<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(LoginParam.builder().phoneNum(param.getUserName()).password(password).build());
+        Result<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(LoginParam.builder().phoneNum(param.getUserName()).password(password).build(),new ErrorCallback());
 
         return ResultData.ok(fdkkLoginVo.getData().getToken());
     }