Merge branch 'master-auto-pay' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -91,8 +91,9 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
         }
         String result = thirdFeign.getAliPayUserInfo(code).getData();
         if (StringUtils.isNotBlank(result)) {
+            log.info("【支付宝】用户授权获取用户token， {}", result);
             JSONObject jsonObject = JSONObject.parseObject(result);
-            if (jsonObject != null && jsonObject.getString("code").equals("10000")) {
+            if (jsonObject != null && jsonObject.getString("code") != null && jsonObject.getString("code").equals("10000")) {
                 String account = jsonObject.getString("userId");
                 if (account != null) {
                     appUserAlipay.setTxAlipay(account);