bugfix

src/main/java/com/caimei365/user/components/RedisService.java

@@ -1,6 +1,7 @@
 package com.caimei365.user.components;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
@@ -63,7 +64,7 @@ public class RedisService {
      * @return boolean
      */
 	public boolean exists(String key) {
-		return key.isEmpty() ? false : redisTemplate.hasKey(key);
+		return StringUtils.isBlank(key) ? false : redisTemplate.hasKey(key);
 	}
 
     /**

src/main/java/com/caimei365/user/components/WeChatService.java

@@ -144,15 +144,13 @@ public class WeChatService {
      * 小程序微信授权登录,获取openid
      *
      * @param code              微信凭证
-     * @param serverWebExchange ServerWebExchange
+     * @param headers           HttpHeaders
      * @return HashMap
      */
-    public ResponseJson<Map<String, Object>> getInfoMapByApplets(String code, ServerWebExchange serverWebExchange) {
+    public ResponseJson<Map<String, Object>> getInfoMapByApplets(String code, HttpHeaders headers) {
         log.info("Start get SessionKey");
         Map<String, Object> returnMap = new HashMap<>(4);
         // 获取当前微信小程序的环境
-        ServerHttpRequest request = serverWebExchange.getRequest();
-        HttpHeaders headers = request.getHeaders();
         String referer = headers.getFirst("Referer");
         log.info("referer-is----:" + referer);
         returnMap.put("referer", referer);

src/main/java/com/caimei365/user/mapper/BaseMapper.java

@@ -1,6 +1,7 @@
 package com.caimei365.user.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * Description
@@ -16,19 +17,19 @@ public interface BaseMapper {
      * @param email 邮箱
      * @return userId
      */
-    Integer getUserIdByEmail(String email);
+    Integer getUserIdByEmail(@Param("email") String email);
     /**
      * 根据手机号获取用户Id
      *
      * @param mobile 手机号
      * @return 用户Id
      */
-    Integer getUserIdByMobile(String mobile);
+    Integer getUserIdByMobile(@Param("mobile") String mobile);
     /**
      * 根据手机号获取运营人员Id
      *
      * @param mobile 手机号
      * @return userId
      */
-    Integer getOperationIdByMobile(String mobile);
+    Integer getOperationIdByMobile(@Param("mobile") String mobile);
 }

src/main/java/com/caimei365/user/mapper/LoginMapper.java

@@ -1,7 +1,6 @@
 package com.caimei365.user.mapper;
 
 import com.caimei365.user.model.po.OperationPo;
-import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.model.vo.UserLoginVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,7 +19,7 @@ public interface LoginMapper {
      * @param userId 手机号
      * @return baseuser
      */
-    UserLoginVo getLoginUserByUserId(Integer userId);
+    UserLoginVo getLoginUserByUserId(@Param("userId") Integer userId);
     /**
      * 根据手机号或邮箱获取用户
      *
@@ -28,11 +27,6 @@ public interface LoginMapper {
      * @return BaseUser
      */
     UserLoginVo getLoginUserByMobileOrEmail(@Param("mobileOrEmail") String mobileOrEmail);
-    /**
-     * 根据用户Id查找用户
-     * @return
-     */
-    UserPo getUserByUserId(Integer userId);
     /**
      * 根据手机号获取运营人员
      *
@@ -46,7 +40,7 @@ public interface LoginMapper {
      * @param openId openId
      * @return BaseUser
      */
-    UserLoginVo getServiceProviderByOpenId(String openId);
+    UserLoginVo getServiceProviderByOpenId(@Param("openId") String openId);
 
     /**
      * 根据用户ID更新协销unionId
@@ -81,17 +75,13 @@ public interface LoginMapper {
      * @param unionId
      */
     void updateOperationUnionId(@Param("userId") Integer userId, @Param("unionId") String unionId);
-
-
-
-
     /**
      * 根据openId获取用户Id
      * @param openId
      * @param source
      * @return
      */
-    Integer getUserIdByOpenId(String openId, String source);
+    Integer getUserIdByOpenId(@Param("openId") String openId, @Param("source") String source);
 
 
 }

src/main/java/com/caimei365/user/mapper/RegisterMapper.java

@@ -5,6 +5,7 @@ import com.caimei365.user.model.po.OperationPo;
 import com.caimei365.user.model.po.ShopPo;
 import com.caimei365.user.model.po.UserPo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * Description
@@ -50,14 +51,14 @@ public interface RegisterMapper {
      * @param userId
      * @param clubId
      */
-    void updateUserClubId(Integer userId, Integer clubId);
+    void updateUserClubId(@Param("userId") Integer userId, @Param("clubId")  Integer clubId);
     /**
      * 根据用户ID更新供应商ID
      *
      * @param userId
      * @param shopId
      */
-    void updateUserShopId(Integer userId, Integer shopId);
+    void updateUserShopId(@Param("userId") Integer userId, @Param("shopId")  Integer shopId);
     /**
      * 升级机构 更新user
      * @param user

src/main/java/com/caimei365/user/service/LoginService.java

@@ -1,9 +1,9 @@
 package com.caimei365.user.service;
 
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.model.vo.UserLoginVo;
-import org.springframework.web.server.ServerWebExchange;
+import org.springframework.http.HttpHeaders;
+
 
 /**
  * Description
@@ -28,10 +28,9 @@ public interface LoginService {
      * @param code          微信授权code
      * @param encryptedData 微信加密数据
      * @param iv            加密算法的初始向量
-     * @param serverWebExchange ServerWebExchange
      * @return BaseUser
      */
-    ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange);
+    ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, HttpHeaders headers);
 
     /**
      * 微信公众号授权链接(www)
@@ -50,7 +49,7 @@ public interface LoginService {
      * @param state 安全认证
      * @param mode  1:静默授权,2:用户手动授权
      */
-    ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange);
+    ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, HttpHeaders headers);
 
     /**
      * 微信扫码登录
@@ -58,7 +57,7 @@ public interface LoginService {
      * @param code      微信code
      * @param state     安全认证
      */
-    void qrCodeAuthorization(String code, String state, ServerWebExchange serverWebExchange);
+    void qrCodeAuthorization(String code, String state);
 
     /**
      * netty长连接验证登录

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -43,7 +43,7 @@ public class BaseServiceImpl implements BaseService {
         try {
             ImageCaptchaUtil.Captcha captcha = null;
             String captchaKey = "";
-            while (captchaKey.isEmpty()) {
+            while (StringUtils.isBlank(captchaKey)) {
                 captcha = ImageCaptchaUtil.getCaptcha(200, 80, 4);
                 captchaKey = ImageCaptchaUtil.getCaptchaKey(captcha.getMd5Code(), platformType);
                 boolean exists = redisService.exists(captchaKey);
@@ -72,12 +72,12 @@ public class BaseServiceImpl implements BaseService {
      */
     @Override
     public Boolean checkCaptchaImage(String token, String imgCode, Integer platformType) {
-        if (token.isEmpty() || imgCode.isEmpty()){
+        if (StringUtils.isBlank(token) || StringUtils.isBlank(imgCode)){
             return false;
         }
         String captchaKey = ImageCaptchaUtil.getCaptchaKey(token, platformType);
         String captchaCode = (String) redisService.get(captchaKey);
-        if (!captchaCode.isEmpty() && StringUtils.equalsIgnoreCase(imgCode, captchaCode)) {
+        if (StringUtils.isNotBlank(captchaCode) && StringUtils.equalsIgnoreCase(imgCode, captchaCode)) {
             // 校验成功
             return true;
         }

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.caimei365.user.components.WeChatService;
 import com.caimei365.user.mapper.LoginMapper;
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.po.OperationPo;
-import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import com.caimei365.user.components.RedisService;
@@ -13,8 +11,8 @@ import com.caimei365.user.utils.JwtUtil;
 import com.caimei365.user.utils.Md5Util;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
-import org.springframework.web.server.ServerWebExchange;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -47,10 +45,10 @@ public class LoginServiceImpl implements LoginService {
      */
     @Override
     public ResponseJson<UserLoginVo> passwordLogin(String mobileOrEmail, String password) {
-        if (mobileOrEmail.isEmpty()) {
+        if (StringUtils.isBlank(mobileOrEmail)) {
             return ResponseJson.error("请填写账户名", null);
         }
-        if (password.isEmpty()) {
+        if (StringUtils.isBlank(password)) {
             return ResponseJson.error("请填写密码", null);
         }
         //处理比对密码
@@ -77,15 +75,15 @@ public class LoginServiceImpl implements LoginService {
      * @param code              微信授权code
      * @param encryptedData     微信加密数据
      * @param iv                加密算法的初始向量
-     * @param serverWebExchange ServerWebExchange
+     * @param headers           HttpHeaders
      */
     @Override
-    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, ServerWebExchange serverWebExchange) {
+    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, HttpHeaders headers) {
         if (StringUtils.isBlank(code)) {
             return ResponseJson.error("没有获取到微信授权code", null);
         }
         // 小程序微信授权获取登录信息
-        ResponseJson<Map<String, Object>> appletsInfo = weChatService.getInfoMapByApplets(code, serverWebExchange);
+        ResponseJson<Map<String, Object>> appletsInfo = weChatService.getInfoMapByApplets(code, headers);
         if (appletsInfo.getCode() == -1) {
             return ResponseJson.error(appletsInfo.getMsg(), null);
         }
@@ -146,10 +144,10 @@ public class LoginServiceImpl implements LoginService {
      * @param code              微信code
      * @param state             安全认证
      * @param mode              1:静默授权,2:用户手动授权
-     * @param serverWebExchange ServerWebExchange
+     * @param headers           HttpHeaders
      */
     @Override
-    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, ServerWebExchange serverWebExchange) {
+    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, HttpHeaders headers) {
         if (StringUtils.isBlank(code) || StringUtils.isBlank(state)) {
             return ResponseJson.error("参数异常", null);
         }
@@ -254,7 +252,7 @@ public class LoginServiceImpl implements LoginService {
      * @param state     安全认证
      */
     @Override
-    public void qrCodeAuthorization(String code, String state, ServerWebExchange serverWebExchange) {
+    public void qrCodeAuthorization(String code, String state) {
         Map<String, Object> map = new HashMap<>();
         // 简单验证，防止csrf攻击（跨站请求伪造攻击）
         String stateCache = (String) redisService.get("state:" + state);

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -272,8 +272,9 @@ public class RegisterServiceImpl implements RegisterService {
         if (null != userIdByEmail && userIdByEmail > 0 ) {
             return ResponseJson.error("该邮箱已被使用", null);
         }
-        // 获取用户数据 user
-        UserPo user = loginMapper.getUserByUserId(upgradeDto.getUserId());
+        // 更新用户数据 user
+        UserPo user = new UserPo();
+        user.setUserId(upgradeDto.getUserId());
         // 客户IP
         user.setRegisterIp(ip);
         // 联系邮箱

src/main/resources/application.yml

@@ -43,6 +43,7 @@ eureka:
 logging:
   level:
     root: info
+    com.caimei365.user.mapper: debug
 
 # 微信配置
 wx:

src/main/resources/mapper/BaseMapper.xml

@@ -7,7 +7,7 @@
         limit 1
     </select>
     <select id="getUserIdByMobile" resultType="java.lang.Integer">
-        select userID from user u
+        select u.userID from user u
         left join cm_mall_operation_user cu on cu.userID = u.userID
         where (u.bindMobile = #{mobile}
                 or (cu.mobile = #{mobile} and cu.delFlag != 1)

src/main/resources/mapper/LoginMapper.xml

@@ -36,13 +36,6 @@
         ) and u.userIdentity in (1,2,3,4)
         limit 1
     </select>
-    <select id="getUserByUserId" resultType="com.caimei365.user.model.po.UserPo">
-
-    </select>
-
-
-
-
     <select id="getOperationByMobile" resultType="com.caimei365.user.model.po.OperationPo">
         select o.userID as userId,
                o.mobile as mobile,