From 478e6722fd36bf9b5d8608c8cca2000190da5496 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十二月 2020 19:16:15 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
index 8c679a4..4f3cca9 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
@@ -8,14 +8,18 @@
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.exception.UserInfoExtraException;
import com.ks.daylucky.pojo.DO.UserInfo;
+import com.ks.daylucky.pojo.DO.UserInfoExtra;
import com.ks.daylucky.pojo.DO.UserMsg;
+import com.ks.daylucky.pojo.DTO.AlipayUserInfo;
import com.ks.daylucky.pojo.DTO.TokenDTO;
import com.ks.daylucky.pojo.DTO.UserMsgSettings;
import com.ks.daylucky.pojo.VO.AcceptData;
+import com.ks.daylucky.pojo.VO.UserConfigVO;
import com.ks.daylucky.service.UserInfoExtraService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.service.UserMsgService;
import com.ks.daylucky.util.Constant;
+import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.UserInfoUtil;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -33,7 +37,7 @@
import java.util.List;
@Controller
-@RequestMapping("api/client/user")
+@RequestMapping(value = "api/client/user", produces = "application/json;charset=utf-8")
public class UserController {
@Resource
private UserInfoService userInfoService;
@@ -75,6 +79,7 @@
user = new UserInfo();
user.setAppId(acceptData.getApp().getId());
user.setIdentifyCode(identifyCode);
+ user.setAlipayUid(identifyCode);
try {
Long uid = userInfoService.addUserInfo(user);
user.setId(uid);
@@ -98,6 +103,35 @@
if (user == null) {
return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�");
}
+ return JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(user));
+ }
+
+ /**
+ * 鏀粯瀹濈敤鎴蜂俊鎭笂浼�
+ *
+ * @param acceptData
+ * @param userInfo
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping("uploadAlipayUserInfo")
+ public String uploadAlipayUserInfo(AcceptData acceptData, String userInfo) {
+ String decryptStr = RSAUtil.decrypt(userInfo);
+ if (StringUtil.isNullOrEmpty(decryptStr)) {
+ return JsonUtil.loadFalseResult("鐢ㄦ埛淇℃伅鑾峰彇澶辫触");
+ }
+ AlipayUserInfo alipayUserInfo = JsonUtil.getSimpleGson().fromJson(decryptStr, AlipayUserInfo.class);
+
+ UserInfo user = new UserInfo();
+ user.setId(acceptData.getUid());
+ user.setPortrait(alipayUserInfo.getAvatar());
+ user.setNickName(alipayUserInfo.getNickName());
+ user.setAlipayNickName(alipayUserInfo.getNickName());
+ user.setAlipayPortrait(alipayUserInfo.getAvatar());
+ userInfoService.updateUserInfo(user);
+
+ user = userInfoService.getUserDetail(user.getId());
+
return JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(user));
}
@@ -164,5 +198,18 @@
return JsonUtil.loadTrueResult(data);
}
+ @ResponseBody
+ @RequestMapping("getUserConfig")
+ public String getUserConfig(AcceptData acceptData){
+ //娑堟伅鏈鏁�
+ UserInfoExtra extra= userInfoExtraService.getUserInfoExtra(acceptData.getUid());
+ if(extra==null){
+ return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ UserConfigVO vo=new UserConfigVO();
+ vo.setMsgCount(extra.getMsgUnreadCount());
+ return JsonUtil.loadTrueResult(vo);
+ }
+
}
--
Gitblit v1.8.0