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

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

@@ -93,14 +93,15 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
         if (StringUtils.isNotBlank(result)) {
             log.info("【支付宝】用户授权获取用户token， {}", result);
             JSONObject jsonObject = JSONObject.parseObject(result);
-            if (jsonObject.getJSONObject("error_response") == null) {
-                String account = jsonObject.getString("userId");
+            if (jsonObject.getJSONObject("error_response") == null && jsonObject.getJSONObject("alipay_user_info_share_response") != null) {
+                JSONObject responseObject = jsonObject.getJSONObject("alipay_user_info_share_response");
+                String account = responseObject.getString("user_id");
                 if (account != null) {
                     appUserAlipay.setTxAlipay(account);
                     appUserAlipay.setCrtTime(new Date().getTime());
                     appUserAlipay.setIsDel(0);
                 }
-                String nickname = jsonObject.getString("nickName");
+                String nickname = responseObject.getString("nick_name");
                 if (nickname != null) {
                     appUserAlipay.setNickname(nickname);
                 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UserInfoController.java

@@ -77,7 +77,6 @@ public class UserInfoController {
         return ObjectRestResponse.createDefaultFail();
     }
 
-
     @GetMapping("/app/unauth/getParam")
     public ObjectRestResponse<String> getParam(String apiName, String appName) {
             return ObjectRestResponse.succ(orderPayBiz.generateAliPayInfo(apiName, appName));