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

Dev

See merge request quanshu/mp-server!753

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

@@ -48,6 +48,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
@@ -162,11 +163,12 @@ public class UserController extends BaseApiController {
       signCheckPass = AlipaySignature.rsaCheck(signContent, sign, signVeriKey, charset, signType);
     } catch (AlipayApiException e) {
       // 验签异常, 日志
+      LogUtil.error(logger,"验签异常:{0}", e.getMessage());
     }
     if(!signCheckPass) {
       // 验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
       LogUtil.warn(logger, "验签失败");
-      AjaxResult.error("验签失败");
+      return AjaxResult.error("验签失败");
     }
 
     //3. 解密
@@ -177,7 +179,7 @@ public class UserController extends BaseApiController {
       } catch (AlipayApiException e) {
         //解密异常, 记录日志
         LogUtil.warn(logger, "解密异常");
-        AjaxResult.error("解密异常");
+        return AjaxResult.error("解密异常");
       }
     } else {
       plainData = content;

mp-service/src/main/java/com/qs/mp/common/domain/vo/AliPhoneDecryptVO.java

@@ -17,6 +17,6 @@ public class AliPhoneDecryptVO {
     private String subMsg;
 
     public boolean isSuccess() {
-        return "10000".equals(code) && NumberUtils.isDigits(mobile);
+        return NumberUtils.isDigits(mobile);
     }
 }