Browse Source

优化CID获取个人资料接口处理类型

cgp 2 days ago
parent
commit
2b00be5722

+ 2 - 1
fs-service/src/main/java/com/fs/wxcid/dto/friend/BaseResponse.java → fs-service/src/main/java/com/fs/wxcid/dto/common/BaseResponse.java

@@ -1,6 +1,7 @@
-package com.fs.wxcid.dto.friend;
+package com.fs.wxcid.dto.common;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fs.wxcid.dto.friend.ErrMsg;
 import lombok.Data;
 
 /**

+ 1 - 0
fs-service/src/main/java/com/fs/wxcid/dto/friend/ContactList.java

@@ -1,6 +1,7 @@
 package com.fs.wxcid.dto.friend;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fs.wxcid.dto.common.BaseResponse;
 import lombok.Data;
 
 import java.util.List;

+ 1 - 1
fs-service/src/main/java/com/fs/wxcid/dto/user/UserProfileData.java

@@ -1,7 +1,7 @@
 package com.fs.wxcid.dto.user;
 
-import com.fs.erp.dto.BaseResponse;
 import lombok.Data;
+import com.fs.wxcid.dto.common.BaseResponse;
 
 @Data
 public class UserProfileData {

+ 2 - 2
fs-service/src/main/java/com/fs/wxcid/service/UserService.java

@@ -9,8 +9,8 @@ public interface UserService {
      * 获取个人资料
      * <p>对应接口:POST /user/GetProfile</p>
      *
-     * @param authKey     账号唯一标识
+     * @param accountId     账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponseCommon<UserProfileData> getProfile(String authKey);
+    UserProfileData getProfile(Long accountId);
 }

+ 14 - 12
fs-service/src/main/java/com/fs/wxcid/service/impl/UserServiceImpl.java

@@ -2,30 +2,32 @@ package com.fs.wxcid.service.impl;
 
 import com.alibaba.fastjson.TypeReference;
 import com.fs.common.exception.CustomException;
+import com.fs.wxcid.ServiceUtils;
 import com.fs.wxcid.dto.common.ApiResponseCommon;
+import com.fs.wxcid.dto.login.LoginQrCodeResponseData;
+import com.fs.wxcid.dto.login.LoginStatusData;
+import com.fs.wxcid.dto.login.QrCodeRequest;
+import com.fs.wxcid.dto.login.RequestBaseVo;
 import com.fs.wxcid.dto.user.UserProfileData;
 import com.fs.wxcid.service.UserService;
 import com.fs.wxwork.utils.WxWorkHttpUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
 public class UserServiceImpl implements UserService {
     private static final String BASE_URL = "http://114.117.215.244:7006";
+    @Autowired
+    private ServiceUtils serviceUtils;
     @Override
-    public ApiResponseCommon<UserProfileData> getProfile(String authKey) {
-        String url = BASE_URL + "/user/GetProfile?key=" + authKey;
-        ApiResponseCommon<UserProfileData> response = WxWorkHttpUtil.getWithType(
-                url,
-                new TypeReference<ApiResponseCommon<UserProfileData>>() {}
-        );
-
-        if (response.getCode() != 200) {
-            String errorMsg = response.getText();
-            throw new CustomException("获取个人信息失败: " + errorMsg);
+    public UserProfileData getProfile(Long accountId) {
+        try {
+            ApiResponseCommon<UserProfileData> response = serviceUtils.sendGet("/login/GetLoginStatus", RequestBaseVo.builder().accountId(accountId).data(null).build(), new TypeReference<ApiResponseCommon<UserProfileData>>() {});
+            return response.getData();
+        }catch (Exception e){
+            return new UserProfileData();
         }
-
-        return response;
     }
 }