Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git into dev

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

@@ -60,13 +60,13 @@ public class ChannelOrderMgrController extends BaseApiController {
 
   @Autowired
   private IChannelOrderDetailService channelOrderDetailService;
-  
-  @Autowired 
+
+  @Autowired
   private IChannelService channelService;
-  
-  @Autowired 
+
+  @Autowired
   private IDeliveryCompanyService deliveryCompanyService;
-  
+
   @Autowired
   private ITicketPackageService ticketPackageService;
 
@@ -112,7 +112,7 @@ public class ChannelOrderMgrController extends BaseApiController {
     	return error(ErrorCodeEnum.ERROR_CODE_1001);
     }
     ChannelOrderInfoVO channelOrderInfoVO = mapperFacade.map(channelOrder, ChannelOrderInfoVO.class);
-    
+
     if(null != channelOrderInfoVO && null != channelOrderInfoVO.getChannelId()) {
     	Channel channel = channelService.getById(channelOrderInfoVO.getChannelId());
     	channelOrderInfoVO.setChannel(channel);
@@ -123,7 +123,7 @@ public class ChannelOrderMgrController extends BaseApiController {
     }
     List<ChannelOrderItem> itemList = channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
 	          .eq(ChannelOrderItem::getOrderId, channelOrderInfoVO.getOrderId()));
-	
+
 	List<ChannelOrderItemVO> itemVOList = mapperFacade.mapAsList(itemList, ChannelOrderItemVO.class);
 	if(null != itemVOList && itemVOList.size() > 0) {
 		for(ChannelOrderItemVO itemVO : itemVOList) {
@@ -140,7 +140,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 	channelOrderInfoVO.setItems(itemVOList);
     return AjaxResult.success(channelOrderInfoVO);
   }
-  
+
 
   /**
    * 订单发货
@@ -153,13 +153,13 @@ public class ChannelOrderMgrController extends BaseApiController {
 		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		
+
 		ChannelOrder order  = channelOrderService.getById(shipParam.getOrderId());
-		if(null == order || StringUtils.isBlank(order.getOrderId()) 
+		if(null == order || StringUtils.isBlank(order.getOrderId())
 				|| null == order.getChannelId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		
+
 		if(null != shipParam && null != shipParam.getPkgIds()
 				&& shipParam.getPkgIds().size() > 0) {
 			ChannelOrder channelOrder = new ChannelOrder();
@@ -173,7 +173,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 		}
 		return AjaxResult.error("发货失败");
   }
-  
+
 	@PostMapping("/item/list")
 	@ApiOperation(value = "获取经销商订单盲票组列表", notes = "")
 	public AjaxResult list(@RequestBody ChannelOrder order) {

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

@@ -1,6 +1,7 @@
 package com.qs.mp.web.controller.api.common;
 
 import cn.jsms.api.ValidSMSResult;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -31,10 +32,14 @@ import io.swagger.annotations.Api;
 import java.io.File;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,6 +49,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
 
 /**
  * @auther duota
@@ -97,6 +104,10 @@ public class UserController extends BaseApiController {
   @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";
+
 
   @RequestMapping(value = "/user/wxauth", method = RequestMethod.POST)
   @ResponseBody
@@ -108,7 +119,7 @@ public class UserController extends BaseApiController {
       appSecret = userAppSecret;
     }
     //调用微信后台接口获取openId
-    String res = wxLoginCheck(wxLoginParams, appId, appSecret);
+    String res = wxLoginCheck(wxLoginParams.getCode(), appId, appSecret);
     JSONObject jsonObject = JSONObject.parseObject(res);
     String openId = jsonObject.getString("openid");
     String sessionKey = jsonObject.getString("session_key");
@@ -169,23 +180,60 @@ public class UserController extends BaseApiController {
   public AjaxResult wxauthMobile(@RequestBody WxLoginParams wxLoginParams) {
     String appId = userAppId;
     String appSecret = userAppSecret;
-    if (UserIdentityEnum.isChannel(wxLoginParams.getIdentity())) {
+    /*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("手机号获取失败");
+      }
     }
-    //调用微信后台接口获取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("手机号获取失败");
-    }
-    JSONObject phoneInfo = jsonObject.getJSONObject("phone_info");
     String phoneNumber = phoneInfo.getString("phoneNumber");
 
     if (StringUtils.isBlank(phoneNumber)) {
-      LogUtil.error(logger, "微信手机号不存在:" + res);
+      LogUtil.error(logger, "微信手机号不存在:" + phoneInfo);
       return error("手机号获取失败");
     }
     AjaxResult ajax = AjaxResult.success();
@@ -265,8 +313,8 @@ public class UserController extends BaseApiController {
    * @param
    * @return
    */
-  private String wxLoginCheck(WxLoginParams params, String appId, String appSecret) {
-    String param = "appid=" + appId + "&secret=" + appSecret + "&js_code=" + params.getCode()
+  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;
@@ -349,4 +397,46 @@ public class UserController extends BaseApiController {
     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;
+    }
+  }
+
+  public static void main(String[] args) {
+    UserController userController = new UserController();
+    BASE64Encoder encoder = new BASE64Encoder();
+    String sessionKey = encoder.encode("f7a104e09d6c2e55445be2a45c4ab551".getBytes(
+        StandardCharsets.UTF_8));
+    System.out.println(sessionKey);
+    System.out.println(userController.weixinDecrypt("1U2iT7fucPip+hYDO+fcksOJCyFMIzxe5qXKGPbLZVfz2kwlKkbRDbfjECRHtjg0yFiTXpHuvR9gBShL9Id7p8KO1w2Y2vhgj5idU/VYSOhF7IRyXEObDApMCs4JSWuS997hIl/JMX3N43IHC99Ak5aeTuk4UHtvHeJsTYfvNKrp7c4fDt0n9yX9MJijsoOjFQ/TFh0jJuWKpzS2QwhdGg==", sessionKey, "C9Kc2ibw/cy7U0Vv6vneOg=="));
+  }
+
 }

mp-service/src/main/java/com/qs/mp/system/domain/vo/WxLoginParams.java

@@ -12,9 +12,13 @@ public class WxLoginParams {
     private String code;   //微信返回code，用于服务端换取鉴权信息
     private String nickName;
     private String avatarUrl;
+    /** 微信手机号授权信息，兼容基础类库2.22.1以下版本 */
+    private String encryptedData; // 包括敏感数据在内的完整用户信息的加密数据
+    private String iv; // 加密算法的初始向量
+    private String loginCode; // 调用wx.login获取的code
     /**
      * 登录身份
      */
-    private int identity = 2;
+    private int identity;
 
 }