Merge branch 'dev-sweet' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev-sweet

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -216,7 +216,7 @@ public class AdamLoginController {
             wechatUnionid = wxMaJscode2SessionResult.getUnionid();
         } catch (WxErrorException e) {
             log.error("login by wechat applet exception:[anum:{},code:{},encryptedData:{},iv:{}], errmsg:{}", anum, code, encryptedData, iv, e.getMessage());
-            return ResponseDto.failure("微信小程序解码信息失败");
+            return ResponseDto.failure(ErrorMapping.get("10001"));
         }
 
         if (StringUtils.isEmpty(wechatMobile)) return ResponseDto.failure(ErrorMapping.get("10005"));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -4,7 +4,8 @@
 # ------------------------ 4开头错误码作系统保留
 
 10000=请求频繁，稍后再试
-10001=
+10001=授权失败
+10001=授权失败
 10002=验证码发送失败
 10003=发送过于频繁，请稍后再试
 10004=验证码错误，请重新输入