Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!755

mp-admin/src/main/java/com/qs/mp/web/controller/api/common/UserController.java

@@ -40,6 +40,7 @@ import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
+
 import java.io.File;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -74,489 +75,488 @@ import sun.misc.BASE64Encoder;
 @Component
 public class UserController extends BaseApiController {
 
-  @Autowired
-  private ISysUserService sysUserService;
-
-  @Autowired
-  protected HostHolder hostHolder;
-
-  @Autowired
-  private IWxAccountService wxAccountService;
-
-  @Autowired
-  private IChannelService channelService;
-
-  @Value("${wx-channel.appId}")
-  private String channelAppId;
-  @Value("${wx-channel.appSecret}")
-  private String channelAppSecret;
-
-  @Value("${wx-user.appId}")
-  private String userAppId;
-  @Value("${wx-user.appSecret}")
-  private String userAppSecret;
-
-  @Value("${ali-miniApp.appId}")
-  private String aliAppId;
-  @Value("${ali-miniApp.public-key}")
-  private String aliPublicKey;
-  @Value("${ali-miniApp.private-key}")
-  private String aliPrivateKey;
-
-  @Value("{ali-miniApp.serverUrl}")
-  private String serverUrl;
-
-  @Value("{ali-miniApp.decrypt-key}")
-  private String decryptKey;
-
-  /**
-   * 文件上传路径
-   */
-  @Value("${mp.profile}")
-  public String filePath;
-
-  /**
-   * 公开
-   */
-  @Value("${cloud.public-bucket-name}")
-  private String publicBucketName;
-
-  @Autowired
-  private IAppTokenService appTokenService;
-
-  @Autowired
-  private SysLoginService sysLoginService;
-
-  private static final String CBC_CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";
-  private static final String KEY_ALGORITHM = "AES";
-  private static final String UTF8 = "UTF-8";
-
-
-  @ApiOperation("支付宝获取用户手机号")
-  @PostMapping("/user/aliAuth/mobile")
-  public AjaxResult aliAuthMobile(@RequestBody WxLoginParams wxLoginParams) {
-
-    String response = wxLoginParams.getEncryptedData();
-
-    //1. 获取验签和解密所需要的参数
-    Map<String, String> openapiResult = JSON.parseObject(response,
-            new TypeReference<Map<String, String>>() {
-            }, Feature.OrderedField);
-    String signType = "RSA2";
-    String charset = "UTF-8";
-    String encryptType = "AES";
-    String sign = openapiResult.get("sign");
-    String content = openapiResult.get("response");
-
-    // 是否加密
-    boolean isDataEncrypted = !content.startsWith("{");
-    boolean signCheckPass = false;
-
-    //2. 验签
-    String signContent = content;
-    String signVeriKey = aliPublicKey;
-    // 如果是加密的报文则需要在密文的前后添加双引号
-    if (isDataEncrypted) {
-      signContent = "\"" + signContent + "\"";
-    }
-    try {
-      signCheckPass = AlipaySignature.rsaCheck(signContent, sign, signVeriKey, charset, signType);
-    } catch (AlipayApiException e) {
-      // 验签异常, 日志
-      LogUtil.error(logger,"验签异常:{0}", e.getMessage());
-    }
-    if(!signCheckPass) {
-      // 验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
-      LogUtil.warn(logger, "验签失败");
-      return AjaxResult.error("验签失败");
-    }
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    protected HostHolder hostHolder;
+
+    @Autowired
+    private IWxAccountService wxAccountService;
+
+    @Autowired
+    private IChannelService channelService;
+
+    @Value("${wx-channel.appId}")
+    private String channelAppId;
+    @Value("${wx-channel.appSecret}")
+    private String channelAppSecret;
+
+    @Value("${wx-user.appId}")
+    private String userAppId;
+    @Value("${wx-user.appSecret}")
+    private String userAppSecret;
+
+    @Value("${ali-miniApp.appId}")
+    private String aliAppId;
+    @Value("${ali-miniApp.public-key}")
+    private String aliPublicKey;
+    @Value("${ali-miniApp.private-key}")
+    private String aliPrivateKey;
+
+    @Value("{ali-miniApp.serverUrl}")
+    private String serverUrl;
+
+    @Value("{ali-miniApp.decrypt-key}")
+    private String decryptKey;
+
+    /**
+     * 文件上传路径
+     */
+    @Value("${mp.profile}")
+    public String filePath;
+
+    /**
+     * 公开
+     */
+    @Value("${cloud.public-bucket-name}")
+    private String publicBucketName;
+
+    @Autowired
+    private IAppTokenService appTokenService;
+
+    @Autowired
+    private SysLoginService sysLoginService;
+
+    private static final String CBC_CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";
+    private static final String KEY_ALGORITHM = "AES";
+    private static final String UTF8 = "UTF-8";
+
+
+    @ApiOperation("支付宝获取用户手机号")
+    @PostMapping("/user/aliAuth/mobile")
+    public AjaxResult aliAuthMobile(@RequestBody WxLoginParams wxLoginParams) {
+
+        String response = wxLoginParams.getEncryptedData();
+
+        //1. 获取验签和解密所需要的参数
+        Map<String, String> openapiResult = JSON.parseObject(response,
+                new TypeReference<Map<String, String>>() {
+                }, Feature.OrderedField);
+        String signType = "RSA2";
+        String charset = "UTF-8";
+        String encryptType = "AES";
+        String sign = openapiResult.get("sign");
+        String content = openapiResult.get("response");
+
+        // 是否加密
+        boolean isDataEncrypted = !content.startsWith("{");
+        boolean signCheckPass = false;
+
+        //2. 验签
+        String signContent = content;
+        String signVeriKey = aliPublicKey;
+        // 如果是加密的报文则需要在密文的前后添加双引号
+        if (isDataEncrypted) {
+            signContent = "\"" + signContent + "\"";
+        }
+        try {
+            signCheckPass = AlipaySignature.rsaCheck(signContent, sign, signVeriKey, charset, signType);
+        } catch (AlipayApiException e) {
+            // 验签异常, 日志
+            LogUtil.error(logger, "验签异常:{0}", e.getMessage());
+        }
+        if (!signCheckPass) {
+            // 验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
+            LogUtil.warn(logger, "验签失败");
+            return AjaxResult.error("验签失败");
+        }
 
-    //3. 解密
-    String plainData = null;
-    if (isDataEncrypted) {
-      try {
-        plainData = AlipayEncrypt.decryptContent(content, encryptType, decryptKey, charset);
-      } catch (AlipayApiException e) {
-        //解密异常, 记录日志
-        LogUtil.warn(logger, "解密异常");
-        return AjaxResult.error("解密异常");
-      }
-    } else {
-      plainData = content;
-    }
+        //3. 解密
+        String plainData = null;
+        if (isDataEncrypted) {
+            try {
+                plainData = AlipayEncrypt.decryptContent(content, encryptType, decryptKey, charset);
+            } catch (AlipayApiException e) {
+                //解密异常, 记录日志
+                LogUtil.warn(logger, "解密异常");
+                return AjaxResult.error("解密异常");
+            }
+        } else {
+            plainData = content;
+        }
 
-    // 转对象 异常情况处理
+        // 转对象 异常情况处理
 
-    AliPhoneDecryptVO aliPhoneDecryptVO = JSONUtil.toBean(plainData, AliPhoneDecryptVO.class);
-    if (!aliPhoneDecryptVO.isSuccess()) {
-      LogUtil.error(logger,"解析手机号失败,errorMsg:{0}", plainData);
-      return AjaxResult.error("解析手机号失败," + aliPhoneDecryptVO.getSubMsg());
-    }
-    String mobile = aliPhoneDecryptVO.getMobile();
-
-    AjaxResult ajax = AjaxResult.success();
-    SysUser sysUser = sysUserService.selectUserByUserName(mobile);
-    if (null == sysUser) {
-      if (wxLoginParams.getIdentity() != UserIdentityEnum.USER.ordinal()) {
-        return error("用户不存在，请联系客服");
-      }
-      // C端直接注册新用户
-      sysUser = new SysUser();
-      sysUser.setUserName(mobile);
-      sysUser.setNickName(mobile);
-      sysUser.setPhonenumber(mobile);
-      sysUserService.registerUser(sysUser);
-    }
-    Map<String, String> result = sysLoginService.wxAuthLogin(mobile, wxLoginParams.getIdentity());
-    for (String key : result.keySet()) {
-      ajax.put(key, result.get(key));
+        AliPhoneDecryptVO aliPhoneDecryptVO = JSONUtil.toBean(plainData, AliPhoneDecryptVO.class);
+        if (!aliPhoneDecryptVO.isSuccess()) {
+            LogUtil.error(logger, "解析手机号失败,errorMsg:{0}", plainData);
+            return AjaxResult.error("解析手机号失败," + aliPhoneDecryptVO.getSubMsg());
+        }
+        String mobile = aliPhoneDecryptVO.getMobile();
+
+        AjaxResult ajax = AjaxResult.success();
+        SysUser sysUser = sysUserService.selectUserByUserName(mobile);
+        if (null == sysUser) {
+            if (wxLoginParams.getIdentity() != UserIdentityEnum.USER.ordinal()) {
+                return error("用户不存在，请联系客服");
+            }
+            // C端直接注册新用户
+            sysUser = new SysUser();
+            sysUser.setUserName(mobile);
+            sysUser.setNickName(mobile);
+            sysUser.setPhonenumber(mobile);
+            sysUserService.registerUser(sysUser);
+        }
+        Map<String, String> result = sysLoginService.wxAuthLogin(mobile, wxLoginParams.getIdentity());
+        for (String key : result.keySet()) {
+            ajax.put(key, result.get(key));
+        }
+        return ajax;
     }
-    return ajax;
-  }
-
 
 
-  @ApiOperation("微信授权登录")
-  @RequestMapping(value = "/user/wxauth", method = RequestMethod.POST)
-  @ResponseBody
-  public AjaxResult wxauth(@RequestBody WxLoginParams wxLoginParams) {
-    String appId = channelAppId;
-    String appSecret = channelAppSecret;
-    if (wxLoginParams.getIdentity() == UserIdentityEnum.USER.ordinal()) {
-      appId = userAppId;
-      appSecret = userAppSecret;
-    }
-    //调用微信后台接口获取openId
-    String res = wxLoginCheck(wxLoginParams.getCode(), appId, appSecret);
-    JSONObject jsonObject = JSONObject.parseObject(res);
-    String openId = jsonObject.getString("openid");
-    String sessionKey = jsonObject.getString("session_key");
-    String unionId = jsonObject.getString("unionid");
-
-    if (StringUtils.isBlank(openId) || StringUtils.isBlank(sessionKey)) {
-      LogUtil.error(logger, "微信登录失败:" + jsonObject.toJSONString());
-      return error("登录失败");
-    }
-    //更新数据库用户授权信息
-    LoginUser loginUser = SecurityUtils.getLoginUser();
-    SysUser user = new SysUser();
-    user.setUserId(loginUser.getUserId());
-    if (wxLoginParams.getIdentity() == UserIdentityEnum.USER.ordinal()) {
-      user.setOpenId(openId);
-    } else {
-      user.setChannelOpenId(openId);
-    }
+    @ApiOperation("微信授权登录")
+    @RequestMapping(value = "/user/wxauth", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxResult wxauth(@RequestBody WxLoginParams wxLoginParams) {
+        String appId = channelAppId;
+        String appSecret = channelAppSecret;
+        if (wxLoginParams.getIdentity() == UserIdentityEnum.USER.ordinal()) {
+            appId = userAppId;
+            appSecret = userAppSecret;
+        }
+        //调用微信后台接口获取openId
+        String res = wxLoginCheck(wxLoginParams.getCode(), appId, appSecret);
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        String openId = jsonObject.getString("openid");
+        String sessionKey = jsonObject.getString("session_key");
+        String unionId = jsonObject.getString("unionid");
+
+        if (StringUtils.isBlank(openId) || StringUtils.isBlank(sessionKey)) {
+            LogUtil.error(logger, "微信登录失败:" + jsonObject.toJSONString());
+            return error("登录失败");
+        }
+        //更新数据库用户授权信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser user = new SysUser();
+        user.setUserId(loginUser.getUserId());
+        if (wxLoginParams.getIdentity() == UserIdentityEnum.USER.ordinal()) {
+            user.setOpenId(openId);
+        } else {
+            user.setChannelOpenId(openId);
+        }
 
-    user.setSessionKey(sessionKey);
-    user.setUnionId(unionId);
-    user.setLoginDate(new Date());
-    user.setNickName(wxLoginParams.getNickName());
-    //如果用户头像字段为空，则默认获取用户微信头像
-    String avatarUrl = wxLoginParams.getAvatarUrl();
-
-    //用户先关联过公众号，那么授权后进行自动绑定
-    LambdaQueryWrapper<WxAccount> wrapper = new LambdaQueryWrapper();
-    wrapper.eq(WxAccount::getUnionid,unionId);
-    wrapper.eq(WxAccount::getActType, WxActTypeEnum.GZH.getValue());
-    List<WxAccount> accountList = wxAccountService.list(wrapper);
-    if(accountList.size() == 1){
-      user.setGzhOpenId(accountList.get(0).getOpenid());
-    }
-    if(StringUtils.isBlank(loginUser.getUser().getAvatar()) && !StringUtils.isBlank(avatarUrl)){
-      try {
-        //下载并且重新上传头像
-        JSONObject result = saveHeadImage(avatarUrl,String.valueOf(user.getUserId()));
-        if(result != null){
-          user.setAvatar(result.getString("fileName"));
+        user.setSessionKey(sessionKey);
+        user.setUnionId(unionId);
+        user.setLoginDate(new Date());
+        user.setNickName(wxLoginParams.getNickName());
+        //如果用户头像字段为空，则默认获取用户微信头像
+        String avatarUrl = wxLoginParams.getAvatarUrl();
+
+        //用户先关联过公众号，那么授权后进行自动绑定
+        LambdaQueryWrapper<WxAccount> wrapper = new LambdaQueryWrapper();
+        wrapper.eq(WxAccount::getUnionid, unionId);
+        wrapper.eq(WxAccount::getActType, WxActTypeEnum.GZH.getValue());
+        List<WxAccount> accountList = wxAccountService.list(wrapper);
+        if (accountList.size() == 1) {
+            user.setGzhOpenId(accountList.get(0).getOpenid());
         }
-      } catch (Exception e) {
-        LogUtil.error(logger,"头像上传异常",e.getMessage());
-      }
-    }
-    logger.info("update user data:"+JSONObject.toJSONString(user));
-    int rows = sysUserService.updateUserProfile(user);
-    if (rows != 1) {
-      LogUtil.error(logger,"用户微信授权异常");
-      return error("用户微信授权异常");
+        if (StringUtils.isBlank(loginUser.getUser().getAvatar()) && !StringUtils.isBlank(avatarUrl)) {
+            try {
+                //下载并且重新上传头像
+                JSONObject result = saveHeadImage(avatarUrl, String.valueOf(user.getUserId()));
+                if (result != null) {
+                    user.setAvatar(result.getString("fileName"));
+                }
+            } catch (Exception e) {
+                LogUtil.error(logger, "头像上传异常", e.getMessage());
+            }
+        }
+        logger.info("update user data:" + JSONObject.toJSONString(user));
+        int rows = sysUserService.updateUserProfile(user);
+        if (rows != 1) {
+            LogUtil.error(logger, "用户微信授权异常");
+            return error("用户微信授权异常");
+        }
+        JSONObject rst = new JSONObject();
+        rst.put("openId", openId);
+        return success(rst);
     }
-    JSONObject rst = new JSONObject();
-    rst.put("openId", openId);
-    return success(rst);
-  }
-
-
-  @ApiOperation("微信授权获取用户手机号")
-  @RequestMapping(value = "/user/wxauth/mobile", method = RequestMethod.POST)
-  @ResponseBody
-  public AjaxResult wxauthMobile(@RequestBody WxLoginParams wxLoginParams) {
-    String appId = userAppId;
-    String appSecret = userAppSecret;
+
+
+    @ApiOperation("微信授权获取用户手机号")
+    @RequestMapping(value = "/user/wxauth/mobile", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxResult wxauthMobile(@RequestBody WxLoginParams wxLoginParams) {
+        String appId = userAppId;
+        String appSecret = userAppSecret;
     /*if (UserIdentityEnum.isChannel(wxLoginParams.getIdentity())) {
       appId = channelAppId;
       appSecret = channelAppSecret;
     }*/
-    JSONObject phoneInfo;
-    if (StringUtils.isNotBlank(wxLoginParams.getCode())) {
-      //调用微信后台接口获取openId
-      String res = getWxMobile(wxLoginParams, appId);
-      JSONObject jsonObject = JSONObject.parseObject(res);
-      int errcode = jsonObject.getIntValue("errcode");
-      if (errcode != 0) {
-        LogUtil.error(logger, "手机号获取失败:" + res);
-        return error("手机号获取失败");
-      }
-      phoneInfo = jsonObject.getJSONObject("phone_info");
-    } else {
-      //调用微信后台接口获取openId
-      String rtn = wxLoginCheck(wxLoginParams.getLoginCode(), appId, appSecret);
-      JSONObject jsonObject = JSONObject.parseObject(rtn);
-      String openId = jsonObject.getString("openid");
-      String sessionKey = jsonObject.getString("session_key");
-
-      if (StringUtils.isBlank(openId) || StringUtils.isBlank(sessionKey)) {
-        LogUtil.error(logger, "微信登录失败:" + jsonObject.toJSONString());
-        return error("登录失败");
-      }
-
-      String res = weixinDecrypt(wxLoginParams.getEncryptedData(), sessionKey, wxLoginParams.getIv());
-      if (StringUtils.isBlank(res)) {
-        return error("手机号获取失败");
-      }
-      /**
-       * {
-       *     "phoneNumber": "13580006666",
-       *     "purePhoneNumber": "13580006666",
-       *     "countryCode": "86",
-       *     "watermark":
-       *     {
-       *         "appid":"APPID",
-       *         "timestamp": TIMESTAMP
-       *     }
-       * }
-       */
-      phoneInfo = JSON.parseObject(res);
-      JSONObject watermark = phoneInfo.getJSONObject("watermark");
-      if (!appId.equals(watermark.getString("appid"))) {
-        LogUtil.error(logger, "手机号解密appid不符，appid:{0}",  watermark.getString("appid"));
-        return error("手机号获取失败");
-      }
-    }
-    String phoneNumber = phoneInfo.getString("phoneNumber");
+        JSONObject phoneInfo;
+        if (StringUtils.isNotBlank(wxLoginParams.getCode())) {
+            //调用微信后台接口获取openId
+            String res = getWxMobile(wxLoginParams, appId);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            int errcode = jsonObject.getIntValue("errcode");
+            if (errcode != 0) {
+                LogUtil.error(logger, "手机号获取失败:" + res);
+                return error("手机号获取失败");
+            }
+            phoneInfo = jsonObject.getJSONObject("phone_info");
+        } else {
+            //调用微信后台接口获取openId
+            String rtn = wxLoginCheck(wxLoginParams.getLoginCode(), appId, appSecret);
+            JSONObject jsonObject = JSONObject.parseObject(rtn);
+            String openId = jsonObject.getString("openid");
+            String sessionKey = jsonObject.getString("session_key");
+
+            if (StringUtils.isBlank(openId) || StringUtils.isBlank(sessionKey)) {
+                LogUtil.error(logger, "微信登录失败:" + jsonObject.toJSONString());
+                return error("登录失败");
+            }
+
+            String res = weixinDecrypt(wxLoginParams.getEncryptedData(), sessionKey, wxLoginParams.getIv());
+            if (StringUtils.isBlank(res)) {
+                return error("手机号获取失败");
+            }
+            /**
+             * {
+             *     "phoneNumber": "13580006666",
+             *     "purePhoneNumber": "13580006666",
+             *     "countryCode": "86",
+             *     "watermark":
+             *     {
+             *         "appid":"APPID",
+             *         "timestamp": TIMESTAMP
+             *     }
+             * }
+             */
+            phoneInfo = JSON.parseObject(res);
+            JSONObject watermark = phoneInfo.getJSONObject("watermark");
+            if (!appId.equals(watermark.getString("appid"))) {
+                LogUtil.error(logger, "手机号解密appid不符，appid:{0}", watermark.getString("appid"));
+                return error("手机号获取失败");
+            }
+        }
+        String phoneNumber = phoneInfo.getString("phoneNumber");
 
-    if (StringUtils.isBlank(phoneNumber)) {
-      LogUtil.error(logger, "微信手机号不存在:" + phoneInfo);
-      return error("手机号获取失败");
-    }
-    AjaxResult ajax = AjaxResult.success();
-
-    SysUser sysUser = sysUserService.selectUserByUserName(phoneNumber);
-    if (null == sysUser) {
-      if (wxLoginParams.getIdentity() != UserIdentityEnum.USER.ordinal()) {
-        return error("用户不存在，请联系客服");
-      }
-      // C端直接注册新用户
-      sysUser = new SysUser();
-      sysUser.setUserName(phoneNumber);
-      sysUser.setNickName(phoneNumber);
-      sysUser.setPhonenumber(phoneNumber);
-      sysUserService.registerUser(sysUser);
+        if (StringUtils.isBlank(phoneNumber)) {
+            LogUtil.error(logger, "微信手机号不存在:" + phoneInfo);
+            return error("手机号获取失败");
+        }
+        AjaxResult ajax = AjaxResult.success();
+
+        SysUser sysUser = sysUserService.selectUserByUserName(phoneNumber);
+        if (null == sysUser) {
+            if (wxLoginParams.getIdentity() != UserIdentityEnum.USER.ordinal()) {
+                return error("用户不存在，请联系客服");
+            }
+            // C端直接注册新用户
+            sysUser = new SysUser();
+            sysUser.setUserName(phoneNumber);
+            sysUser.setNickName(phoneNumber);
+            sysUser.setPhonenumber(phoneNumber);
+            sysUserService.registerUser(sysUser);
+        }
+        Map<String, String> result = sysLoginService.wxAuthLogin(phoneNumber, wxLoginParams.getIdentity());
+        for (String key : result.keySet()) {
+            ajax.put(key, result.get(key));
+        }
+        return ajax;
     }
-    Map<String, String> result = sysLoginService.wxAuthLogin(phoneNumber, wxLoginParams.getIdentity());
-    for (String key : result.keySet()) {
-      ajax.put(key, result.get(key));
+
+    /**
+     * 重置密码
+     */
+    @RequestMapping(value = "/user/resetPwd", method = RequestMethod.POST)
+    public AjaxResult resetPwd(@RequestBody JSONObject user) {
+        //验证短信验证码
+        ValidSMSResult res = JSMSUtils.sendValidSMSCode(
+                user.getString("messageId"), user.getString("code"));
+        if (res == null || !res.getIsValid()) {
+            return error("短信验证码错误");
+        }
+
+        int rows = sysUserService.resetUserPwd(user.getString("userName"),
+                SecurityUtils.encryptPassword(user.getString("password")));
+        if (rows == 1) {
+            return success("密码修改成功.");
+        } else {
+            return error("密码修改失败");
+        }
     }
-    return ajax;
-  }
-
-  /**
-   * 重置密码
-   */
-  @RequestMapping(value = "/user/resetPwd", method = RequestMethod.POST)
-  public AjaxResult resetPwd(@RequestBody JSONObject user) {
-    //验证短信验证码
-    ValidSMSResult res = JSMSUtils.sendValidSMSCode(
-        user.getString("messageId"), user.getString("code"));
-    if (res == null || !res.getIsValid()) {
-      return error("短信验证码错误");
+
+    /**
+     * 查询当前登录用户信息
+     */
+    @ApiOperation("查询当前登录用户信息")
+    @RequestMapping(value = "/user/getLoginUserinfo", method = RequestMethod.POST)
+    public AjaxResult getLoginUserinfo(@RequestBody JSONObject params) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser sysUser = sysUserService.selectUserById(SecurityUtils.getUserId());
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("userName", sysUser.getUserName());
+        jsonObject.put("avatar", sysUser.getAvatar());
+        if (loginUser.getIdentity() == UserIdentityEnum.CHANNEL) {
+            Channel channel = channelService.getById(loginUser.getChannelId());
+            jsonObject.put("nickName", channel.getName());
+        } else {
+            jsonObject.put("nickName", sysUser.getNickName());
+        }
+        jsonObject.put("openId", sysUser.getOpenId());
+        jsonObject.put("channelOpenId", sysUser.getChannelOpenId());
+        JSONArray roleKeys = new JSONArray();
+        JSONArray roles = new JSONArray();
+        loginUser.getUser().getRoles().forEach(sysRole -> roles.add(sysRole.getRoleName()));
+        jsonObject.put("roleKeys", roleKeys);
+        jsonObject.put("roles", roles);
+        jsonObject.put("userId", SecurityUtils.getUserId());
+
+        return success(jsonObject);
     }
 
-    int rows = sysUserService.resetUserPwd(user.getString("userName"),
-        SecurityUtils.encryptPassword(user.getString("password")));
-    if (rows == 1) {
-      return success("密码修改成功.");
-    } else {
-      return error("密码修改失败");
+
+    /**
+     * code 换取 session_key
+     *
+     * @param
+     * @return
+     */
+    private String wxLoginCheck(String code, String appId, String appSecret) {
+        String param = "appid=" + appId + "&secret=" + appSecret + "&js_code=" + code
+                + "&grant_type=authorization_code";
+        String res = HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session", param);
+        return res;
     }
-  }
-
-  /**
-   * 查询当前登录用户信息
-   */
-  @ApiOperation("查询当前登录用户信息")
-  @RequestMapping(value = "/user/getLoginUserinfo", method = RequestMethod.POST)
-  public AjaxResult getLoginUserinfo(@RequestBody JSONObject params) {
-    LoginUser loginUser = SecurityUtils.getLoginUser();
-    SysUser sysUser = sysUserService.selectUserById(SecurityUtils.getUserId());
-
-    JSONObject jsonObject = new JSONObject();
-    jsonObject.put("userName", sysUser.getUserName());
-    jsonObject.put("avatar", sysUser.getAvatar());
-    if(loginUser.getIdentity() == UserIdentityEnum.CHANNEL) {
-      Channel channel = channelService.getById(loginUser.getChannelId());
-      jsonObject.put("nickName", channel.getName());
-    } else {
-      jsonObject.put("nickName", sysUser.getNickName());
+
+    /**
+     * code 换取 手机号
+     * {
+     * "errcode":0,
+     * "errmsg":"ok",
+     * "phone_info": {
+     * "phoneNumber":"xxxxxx",
+     * "purePhoneNumber": "xxxxxx",
+     * "countryCode": 86,
+     * "watermark": {
+     * "timestamp": 1637744274,
+     * "appid": "xxxx"
+     * }
+     * }
+     * }
+     *
+     * @param
+     * @return
+     */
+    private String getWxMobile(WxLoginParams params, String appId) {
+        String accessToken = appTokenService.getAccessToken(appId);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code", params.getCode());
+        LogUtil.info(logger, JSONObject.toJSONString(params));
+        String res = HttpUtils.sendPost("https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + accessToken, jsonObject.toJSONString());
+        return res;
     }
-    jsonObject.put("openId", sysUser.getOpenId());
-    jsonObject.put("channelOpenId", sysUser.getChannelOpenId());
-    JSONArray roleKeys = new JSONArray();
-    JSONArray roles = new JSONArray();
-    loginUser.getUser().getRoles().forEach(sysRole -> roles.add(sysRole.getRoleName()));
-    jsonObject.put("roleKeys", roleKeys);
-    jsonObject.put("roles", roles);
-    jsonObject.put("userId", SecurityUtils.getUserId());
-
-    return success(jsonObject);
-  }
-
-
-
-  /**
-   * code 换取 session_key
-   *
-   * @param
-   * @return
-   */
-  private String wxLoginCheck(String code, String appId, String appSecret) {
-    String param = "appid=" + appId + "&secret=" + appSecret + "&js_code=" + code
-        + "&grant_type=authorization_code";
-    String res = HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session", param);
-    return res;
-  }
-
-  /**
-   * code 换取 手机号
-   *{
-   *     "errcode":0,
-   *     "errmsg":"ok",
-   *     "phone_info": {
-   *         "phoneNumber":"xxxxxx",
-   *         "purePhoneNumber": "xxxxxx",
-   *         "countryCode": 86,
-   *         "watermark": {
-   *             "timestamp": 1637744274,
-   *             "appid": "xxxx"
-   *         }
-   *     }
-   * }
-   * @param
-   * @return
-   */
-  private String getWxMobile(WxLoginParams params, String appId) {
-    String accessToken = appTokenService.getAccessToken(appId);
-    JSONObject jsonObject = new JSONObject();
-    jsonObject.put("code", params.getCode());
-    LogUtil.info(logger, JSONObject.toJSONString(params));
-    String res = HttpUtils.sendPost("https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + accessToken, jsonObject.toJSONString());
-    return res;
-  }
-
-  /**
-   * { "subscribe": 1, "openid": "o6_bmjrPTlm6_2sgVt7hMZOPfL2M", "nickname": "Band", "sex": 1,
-   * "language": "zh_CN", "city": "广州", "province": "广东", "country": "中国", "headimgurl":
-   * "http://wx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/0",
-   * "subscribe_time": 1382694957, "unionid": " o6_bmasdasdsad6_2sgVt7hMZOPfL" }
-   *
-   * @param accessToken
-   * @param openId
-   * @return
-   */
-  private String getWxUserInfo(String accessToken, String openId) {
-    String url = "https://api.weixin.qq.com/cgi-bin/user/info";
-    String params = "access_token=" + accessToken + "&openid=" + openId + "&lang=zh_CN";
-    String res = HttpUtils.sendGet(url, params);
-    logger.info("weixin user info :" + res);
-    return res;
-  }
-
-  private JSONObject saveHeadImage(String serverUrl,String userId) throws Exception {
-    String outFilePath = filePath+"/headImage";
-    File outPath = new File(outFilePath);
-    if (!outPath.exists()) {
-      if (!outPath.mkdirs()) {
-        throw new Exception("makdirs: '" + outFilePath + "'fail");
-      }
+
+    /**
+     * { "subscribe": 1, "openid": "o6_bmjrPTlm6_2sgVt7hMZOPfL2M", "nickname": "Band", "sex": 1,
+     * "language": "zh_CN", "city": "广州", "province": "广东", "country": "中国", "headimgurl":
+     * "http://wx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/0",
+     * "subscribe_time": 1382694957, "unionid": " o6_bmasdasdsad6_2sgVt7hMZOPfL" }
+     *
+     * @param accessToken
+     * @param openId
+     * @return
+     */
+    private String getWxUserInfo(String accessToken, String openId) {
+        String url = "https://api.weixin.qq.com/cgi-bin/user/info";
+        String params = "access_token=" + accessToken + "&openid=" + openId + "&lang=zh_CN";
+        String res = HttpUtils.sendGet(url, params);
+        logger.info("weixin user info :" + res);
+        return res;
     }
-    URL url = new URL(serverUrl);
-    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-    conn.setConnectTimeout(3 * 1000);
-    //防止屏蔽程序抓取而放回403错误
-    conn.setRequestProperty("User-Agent", "Mozilla/4.0(compatible;MSIE 5.0;Windows NT;DigExt)");
-    Long totalSize = Long.parseLong(conn.getHeaderField("Content-Length"));
-    String name = userId+"/"+ UUIDUtils.newId();
-    String mimeType = "image/jpg";
-    //logger.info("图片开始下载. totalSize" + totalSize);
-    if (totalSize > 0) {
-      File file = new File(outFilePath+"/"+userId);
-      FileUtils.copyURLToFile(url, file);
-      //logger.info("图片下载完成.");
-      QcloudFileUtils.putFile(file, name, publicBucketName, mimeType );
-      FileUtils.delete(file);
-    } else {
-      throw new Exception("can not find serverUrl :{}" + serverUrl);
+
+    private JSONObject saveHeadImage(String serverUrl, String userId) throws Exception {
+        String outFilePath = filePath + "/headImage";
+        File outPath = new File(outFilePath);
+        if (!outPath.exists()) {
+            if (!outPath.mkdirs()) {
+                throw new Exception("makdirs: '" + outFilePath + "'fail");
+            }
+        }
+        URL url = new URL(serverUrl);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setConnectTimeout(3 * 1000);
+        //防止屏蔽程序抓取而放回403错误
+        conn.setRequestProperty("User-Agent", "Mozilla/4.0(compatible;MSIE 5.0;Windows NT;DigExt)");
+        Long totalSize = Long.parseLong(conn.getHeaderField("Content-Length"));
+        String name = userId + "/" + UUIDUtils.newId();
+        String mimeType = "image/jpg";
+        //logger.info("图片开始下载. totalSize" + totalSize);
+        if (totalSize > 0) {
+            File file = new File(outFilePath + "/" + userId);
+            FileUtils.copyURLToFile(url, file);
+            //logger.info("图片下载完成.");
+            QcloudFileUtils.putFile(file, name, publicBucketName, mimeType);
+            FileUtils.delete(file);
+        } else {
+            throw new Exception("can not find serverUrl :{}" + serverUrl);
+        }
+        JSONObject result = new JSONObject();
+        result.put("fileName", name);
+        result.put("fileType", mimeType);
+        return result;
     }
-    JSONObject result = new JSONObject();
-    result.put("fileName",name);
-    result.put("fileType",mimeType);
-    return result;
-  }
-
-  /**
-   * 带有初始变量的解密（微信用）
-   *
-   * @param content     密文
-   * @param skey        密钥
-   * @param ivParameter 初始向量
-   * @return
-   * @throws Exception
-   */
-  public String weixinDecrypt(String content, String skey, String ivParameter) {
-    try {
-      BASE64Decoder decoder = new BASE64Decoder();
-      // 根据微信文档要求需要把 密文、密钥、iv 使用BASE64进行解码
-      byte[] keyByte = decoder.decodeBuffer(skey);
-      byte[] contentByte = decoder.decodeBuffer(content);
-      byte[] ivByte = decoder.decodeBuffer(ivParameter);
-      // 生成密码
-      SecretKeySpec keySpec = new SecretKeySpec(keyByte, KEY_ALGORITHM);
-      // 生成IvParameterSpec
-      IvParameterSpec iv = new IvParameterSpec(ivByte);
-      // 初始化解密 指定模式 AES/CBC/PKCS5Padding
-      Cipher cipher = Cipher.getInstance(CBC_CIPHER_ALGORITHM);
-      // 指定解密模式 传入密码 iv
-      cipher.init(Cipher.DECRYPT_MODE, keySpec, iv);
-      // 解密
-      byte[] result = cipher.doFinal(contentByte);
-      return new String(result, UTF8);
-    } catch (Exception e) {
-      LogUtil.error(logger, e, "【解密错误】content:{0},ivParameter:{1}", new Object[]{content, ivParameter});
-      return null;
+
+    /**
+     * 带有初始变量的解密（微信用）
+     *
+     * @param content     密文
+     * @param skey        密钥
+     * @param ivParameter 初始向量
+     * @return
+     * @throws Exception
+     */
+    public String weixinDecrypt(String content, String skey, String ivParameter) {
+        try {
+            BASE64Decoder decoder = new BASE64Decoder();
+            // 根据微信文档要求需要把 密文、密钥、iv 使用BASE64进行解码
+            byte[] keyByte = decoder.decodeBuffer(skey);
+            byte[] contentByte = decoder.decodeBuffer(content);
+            byte[] ivByte = decoder.decodeBuffer(ivParameter);
+            // 生成密码
+            SecretKeySpec keySpec = new SecretKeySpec(keyByte, KEY_ALGORITHM);
+            // 生成IvParameterSpec
+            IvParameterSpec iv = new IvParameterSpec(ivByte);
+            // 初始化解密 指定模式 AES/CBC/PKCS5Padding
+            Cipher cipher = Cipher.getInstance(CBC_CIPHER_ALGORITHM);
+            // 指定解密模式 传入密码 iv
+            cipher.init(Cipher.DECRYPT_MODE, keySpec, iv);
+            // 解密
+            byte[] result = cipher.doFinal(contentByte);
+            return new String(result, UTF8);
+        } catch (Exception e) {
+            LogUtil.error(logger, e, "【解密错误】content:{0},ivParameter:{1}", new Object[]{content, ivParameter});
+            return null;
+        }
     }
-  }
 
-  public static void main(String[] args) throws AlipayApiException {
+    public static void main(String[] args) throws AlipayApiException {
 //    UserController userController = new UserController();
 //    System.out.println(userController.weixinDecrypt("qvNE+SHdiP2GTbmNaqahrhhLw7EZetcMhUMV9yPXHxBbWOMcZ5gFxOGliXC9uojyC0NDUXCUi1xvFVDKMYREQ7rLXXrZIkB1jEleJNuUb9kO3LCDRucvbGAbVwm2EsTNsd5VbqI3fKdu0IOxmmSAWCLZNGXZBlki4ke62lI+ASg6dPohQmmCux8jwD2Js3ZnDQN2mb0JPRT68Qj716gYvA==", "QJ/WdeFANTIfIErOCJ2jNg==", "60YJmIckq4kaXp88wAGGHA=="));
 
-    String charset = "UTF-8";
-    String encryptType = "AES";
+        String charset = "UTF-8";
+        String encryptType = "AES";
 
-    String publicKey1 = "al2021003127607930AES";
-    String s = AlipayEncrypt.encryptContent("17681682549", encryptType, publicKey1, charset);
-    System.out.println("s = " + s);
-    String s2 = AlipayEncrypt.decryptContent(s, encryptType, publicKey1, charset);
-    System.out.println("s2 = " + s2);
+        String publicKey1 = "al2021003127607930AES";
+        String s = AlipayEncrypt.encryptContent("17681682549", encryptType, publicKey1, charset);
+        System.out.println("s = " + s);
+        String s2 = AlipayEncrypt.decryptContent(s, encryptType, publicKey1, charset);
+        System.out.println("s2 = " + s2);
 
-  }
+    }
 
 }

mp-admin/src/main/resources/application.yml

@@ -141,8 +141,8 @@ wxgzh:
 # 支付宝盲票小程序appId和公钥私钥
 ali-miniApp:
   appId: 2021003127607930
-  serverUrl: "https://openapi.alipay.com/gateway.do"
-  public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgti2dfmICYSuMNNHFta63S4e6+FaDo0Euyj5e5pjN77LERJ4PENi3a++fIfnBUe4YNPqFMoERc7Ea8hM6PPlRUQNSyKiUTt598vNm4z7jHAHjYU4N8bx7KrkBJIRaJlmHZI+tY+c2M5Y1FyQXQew5LT9D1OVzHAZRbWe8yTGlNL96qNPkVxQhv1LWDwc8NWncn+9Eyimp9qPtmVMvVQGwwqF/VVueBX60pjV0jjCOaY9onXMtoADZHKF0VlzND5gE2DFcq4Ut1VlhovxudRt94mrnat4IT6Mrr+Iy8qGose7I3Qp+Dmlwed8y5u//akoY4jiVKHJ9/XbqoqUqyM27wIDAQAB
+  serverUrl: https://openapi.alipay.com/gateway.do
+  public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlHI65xSPooVQ7oMnNw3U2s+yGEYHCepQXgkl9c94wrUrP22wYevv7HVKZ1A87lPJhjxwFyXRsqK/WMXA8lfl/kYP3+Tu43VVKSuACAFD+1p/ZShnRR+HAD9g43fFqmPGvBM8c9lzbBS+5wwMfiNsjMNjU5XVTY8/w2NG4fp3MzePqQ4jzMofiYUtWIkpFeGBbFedJW+QEGVkZ5A/3aDzqX8/wOQBT0Hv/r0yjoTwFOBJhZ9PJg+IRifHEoSI4krut31UX+HEdhTt+0p0+ZOI0zokFR8Jz/ZJn6kjMVeMuCFH4fpbwUa+DX4n1ldyeLCe2zZE/KYnho0I0GRWkgJx7wIDAQAB
   private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCC2LZ1+YgJhK4w00cW1rrdLh7r4VoOjQS7KPl7mmM3vssREng8Q2Ldr758h+cFR7hg0+oUygRFzsRryEzo8+VFRA1LIqJRO3n3y82bjPuMcAeNhTg3xvHsquQEkhFomWYdkj61j5zYzljUXJBdB7DktP0PU5XMcBlFtZ7zJMaU0v3qo0+RXFCG/UtYPBzw1adyf70TKKan2o+2ZUy9VAbDCoX9VW54FfrSmNXSOMI5pj2idcy2gANkcoXRWXM0PmATYMVyrhS3VWWGi/G51G33iaudq3ghPoyuv4jLyoaix7sjdCn4OaXB53zLm7/9qShjiOJUocn39duqipSrIzbvAgMBAAECggEAGACVB/MsR0K1iXNYWRIu2R/6wB5onL61nXeYvFnH1ZQEQC95KuTZn/z7HnD3qfpMEkcNa57bRcr2MSdfJGSJLDmdjqjdybT1XMVgBCbKhiqO2CEV/PVbr6Rxi30YAG4TU11eb4PWq9a+aMZKHSaqBmpE+ajFk+kEWctFSyj13JrKCThHqzj9PPi0OdB/SrbhHgRf9yL4XeE6bBxQ+iWDFTtoAeI5quOsH7h8yOSfp84e40kaFW3cJOzOJboFl308yhlV7/9ap3CWz7R2o0I8fSls5s4GiX62FSXuP0jocnhj1jlOmFW8UAg65pSE8B9X691JUuLQQt/WNolLdGI3EQKBgQDxX52UZHiyIbQhZzRa2dChMaN+p7r8lVxqW3d0dTYmnUbdpeP0z9ivhVC2S7DhONd3GtwmH+e86VoS+1IZlzxoXgrDptFv2IvuxtlZ2RsXS+Y66yTDJCGbrVDtjeWGlJqiRaTPlufdxq3qawIzhpxluBpCrCP79D9VTvzmVYbaPQKBgQCKxoMM6dc3NE9mG7BM3D5lFD0BZo2osPk4cu7t0llNlZdsmtslphTbIu+HMwbzmvDJ/fRABgzkVwubSKxwHEmNl3qMGH5smAVWi6t5QzZ4HYWrYSmJhBegeTvEvWFSb1hyHnpJRGUPXWFJfbM9aC4xCJcZoNKS/k1Zt4M/OkakmwKBgDhV2LGJwaHRu/kP3WhW7hqxOzeUblAFjExGjNrhgIICs0eIMGwzFp/gvbXOdLocSi3CVx+O0seEr0E+5yqR4cd6K4j+pmM0Z3STdKdDxM7rKBEYULw68p0jFoBbXfbLOEwndQ/+aJ+af3z2/MyJ3nbfQUHOa5eiqiV/Cge4boEBAoGANVPTSEMT0MLpP/Oj6+U2lOESEFe4V/qpymdgKUOLzaSOa82WKQGJQixKn0mcgkAoB3bvRSsOCTDp5OIoYWx9V0u+a9d9vX0tj/RcEF0jsUSm+RR9Qbrg2Wm87f1YSLVA55mOpFkD/MOFfxguqIpANdd3OQHz6UiPsMo0RTe/rcECgYEAhMX5DsSXM4WyAHyYTQW3NVH1ehFcf6yp4uCSj+hq3SMezKYS/dRNSA912XM3rJakrjaVNzRTnSuwfajIYi68A1TjS/rj6OTAx7V5HEeYS2U1VLR5Ai7VKHc85Kye4LuF5hIp35/vYo3qHZLZFsM7eDP9SGVG/zUje6Ce1QTFrp8=
   decrypt-key: fhixMEfC0kpw9drqNJiMfQ==