|
@@ -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();
|
|
|
}
|