联合丽格

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

@@ -143,22 +143,24 @@ public class WeChatService {
         byte[] keyByte = Base64.decodeBase64(key);
         // 偏移量
         byte[] ivByte = Base64.decodeBase64(iv);
-        try {
+//        try {
             Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
             SecretKeySpec spec = new SecretKeySpec(keyByte, "AES");
             AlgorithmParameters parameters = AlgorithmParameters.getInstance("AES");
+
             parameters.init(new IvParameterSpec(ivByte));
             // 初始化
             cipher.init(Cipher.DECRYPT_MODE, spec, parameters);
             byte[] resultByte = cipher.doFinal(dataByte);
+
             if (null != resultByte && resultByte.length > 0) {
                 return new String(resultByte, encodingFormat);
             }
             return null;
-        } catch (Exception e) {
+        /*} catch (Exception e) {
             e.printStackTrace();
-        }
-        return null;
+        }*/
+//        return null;
     }
 
     /**
@@ -204,6 +206,8 @@ public class WeChatService {
         // 发送post请求读取调用微信接口获取openid用户唯一标识
         String infos;
         try {
+            log.info("requestUrl--------------------------"+requestUrl);
+            log.info("requestUrlParam--------------------------"+requestUrlParam);
             infos = RequestUtil.sendPost(requestUrl, requestUrlParam);
         } catch (Exception e) {
             return ResponseJson.error("服务器内部异常", returnMap);

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

@@ -217,15 +217,6 @@ public class LoginServiceImpl implements LoginService {
             }
             // 如果前端传入unionId，则存入返回前端
             baseUser.setUnionId(unionId);
-            // 不是采美组织下
-            if (0 != baseUser.getOrganizeId()) {
-                if (1 == baseUser.getClubStatus()) {
-                    return ResponseJson.error(-1, "账号待审核，请耐心等待审核结果", null);
-                }
-                if (92 == baseUser.getClubStatus()) {
-                    return ResponseJson.error(-3, "账号审核未通过，请重新提交资料", null);
-                }
-            }
             // 比对密码
             String md5Password = Md5Util.md5(password);
             String dbPassword = baseUser.getPassword();
@@ -481,6 +472,7 @@ public class LoginServiceImpl implements LoginService {
         }
         // 小程序微信授权获取登录信息
         ResponseJson<Map<String, Object>> appletsInfo = weChatService.getInfoMapByApplets(code, headers, 3);
+        log.info("appletsInfo***"+appletsInfo);
         if (appletsInfo.getCode() == -1) {
             return ResponseJson.error(appletsInfo.getMsg(), null);
         }