bug修复

admin

2020-12-19 37f89b3118620daa2277e227c2abdb574496ef56

 service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java

@@ -9,6 +9,7 @@
import com.ks.daylucky.exception.UserInfoExtraException;
import com.ks.daylucky.pojo.DO.UserInfo;
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;
@@ -16,6 +17,8 @@
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.service.UserMsgService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.RSA2Encryptor;
import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.UserInfoUtil;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -33,7 +36,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 +78,7 @@
                user = new UserInfo();
                user.setAppId(acceptData.getApp().getId());
                user.setIdentifyCode(identifyCode);
                user.setAlipayUid(identifyCode);
                try {
                    Long uid = userInfoService.addUserInfo(user);
                    user.setId(uid);
@@ -101,6 +105,35 @@
        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));
    }


    @ResponseBody
    @RequestMapping("setAlipayUserInfo")