fix bugs

src/main/java/com/fdkankan/site/controller/LoginController.java

@@ -16,6 +16,7 @@ import com.fdkankan.site.httpClient.response.FdkkLoginVo;
 import com.fdkankan.site.httpClient.response.FdkkResponse;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.site.httpClient.response.FdkkUserVo;
 import com.fdkankan.site.service.impl.UserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -90,7 +91,11 @@ public class LoginController extends BaseController {
     @PostMapping("/getUserInfo")
     public ResultData getUserInfo() {
         try {
-            return ResultData.ok(fdKKClient.getUserInfo(new JSONObject(), getToken()).getData());
+            FdkkResponse<FdkkUserVo> userInfo = fdKKClient.getUserInfo(new JSONObject(), getToken());
+            User user = StpUtil.getSession().getModel("user", User.class);
+            userInfo.getData().setFdkkId(userInfo.getData().getId());
+            userInfo.getData().setId(user.getUserId());
+            return ResultData.ok();
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/fdkankan/site/httpClient/client/FdKKClient.java

@@ -6,6 +6,7 @@ import com.fdkankan.site.httpClient.address.FdkkAddressSource;
 import com.fdkankan.site.httpClient.request.FdkkLoginRequest;
 import com.fdkankan.site.httpClient.response.FdkkLoginVo;
 import com.fdkankan.site.httpClient.response.FdkkResponse;
+import com.fdkankan.site.httpClient.response.FdkkUserVo;
 import com.fdkankan.site.request.SceneParam;
 
 /**
@@ -39,7 +40,7 @@ public interface FdKKClient {
      * 获取用户详情
      */
     @Post("/api/user/getUserInfo")
-    FdkkResponse getUserInfo(@JSONBody JSONObject jsonObject, @Header("token") String token);
+    FdkkResponse<FdkkUserVo> getUserInfo(@JSONBody JSONObject jsonObject, @Header("token") String token);
 
     /**
      * 获取v4场景数据