From 8188fe0d456dc0ac49adc68cef756f60b473d4b6 Mon Sep 17 00:00:00 2001 From: Devil Date: Thu, 7 Jan 2021 12:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=BB=91=E5=AE=9A=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E6=98=B5=E7=A7=B0=E4=B8=A2=E5=A4=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/User.php | 10 +++++----- application/service/UserService.php | 2 +- changelog.txt | 1 + sourcecode/weixin/default/app.js | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 3cd7cb2e0..f25257d4e 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -142,7 +142,7 @@ class User extends Common $user = UserService::AppUserInfoHandle(null, 'alipay_openid', $this->data_post['openid']); if(empty($user)) { - $this->data_post['nick_name'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : ''; + $this->data_post['nickname'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : ''; $this->data_post['gender'] = empty($this->data_post['gender']) ? 0 : (($this->data_post['gender'] == 'f') ? 1 : 2); return UserService::AuthUserProgram($this->data_post, 'alipay_openid'); } else { @@ -220,7 +220,7 @@ class User extends Common $result = (new \base\Wechat(MyC('common_app_mini_weixin_appid'), MyC('common_app_mini_weixin_appsecret')))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']); if($result['status'] == 0 && !empty($result['data'])) { - $result['nick_name'] = isset($result['data']['nickName']) ? $result['data']['nickName'] : ''; + $result['nickname'] = isset($result['data']['nickName']) ? $result['data']['nickName'] : ''; $result['avatar'] = isset($result['data']['avatarUrl']) ? $result['data']['avatarUrl'] : ''; $result['gender'] = empty($result['data']['gender']) ? 0 : (($result['data']['gender'] == 2) ? 1 : 2); $result['weixin_unionid'] = isset($result['data']['unionId']) ? $result['data']['unionId'] : ''; @@ -313,7 +313,7 @@ class User extends Common if($result['status'] == 0 && !empty($result['data'])) { - $result['nick_name'] = isset($result['data']['nickname']) ? $result['data']['nickname'] : ''; + $result['nickname'] = isset($result['data']['nickname']) ? $result['data']['nickname'] : ''; $result['avatar'] = isset($result['data']['headimgurl']) ? $result['data']['headimgurl'] : ''; $result['gender'] = empty($result['data']['sex']) ? 0 : (($result['data']['sex'] == 2) ? 1 : 2); $result['openid'] = $result['data']['openid']; @@ -395,7 +395,7 @@ class User extends Common $result = json_decode(htmlspecialchars_decode($this->data_post['userinfo']), true); if(is_array($result)) { - $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : ''; + $result['nickname'] = isset($result['nickName']) ? $result['nickName'] : ''; $result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : ''; $result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2); $result['openid'] = $this->data_post['openid']; @@ -483,7 +483,7 @@ class User extends Common $result = (new \base\QQ(MyC('common_app_mini_qq_appid'), MyC('common_app_mini_qq_appsecret')))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']); if(is_array($result)) { - $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : ''; + $result['nickname'] = isset($result['nickName']) ? $result['nickName'] : ''; $result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : ''; $result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2); $result['qq_unionid'] = isset($result['unionId']) ? $result['unionId'] : ''; diff --git a/application/service/UserService.php b/application/service/UserService.php index 21ec2780f..36315698d 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -1391,7 +1391,7 @@ class UserService // 用户信息 $data = [ $field => $params['openid'], - 'nickname' => empty($params['nick_name']) ? '' : $params['nick_name'], + 'nickname' => empty($params['nickname']) ? '' : $params['nickname'], 'avatar' => empty($params['avatar']) ? '' : $params['avatar'], 'gender' => empty($params['gender']) ? 0 : intval($params['gender']), 'province' => empty($params['province']) ? '' : $params['province'], diff --git a/changelog.txt b/changelog.txt index b78d38cee..9ab945b37 100755 --- a/changelog.txt +++ b/changelog.txt @@ -20,6 +20,7 @@ web端 6. 动态数据列表组件条件新增气泡式弹出层、模块引入参数优化 7. 后台插件管理新增排序功能、自定义显示顺序+插件调用顺序 8. 公共接口新增插件配置返回 + 9. API接口与插件解耦、扩展性更上一层楼 小程序 diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js index f185dd768..78df5902f 100755 --- a/sourcecode/weixin/default/app.js +++ b/sourcecode/weixin/default/app.js @@ -74,7 +74,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - // request_url: 'https://dev.shopxo.net/', + request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", -- GitLab