diff --git a/app/admin/form/Appcenternav.php b/app/admin/form/Appcenternav.php index ff11f5a50..9cf5d1fb0 100644 --- a/app/admin/form/Appcenternav.php +++ b/app/admin/form/Appcenternav.php @@ -117,6 +117,16 @@ class AppCenterNav 'where_type' => 'like', ], ], + [ + 'label' => $lang['desc'], + 'view_type' => 'field', + 'view_key' => 'desc', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => 'like', + ], + ], [ 'label' => $lang['is_enable'], 'view_type' => 'status', diff --git a/app/admin/form/Brand.php b/app/admin/form/Brand.php index 753b175ff..44098378e 100644 --- a/app/admin/form/Brand.php +++ b/app/admin/form/Brand.php @@ -46,7 +46,6 @@ class Brand 'status_field' => 'is_enable', 'is_search' => 1, 'is_delete' => 1, - 'delete_url' => MyUrl('admin/brand/delete'), 'delete_key' => 'ids', 'detail_title' => MyLang('form_table_base_detail_title'), 'is_middle' => 0, diff --git a/app/admin/form/Order.php b/app/admin/form/Order.php index 7008bad7c..6fc1a4a5d 100644 --- a/app/admin/form/Order.php +++ b/app/admin/form/Order.php @@ -46,7 +46,6 @@ class Order 'base' => [ 'key_field' => 'id', 'is_search' => 1, - 'search_url' => MyUrl('admin/order/index'), 'detail_title' => MyLang('form_table_base_detail_title'), 'is_middle' => 0, ], diff --git a/app/admin/form/User.php b/app/admin/form/User.php index 9184d5fae..ba63ab621 100644 --- a/app/admin/form/User.php +++ b/app/admin/form/User.php @@ -45,6 +45,7 @@ class User 'is_delete' => 1, 'is_middle' => 0, 'is_data_export_excel' => 1, + 'detail_title' => MyLang('form_table_base_detail_title'), ], // 表单配置 'form' => [ @@ -81,13 +82,33 @@ class User [ 'label' => $lang['system_type'], 'view_type' => 'field', - 'view_key' => 'system_type', - 'is_sort' => 1, + 'view_key' => 'system_type_text', + 'text_truncate' => 2, + 'is_popover' => 1, 'search_config' => [ - 'form_type' => 'select', - 'where_type' => 'in', - 'data' => $this->SystemTypeList(), - 'is_multiple' => 1, + 'form_type' => 'select', + 'form_name' => 'id', + 'where_type_custom' => 'in', + 'where_value_custom' => 'WhereValueSystemType', + 'data' => $this->SystemTypeList(), + 'is_multiple' => 1, + ], + ], + [ + 'label' => $lang['platform'], + 'view_type' => 'field', + 'view_key' => 'platform_text', + 'text_truncate' => 2, + 'is_popover' => 1, + 'search_config' => [ + 'form_type' => 'select', + 'form_name' => 'id', + 'where_type_custom' => 'in', + 'where_value_custom' => 'WhereValuePlatform', + 'data' => MyLang('common_platform_type'), + 'data_key' => 'value', + 'data_name' => 'name', + 'is_multiple' => 1, ], ], [ @@ -288,6 +309,52 @@ class User ]; } + /** + * 系统类型条件处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-08 + * @desc description + * @param [string] $value [条件值] + * @param [array] $params [输入参数] + */ + public function WhereValueSystemType($value, $params = []) + { + if(!empty($value)) + { + // 获取用户 id + $ids = Db::name('UserPlatform')->where('system_type', 'in', $value)->column('user_id'); + + // 避免空条件造成无效的错觉 + return empty($ids) ? [0] : $ids; + } + return $value; + } + + /** + * 用户平台条件处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-08 + * @desc description + * @param [string] $value [条件值] + * @param [array] $params [输入参数] + */ + public function WhereValuePlatform($value, $params = []) + { + if(!empty($value)) + { + // 获取用户 id + $ids = Db::name('UserPlatform')->where('platform', 'in', $value)->column('user_id'); + + // 避免空条件造成无效的错觉 + return empty($ids) ? [0] : $ids; + } + return $value; + } + /** * 用户信息条件处理 * @author Devil @@ -321,7 +388,7 @@ class User */ public function SystemTypeList() { - return Db::name('User')->group('system_type')->column('system_type', 'system_type'); + return Db::name('UserPlatform')->group('system_type')->column('system_type', 'system_type'); } } ?> \ No newline at end of file diff --git a/app/admin/lang/en.php b/app/admin/lang/en.php index 294a9c32d..de4ffd88d 100644 --- a/app/admin/lang/en.php +++ b/app/admin/lang/en.php @@ -87,6 +87,7 @@ return [ 'id' => 'User ID', 'number_code' => 'Number Code', 'system_type' => 'System Type', + 'platform' => 'Platform', 'avatar' => 'Avatar', 'username' => 'Username', 'nickname' => 'Nickname', @@ -914,6 +915,7 @@ return [ 'images_url' => 'Icon', 'event_type' => 'Event Tyoe', 'event_value' => 'Event Value', + 'desc' => 'Desc', 'is_enable' => 'Enable or not', 'is_need_login' => 'Whether to log in', 'sort' => 'Sort', diff --git a/app/admin/lang/zh.php b/app/admin/lang/zh.php index d10c35484..c14d53ea1 100755 --- a/app/admin/lang/zh.php +++ b/app/admin/lang/zh.php @@ -87,6 +87,7 @@ return [ 'id' => '用户ID', 'number_code' => '会员码', 'system_type' => '系统类型', + 'platform' => '所属平台', 'avatar' => '头像', 'username' => '用户名', 'nickname' => '昵称', @@ -899,6 +900,7 @@ return [ 'images_url' => '导航图标', 'event_type' => '事件类型', 'event_value' => '事件值', + 'desc' => '描述', 'is_enable' => '是否启用', 'is_need_login' => '是否需登录', 'sort' => '排序', diff --git a/app/admin/view/default/apphomenav/module/images.html b/app/admin/view/default/apphomenav/module/images.html index 8845c44b5..f6acd31b8 100644 --- a/app/admin/view/default/apphomenav/module/images.html +++ b/app/admin/view/default/apphomenav/module/images.html @@ -1,8 +1,8 @@ {{if !empty($module_data) and !empty($module_data['images_url'])}} -
- - +
+ +
{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/quicknav/module/images.html b/app/admin/view/default/quicknav/module/images.html index 8845c44b5..f6acd31b8 100644 --- a/app/admin/view/default/quicknav/module/images.html +++ b/app/admin/view/default/quicknav/module/images.html @@ -1,8 +1,8 @@ {{if !empty($module_data) and !empty($module_data['images_url'])}} -
- - +
+ +
{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/user/detail.html b/app/admin/view/default/user/detail.html index 06eeee457..d11086af9 100644 --- a/app/admin/view/default/user/detail.html +++ b/app/admin/view/default/user/detail.html @@ -1,2 +1,57 @@ -{{extend name="public/module/detail" /}} \ No newline at end of file +{{extend name="public/module/detail" /}} + + +{{block name="detail_data"}} + + {__block__} + + +
+
{{:MyLang('common_service.user.detail_platform_title')}}
+
+ {{if !empty($data['user_platform_data'])}} +
+ + + + + + + + + + + + + + + + + + + {{foreach $data.user_platform_data as $v}} + + + + + + + + + + + + + + + {{/foreach}} + +
{{:MyLang('common_service.user.detail_system_type')}}{{:MyLang('common_service.user.detail_platform')}}{{:MyLang('common_service.user.detail_alipay_openid')}}{{:MyLang('common_service.user.detail_baidu_openid')}}{{:MyLang('common_service.user.detail_toutiao_openid')}}{{:MyLang('common_service.user.detail_toutiao_unionid')}}{{:MyLang('common_service.user.detail_qq_openid')}}{{:MyLang('common_service.user.detail_qq_unionid')}}{{:MyLang('common_service.user.detail_weixin_openid')}}{{:MyLang('common_service.user.detail_weixin_unionid')}}{{:MyLang('common_service.user.detail_weixin_web_openid')}}{{:MyLang('common_service.user.detail_kuaishou_openid')}}
{{$v.system_type}}{{$v.platform_name}}{{$v.alipay_openid}}{{$v.baidu_openid}}{{$v.toutiao_openid}}{{$v.toutiao_unionid}}{{$v.qq_openid}}{{$v.qq_unionid}}{{$v.weixin_openid}}{{$v.weixin_unionid}}{{$v.weixin_web_openid}}{{$v.kuaishou_openid}}
+
+ {{else /}} + {{include file="public/not_data" /}} + {{/if}} +
+
+{{/block}} \ No newline at end of file diff --git a/app/admin/view/default/user/save_info.html b/app/admin/view/default/user/save_info.html index 75f391fac..07e1b5362 100755 --- a/app/admin/view/default/user/save_info.html +++ b/app/admin/view/default/user/save_info.html @@ -10,13 +10,7 @@ {{:MyLang('retreat_title')}}
-
-
- - -
-
-
+
@@ -32,6 +26,9 @@
+
+ {{include file="lib/gender" /}} +
@@ -47,97 +44,27 @@
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
+
-
+
-
+
-
+
@@ -187,8 +114,6 @@
- {{include file="lib/gender" /}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
diff --git a/app/api/controller/Common.php b/app/api/controller/Common.php index 571ffac8e..a07074114 100755 --- a/app/api/controller/Common.php +++ b/app/api/controller/Common.php @@ -89,6 +89,9 @@ class Common extends BaseController // 公共数据初始化 $this->CommonInit(); + + // token验证 + $this->TokenCheck(); } /** @@ -214,6 +217,21 @@ class Common extends BaseController $this->page_size = 10; } + /** + * token验证 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-04-18T16:20:58+0800 + */ + private function TokenCheck() + { + if(!empty($this->user) && !empty($this->data_request['token']) && $this->data_request['token'] != ApiService::CreatedUserToken($this->user['id'])) + { + exit(json_encode(DataReturn('token非法', -1000))); + } + } + /** * 空方法响应 * @author Devil diff --git a/app/lang/en.php b/app/lang/en.php index 72c7d0bc9..94f47d467 100644 --- a/app/lang/en.php +++ b/app/lang/en.php @@ -2170,9 +2170,6 @@ return [ // 用户 'user' => [ // 表单 - 'form_item_system_type' => 'System Type', - 'form_item_system_type_tips' => 'default', - 'form_item_system_type_message' => 'System type 2~60 characters', 'form_item_username' => 'Username', 'form_item_username_message' => 'User name 2~30 characters', 'form_item_nickname' => 'Nickname', @@ -2181,26 +2178,6 @@ return [ 'form_item_mobile_message' => 'Mobile number format error', 'form_item_email' => 'E-mail', 'form_item_email_message' => 'Email format error', - 'form_item_alipay_openid' => 'Alipay openid', - 'form_item_alipay_openid_message' => 'Please fill in Alipay openid', - 'form_item_baidu_openid' => 'Baidu openid', - 'form_item_baidu_openid_message' => 'Please fill in Baidu openid', - 'form_item_toutiao_openid' => 'Toutiao openid', - 'form_item_toutiao_openid_message' => 'Please fill in the header openid', - 'form_item_toutiao_unionid' => 'Toutiao unionid', - 'form_item_toutiao_unionid_message' => 'Please fill in the headline unionid', - 'form_item_qq_openid' => 'QQopenid', - 'form_item_qq_openid_message' => 'Please fill in QQ openid', - 'form_item_qq_unionid' => 'QQunionid', - 'form_item_qq_unionid_message' => 'Please fill in QQuinonid', - 'form_item_weixin_openid' => 'WeChat openid', - 'form_item_weixin_openid_message' => 'Please fill in WeChat openid', - 'form_item_weixin_unionid' => 'WeChat unionid', - 'form_item_weixin_unionid_message' => 'Please fill in WeChat unionid', - 'form_item_web_weixin_openid' => 'WeChat webopenid', - 'form_item_web_weixin_openid_message' => 'Please fill in WeChat webopenid', - 'form_item_kuaishou_openid' => 'Kwai openid', - 'form_item_kuaishou_openid_message' => 'Please fill in the Kwai openid', 'form_item_province' => 'Province', 'form_item_province_message' => 'Maximum 60 characters in the province', 'form_item_city' => 'City', @@ -2220,6 +2197,20 @@ return [ 'form_item_pwd' => 'Login Password', 'form_item_pwd_tips' => 'Enter to change the password', 'form_item_pwd_message' => 'Login password format is between 6 and 18 characters', + // 详情 + 'detail_platform_title' => 'User Platform Info', + 'detail_system_type' => 'System Type', + 'detail_platform' => 'Platform', + 'detail_alipay_openid' => 'Alipay openid', + 'detail_baidu_openid' => 'Baidu openid', + 'detail_toutiao_openid' => 'Toutiao openid', + 'detail_toutiao_unionid' => 'Toutiao unionid', + 'detail_qq_openid' => 'QQopenid', + 'detail_qq_unionid' => 'QQunionid', + 'detail_weixin_openid' => 'WeChat openid', + 'detail_weixin_unionid' => 'WeChat unionid', + 'detail_web_weixin_openid' => 'WeChat webopenid', + 'detail_kuaishou_openid' => 'Kwai openid', // 保存 'save_admin_info_error_tips' => 'The current operation administrator information is incorrect', 'save_user_already_exist_tips' => 'User already exists[{$var}]', diff --git a/app/lang/zh.php b/app/lang/zh.php index 25e770250..f84f3f0d5 100755 --- a/app/lang/zh.php +++ b/app/lang/zh.php @@ -2175,9 +2175,6 @@ return [ // 用户 'user' => [ // 表单 - 'form_item_system_type' => '系统类型', - 'form_item_system_type_tips' => '默认 default', - 'form_item_system_type_message' => '系统类型2~60字符', 'form_item_username' => '用户名', 'form_item_username_message' => '用户名2~30个字符', 'form_item_nickname' => '昵称', @@ -2186,26 +2183,6 @@ return [ 'form_item_mobile_message' => '手机号码格式错误', 'form_item_email' => '电子邮箱', 'form_item_email_message' => '电子邮箱格式错误', - 'form_item_alipay_openid' => '支付宝openid', - 'form_item_alipay_openid_message' => '请填写支付宝openid', - 'form_item_baidu_openid' => '百度openid', - 'form_item_baidu_openid_message' => '请填写百度openid', - 'form_item_toutiao_openid' => '头条openid', - 'form_item_toutiao_openid_message' => '请填写头条openid', - 'form_item_toutiao_unionid' => '头条unionid', - 'form_item_toutiao_unionid_message' => '请填写头条unionid', - 'form_item_qq_openid' => 'QQopenid', - 'form_item_qq_openid_message' => '请填写QQopenid', - 'form_item_qq_unionid' => 'QQunionid', - 'form_item_qq_unionid_message' => '请填写QQunionid', - 'form_item_weixin_openid' => '微信openid', - 'form_item_weixin_openid_message' => '请填写微信openid', - 'form_item_weixin_unionid' => '微信unionid', - 'form_item_weixin_unionid_message' => '请填写微信unionid', - 'form_item_web_weixin_openid' => '微信webopenid', - 'form_item_web_weixin_openid_message' => '请填写微信webopenid', - 'form_item_kuaishou_openid' => '快手openid', - 'form_item_kuaishou_openid_message' => '请填写快手openid', 'form_item_province' => '所在省', 'form_item_province_message' => '所在省最多60个字符', 'form_item_city' => '所在市', @@ -2225,6 +2202,20 @@ return [ 'form_item_pwd' => '登录密码', 'form_item_pwd_tips' => '输入则修改密码', 'form_item_pwd_message' => '登录密码格式6~18个字符之间', + // 详情 + 'detail_platform_title' => '用户平台信息', + 'detail_system_type' => '系统类型', + 'detail_platform' => '所属平台', + 'detail_alipay_openid' => '支付宝openid', + 'detail_baidu_openid' => '百度openid', + 'detail_toutiao_openid' => '头条openid', + 'detail_toutiao_unionid' => '头条unionid', + 'detail_qq_openid' => 'QQopenid', + 'detail_qq_unionid' => 'QQunionid', + 'detail_weixin_openid' => '微信openid', + 'detail_weixin_unionid' => '微信unionid', + 'detail_weixin_web_openid' => '微信webopenid', + 'detail_kuaishou_openid' => '快手openid', // 保存 'save_admin_info_error_tips' => '当前操作管理员信息有误', 'save_user_already_exist_tips' => '用户已存在[{$var}]', diff --git a/app/service/ApiService.php b/app/service/ApiService.php index d2826fb21..9c986d843 100644 --- a/app/service/ApiService.php +++ b/app/service/ApiService.php @@ -42,5 +42,29 @@ class ApiService return json($data); } + + /** + * 用户token生成 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-02-26 + * @desc description + * @param [int] $user_id [用户id] + */ + public static function CreatedUserToken($user_id) + { + $arr = ['USER', 'HTTP_USER_AGENT', 'HTTP_HOST', 'SERVER_SOFTWARE', 'GATEWAY_INTERFACE', 'REQUEST_SCHEME', 'SERVER_PROTOCOL']; + $data = [GetClientIP(), APPLICATION_CLIENT_TYPE]; + foreach($arr as $v) + { + if(isset($_SERVER[$v])) + { + $data[] = $_SERVER[$v]; + } + } + sort($data); + return md5(md5(implode('', $data)).md5($user_id)); + } } ?> \ No newline at end of file diff --git a/app/service/AppMiniUserService.php b/app/service/AppMiniUserService.php index 9773b7f58..ecaff50d0 100644 --- a/app/service/AppMiniUserService.php +++ b/app/service/AppMiniUserService.php @@ -73,7 +73,7 @@ class AppMiniUserService $ret = DataReturn(MyLang('common_service.appminiuser.auth_login_success_tips'), 0, ['is_user_exist'=>0, 'openid'=>$ret['data']['user_id']]); } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { // 标记用户存在 @@ -131,7 +131,7 @@ class AppMiniUserService $ret = UserService::AuthUserProgram($auth_data, 'alipay_openid'); } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { $ret = DataReturn(MyLang('auth_success'), 0, $user); @@ -207,7 +207,7 @@ class AppMiniUserService // 用户状态 if(!empty($user)) { - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { // 标记用户存在 @@ -263,7 +263,7 @@ class AppMiniUserService $ret = UserService::AuthUserProgram($auth_data, 'weixin_openid'); } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { $ret = DataReturn(MyLang('auth_success'), 0, $user); @@ -299,7 +299,7 @@ class AppMiniUserService if(!empty($user)) { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { // 标记用户存在 @@ -384,7 +384,7 @@ class AppMiniUserService } } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { $ret = DataReturn(MyLang('auth_success'), 0, $user); @@ -454,7 +454,7 @@ class AppMiniUserService // 用户状态 if(!empty($user)) { - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { // 标记用户存在 @@ -507,7 +507,7 @@ class AppMiniUserService $ret = UserService::AuthUserProgram($auth_data, 'toutiao_openid'); } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { $ret = DataReturn(MyLang('auth_success'), 0, $user); @@ -544,7 +544,7 @@ class AppMiniUserService $ret = DataReturn(MyLang('common_service.appminiuser.auth_login_success_tips'), 0, ['is_user_exist'=>0, 'openid'=>$ret['data']['openid']]); } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { // 标记用户存在 @@ -596,7 +596,7 @@ class AppMiniUserService $ret = UserService::AuthUserProgram($auth_data, 'kuaishou_openid'); } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { $ret = DataReturn(MyLang('auth_success'), 0, $user); @@ -666,7 +666,7 @@ class AppMiniUserService // 用户状态 if(!empty($user)) { - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { // 标记用户存在 @@ -747,7 +747,7 @@ class AppMiniUserService } } else { // 用户状态 - $ret = UserService::UserStatusCheck('id', $user['id']); + $ret = UserService::UserStatusCheck($user['id']); if($ret['code'] == 0) { $ret = DataReturn(MyLang('auth_success'), 0, $user); diff --git a/app/service/BuyService.php b/app/service/BuyService.php index ce4468271..16d049031 100755 --- a/app/service/BuyService.php +++ b/app/service/BuyService.php @@ -638,7 +638,7 @@ class BuyService $common_order_is_booking = MyC('common_order_is_booking', 0); // 查询用户状态是否正常 - $ret = UserService::UserStatusCheck('id', $params['user']['id']); + $ret = UserService::UserStatusCheck($params['user']['id']); if($ret['code'] != 0) { return $ret; diff --git a/app/service/GoodsCartService.php b/app/service/GoodsCartService.php index 427332438..9f1278d1c 100644 --- a/app/service/GoodsCartService.php +++ b/app/service/GoodsCartService.php @@ -243,7 +243,7 @@ class GoodsCartService } // 查询用户状态是否正常 - $ret = UserService::UserStatusCheck('id', $params['user']['id']); + $ret = UserService::UserStatusCheck($params['user']['id']); if($ret['code'] != 0) { return $ret; @@ -391,7 +391,7 @@ class GoodsCartService } // 查询用户状态是否正常 - $ret = UserService::UserStatusCheck('id', $params['user']['id']); + $ret = UserService::UserStatusCheck($params['user']['id']); if($ret['code'] != 0) { return $ret; diff --git a/app/service/GoodsFavorService.php b/app/service/GoodsFavorService.php index d72dc2baf..0ad5738d8 100644 --- a/app/service/GoodsFavorService.php +++ b/app/service/GoodsFavorService.php @@ -56,7 +56,7 @@ class GoodsFavorService } // 查询用户状态是否正常 - $ret = UserService::UserStatusCheck('id', $params['user']['id']); + $ret = UserService::UserStatusCheck($params['user']['id']); if($ret['code'] != 0) { return $ret; diff --git a/app/service/ResourcesService.php b/app/service/ResourcesService.php index 7cb61153a..0f64fce12 100755 --- a/app/service/ResourcesService.php +++ b/app/service/ResourcesService.php @@ -792,9 +792,23 @@ class ResourcesService */ public static function TableStructureData($table) { + // 表名处理及sql $table_name = MyConfig('database.connections.mysql.prefix').strtolower(preg_replace('/\B([A-Z])/', '_$1', $table)); - $res = Db::query('SELECT COLUMN_NAME AS field,COLUMN_COMMENT AS name FROM INFORMATION_SCHEMA.Columns WHERE `table_name`="'.$table_name.'"'); - return empty($res) ? [] : array_column($res, 'name', 'field'); + $sql = 'SELECT COLUMN_NAME AS field,COLUMN_COMMENT AS name FROM INFORMATION_SCHEMA.Columns WHERE `table_name`="'.$table_name.'"'; + + // 从缓存获取 + $key = SystemService::CacheKey('shopxo.cache_table_structure_key').'_'.md5($sql); + $data = MyCache($key); + if($data === null || MyEnv('app_debug')) + { + // 查询表结构 + $res = Db::query($sql); + $data = empty($res) ? [] : array_column($res, 'name', 'field'); + + // 存储缓存 + MyCache($key, $data, 180); + } + return $data; } } ?> \ No newline at end of file diff --git a/app/service/UserService.php b/app/service/UserService.php index 5fa3a0776..eb9c22321 100755 --- a/app/service/UserService.php +++ b/app/service/UserService.php @@ -16,6 +16,7 @@ use app\service\RegionService; use app\service\SafetyService; use app\service\ResourcesService; use app\service\SystemBaseService; +use app\service\ApiService; /** * 用户服务层 @@ -30,6 +31,175 @@ class UserService public static $user_login_key = 'user_login_info'; public static $user_token_key = 'user_token_data'; + /** + * 用户列表 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + * @param [array] $params [输入参数] + */ + public static function UserList($params = []) + { + $where = empty($params['where']) ? [] : $params['where']; + $field = empty($params['field']) ? '*' : $params['field']; + $order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']); + $m = isset($params['m']) ? intval($params['m']) : 0; + $n = isset($params['n']) ? intval($params['n']) : 10; + + // 获取用户列表 + $data = Db::name('User')->where($where)->order($order_by)->field($field)->limit($m, $n)->select()->toArray(); + return DataReturn(MyLang('handle_success'), 0, self::UserListHandle($data, $params)); + } + + /** + * 列表数据处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2022-08-01 + * @desc description + * @param [array] $data [数据列表] + * @param [array] $params [输入参数] + */ + public static function UserListHandle($data, $params = []) + { + if(!empty($data)) + { + // 用户列表钩子-前面 + $hook_name = 'plugins_service_user_list_handle_begin'; + MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + + // 字段列表 + $keys = ArrayKeys($data); + + // 邀请用户列表 + $referrer_data = []; + if(in_array('referrer', $keys)) + { + $referrer_data = self::GetUserViewInfo(array_column($data, 'referrer')); + } + + // 用户平台信息 + $platform_data = []; + if(in_array('id', $keys)) + { + $platform = Db::name('UserPlatform')->where(['user_id'=>array_column($data, 'id')])->select()->toArray(); + if(!empty($platform)) + { + $common_platform_type = MyLang('common_platform_type'); + foreach($platform as $v) + { + if(!array_key_exists($v['user_id'], $platform_data)) + { + $platform_data[$v['user_id']] = ['data'=>[], 'system'=>[], 'platform'=>[]]; + } + $v['platform_name'] = isset($common_platform_type[$v['platform']]) ? $common_platform_type[$v['platform']]['name'] : $v['platform']; + $platform_data[$v['user_id']]['data'][] = $v; + if(!in_array($v['system_type'], $platform_data[$v['user_id']]['system'])) + { + $platform_data[$v['user_id']]['system'][] = $v['system_type']; + } + if(!in_array($v['platform_name'], $platform_data[$v['user_id']]['platform'])) + { + $platform_data[$v['user_id']]['platform'][] = $v['platform_name']; + } + } + } + } + + // 开始处理数据 + $common_gender_list = MyLang('common_gender_list'); + $common_user_status_list = MyLang('common_user_status_list'); + foreach($data as &$v) + { + // 生日 + if(array_key_exists('birthday', $v)) + { + $v['birthday'] = empty($v['birthday']) ? '' : date('Y-m-d', $v['birthday']); + } + + // 头像 + if(array_key_exists('avatar', $v)) + { + if(!empty($v['avatar'])) + { + $v['avatar'] = ResourcesService::AttachmentPathViewHandle($v['avatar']); + } else { + $v['avatar'] = SystemBaseService::AttachmentHost().'/static/index/'.strtolower(MyC('common_default_theme', 'default', true)).'/images/default-user-avatar.jpg'; + } + } + + // 邀请用户信息 + if(array_key_exists('referrer', $v)) + { + $v['referrer_info'] = (!empty($referrer_data) && is_array($referrer_data) && array_key_exists($v['referrer'], $referrer_data)) ? $referrer_data[$v['referrer']] : []; + } + + // 用户平台信息 + if(array_key_exists('id', $v)) + { + $temp = (empty($platform_data) || empty($platform_data[$v['id']])) ? [] : $platform_data[$v['id']]; + $v['user_platform_data'] = empty($temp['data']) ? [] : $temp['data']; + $v['system_type_list'] = empty($temp['system']) ? [] : $temp['system']; + $v['platform_list'] = empty($temp['platform']) ? [] : $temp['platform']; + $v['system_type_text'] = empty($v['system_type_list']) ? '' : implode('，', $v['system_type_list']); + $v['platform_text'] = empty($v['platform_list']) ? '' : implode('，', $v['platform_list']); + } + + // 时间 + if(array_key_exists('add_time', $v)) + { + $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']); + } + if(array_key_exists('upd_time', $v)) + { + $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); + } + + // 性别 + if(array_key_exists('gender', $v)) + { + $v['gender_text'] = isset($common_gender_list[$v['gender']]) ? $common_gender_list[$v['gender']]['name'] : ''; + } + + // 状态 + if(array_key_exists('status', $v)) + { + $v['status_text'] = $common_user_status_list[$v['status']]['name']; + } + } + + // 用户列表钩子-后面 + $hook_name = 'plugins_service_user_list_handle_end'; + MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + } + return $data; + } + + /** + * 用户总数 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-10T22:16:29+0800 + * @param [array] $where [条件] + */ + public static function UserTotal($where) + { + return (int) Db::name('User')->where($where)->count(); + } + /** * 获取用户登录信息 * @author Devil @@ -122,13 +292,12 @@ class UserService * @version 1.0.0 * @date 2019-02-27 * @desc description - * @param [string] $field [条件字段] - * @param [string] $value [条件值] + * @param [int] $user_id [用户id] */ - public static function UserStatusCheck($field, $value) + public static function UserStatusCheck($user_id) { // 查询用户状态是否正常 - $user = self::UserInfo($field, $value); + $user = self::UserBaseInfo('id', $user_id); if(empty($user)) { return DataReturn(MyLang('common_service.user.user_no_exist_tips'), -110); @@ -147,132 +316,147 @@ class UserService } /** - * 用户列表 + * 根据字段获取用户基础信息 * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-06T21:31:53+0800 - * @param [array] $params [输入参数] + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-01-25 + * @desc description + * @param [string] $where_field [字段名称] + * @param [string] $where_value [字段值] + * @param [string] $field [指定字段] */ - public static function UserList($params = []) + public static function UserBaseInfo($where_field, $where_value, $field = '*') { - $where = empty($params['where']) ? [] : $params['where']; - $field = empty($params['field']) ? '*' : $params['field']; - $order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']); - $m = isset($params['m']) ? intval($params['m']) : 0; - $n = isset($params['n']) ? intval($params['n']) : 10; - - // 获取用户列表 - $data = Db::name('User')->where($where)->order($order_by)->field($field)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('handle_success'), 0, self::UserListHandle($data, $params)); + $where = [ + [$where_field, '=', $where_value], + ['is_delete_time', '=', 0], + ['is_logout_time', '=', 0], + ]; + return Db::name('User')->where($where)->field($field)->find(); } /** - * 列表数据处理 + * 根据字段获取用户平台信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-01-25 + * @desc description + * @param [string] $where_field [字段名称] + * @param [string] $where_value [字段值] + * @param [string] $field [指定字段] + */ + public static function UserPlatformInfo($where_field, $where_value, $field = '*') + { + $where = [ + ['system_type', '=', SystemService::SystemTypeValue()], + ['platform', '=', APPLICATION_CLIENT_TYPE], + [$where_field, '=', $where_value], + ]; + return Db::name('UserPlatform')->where($where)->field($field)->find(); + } + + /** + * 根据字段获取用户信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-01-25 + * @desc description + * @param [string] $where_field [字段名称] + * @param [string] $where_value [字段值] + * @param [string] $field [指定字段] + */ + public static function UserInfo($where_field, $where_value, $field = '*') + { + // 用户平台表结构 + $structure = ResourcesService::TableStructureData('UserPlatform'); + unset($structure['id'], $structure['user_id'], $structure['add_time'], $structure['upd_time']); + $structure = array_keys($structure); + + // 用户基础和平台条件 + $where_field_arr = explode('|', $where_field); + foreach($where_field_arr as $k=>$v) + { + $where_field_arr[$k] = (in_array($v, $structure) ? 'up.' : 'u.').$v; + } + $where_field = implode('|', $where_field_arr); + + // 查询字段处理 + if($field == '*') + { + $field = 'u.*, up.'.implode(', up.', $structure); + } else { + $field_arr = explode(',', $field); + $u_arr = array_diff($field_arr, $structure); + $up_arr = array_intersect($field_arr, $structure); + $field = 'u.'.implode(', u.', $u_arr).(empty($up_arr) ? '' : ', up.'.implode(', up.', $up_arr)); + } + + // 查询用户信息 + $where = [ + ['up.system_type', '=', SystemService::SystemTypeValue()], + ['up.platform', '=', APPLICATION_CLIENT_TYPE], + [$where_field, '=', $where_value], + ['u.is_delete_time', '=', 0], + ['u.is_logout_time', '=', 0], + ]; + return Db::name('User')->alias('u')->join('user_platform up', 'u.id=up.user_id')->where($where)->field($field)->find(); + } + + /** + * 用户平台信息添加 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 - * @date 2022-08-01 + * @date 2023-03-15 * @desc description - * @param [array] $data [数据列表] + * @param [array] $data [用户平台信息] * @param [array] $params [输入参数] */ - public static function UserListHandle($data, $params = []) + public static function UserPlatformInsert($data, $params = []) { - if(!empty($data)) + // 系统标识 + if(empty($data['system_type'])) { - // 用户列表钩子-前面 - $hook_name = 'plugins_service_user_list_handle_begin'; - MyEventTrigger($hook_name, [ - 'hook_name' => $hook_name, - 'is_backend' => true, - 'params' => &$params, - 'data' => &$data, - ]); - - // 字段列表 - $keys = ArrayKeys($data); - - // 邀请用户列表 - if(in_array('referrer', $keys)) - { - $referrer_list = self::GetUserViewInfo(array_column($data, 'referrer')); - } - - // 开始处理数据 - $common_gender_list = MyLang('common_gender_list'); - $common_user_status_list = MyLang('common_user_status_list'); - foreach($data as &$v) - { - // 生日 - if(array_key_exists('birthday', $v)) - { - $v['birthday'] = empty($v['birthday']) ? '' : date('Y-m-d', $v['birthday']); - } - - // 头像 - if(array_key_exists('avatar', $v)) - { - if(!empty($v['avatar'])) - { - $v['avatar'] = ResourcesService::AttachmentPathViewHandle($v['avatar']); - } else { - $v['avatar'] = SystemBaseService::AttachmentHost().'/static/index/'.strtolower(MyC('common_default_theme', 'default', true)).'/images/default-user-avatar.jpg'; - } - } - - // 邀请用户信息 - if(array_key_exists('referrer', $v)) - { - $v['referrer_info'] = (!empty($referrer_list) && is_array($referrer_list) && array_key_exists($v['referrer'], $referrer_list)) ? $referrer_list[$v['referrer']] : []; - } - - // 时间 - if(array_key_exists('add_time', $v)) - { - $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']); - } - if(array_key_exists('upd_time', $v)) - { - $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); - } - - // 性别 - if(array_key_exists('gender', $v)) - { - $v['gender_text'] = isset($common_gender_list[$v['gender']]) ? $common_gender_list[$v['gender']]['name'] : ''; - } - - // 状态 - if(array_key_exists('status', $v)) - { - $v['status_text'] = $common_user_status_list[$v['status']]['name']; - } - } - - // 用户列表钩子-后面 - $hook_name = 'plugins_service_user_list_handle_end'; - MyEventTrigger($hook_name, [ - 'hook_name' => $hook_name, - 'is_backend' => true, - 'params' => &$params, - 'data' => &$data, - ]); + $data['system_type'] = empty($params['system_type_name']) ? SystemService::SystemTypeValue() : $params['system_type_name']; } - return $data; + // 平台 + if(empty($data['platform'])) + { + $data['platform'] = APPLICATION_CLIENT_TYPE; + } + $data['add_time'] = time(); + return Db::name('UserPlatform')->insertGetId($data) > 0; } /** - * 用户总数 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-10T22:16:29+0800 - * @param [array] $where [条件] + * 用户平台信息更新 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-03-15 + * @desc description + * @param [string] $where_field [条件字段] + * @param [string] $where_value [条件值] + * @param [array] $data [更新数据] + * @param [array] $params [输入参数] */ - public static function UserTotal($where) + public static function UserPlatformUpdate($where_field, $where_value, $data, $params = []) { - return (int) Db::name('User')->where($where)->count(); + $where = [ + [$where_field, '=', $where_value], + ]; + // 非自增id则增加更多条件 + if($where_field != 'id') + { + $system_type = empty($params['system_type_name']) ? SystemService::SystemTypeValue() : $params['system_type_name']; + $where[] = ['system_type', '=', $system_type]; + $where[] = ['platform', '=', APPLICATION_CLIENT_TYPE]; + } + $data['upd_time'] = time(); + return Db::name('UserPlatform')->where($where)->update($data); } /** @@ -363,7 +547,6 @@ class UserService // 更新数据 $data = [ - 'system_type' => empty($params['system_type_name']) ? 'default' : $params['system_type_name'], 'username' => isset($params['username']) ? $params['username'] : '', 'nickname' => isset($params['nickname']) ? $params['nickname'] : '', 'mobile' => isset($params['mobile']) ? $params['mobile'] : '', @@ -376,16 +559,6 @@ class UserService 'integral' => intval($params['integral']), 'locking_integral' => intval($params['locking_integral']), 'status' => intval($params['status']), - 'alipay_openid' => isset($params['alipay_openid']) ? $params['alipay_openid'] : '', - 'baidu_openid' => isset($params['baidu_openid']) ? $params['baidu_openid'] : '', - 'toutiao_openid' => isset($params['toutiao_openid']) ? $params['toutiao_openid'] : '', - 'toutiao_unionid' => isset($params['toutiao_unionid']) ? $params['toutiao_unionid'] : '', - 'qq_openid' => isset($params['qq_openid']) ? $params['qq_openid'] : '', - 'qq_unionid' => isset($params['qq_unionid']) ? $params['qq_unionid'] : '', - 'weixin_openid' => isset($params['weixin_openid']) ? $params['weixin_openid'] : '', - 'weixin_unionid' => isset($params['weixin_unionid']) ? $params['weixin_unionid'] : '', - 'weixin_web_openid' => isset($params['weixin_web_openid']) ? $params['weixin_web_openid'] : '', - 'kuaishou_openid' => isset($params['kuaishou_openid']) ? $params['kuaishou_openid'] : '', 'birthday' => empty($params['birthday']) ? 0 : strtotime($params['birthday']), 'referrer' => empty($params['referrer']) ? 0 : intval($params['referrer']), ]; @@ -420,7 +593,7 @@ class UserService { return DataReturn(MyLang('common_service.user.save_user_info_no_exist_tips'), -10); } - $ret = self::UserUpdateHandle($data, $params['id']); + $ret = self::UserUpdateHandle($data, $params['id'], $params); if($ret['code'] == 0) { $user_id = $params['id']; @@ -479,27 +652,53 @@ class UserService * @desc description * @param [array] $data [用户更新信息] * @param [int] $user_id [用户id] + * @param [array] $params [输入参数] */ - public static function UserUpdateHandle($data, $user_id) + public static function UserUpdateHandle($data, $user_id, $params = []) { - $data['upd_time'] = time(); - if(Db::name('User')->where(['id'=>intval($user_id)])->update($data)) + // 注册数据分离处理 + // 用户平台表结构 + $structure = ResourcesService::TableStructureData('UserPlatform'); + unset($structure['id'], $structure['user_id'], $structure['add_time'], $structure['upd_time']); + $user_base = []; + $user_platform = []; + foreach($data as $k=>$v) { - // 更新成功后钩子 - $hook_name = 'plugins_service_user_update_success'; - $ret = EventReturnHandle(MyEventTrigger($hook_name, [ - 'hook_name' => $hook_name, - 'is_backend' => true, - 'user_id' => $user_id, - 'data' => $data, - ])); - if(isset($ret['code']) && $ret['code'] != 0) + if(array_key_exists($k, $structure)) { - return $ret; + $user_platform[$k] = $v; + } else { + $user_base[$k] = $v; } - return DataReturn(MyLang('update_success'), 0); } - return DataReturn(MyLang('update_fail'), -100); + + // 用户信息添加 + $user_base['upd_time'] = time(); + if(!Db::name('User')->where(['id'=>$user_id])->update($user_base)) + { + return DataReturn(MyLang('update_fail'), -100); + } + + // 用户平台信息添加 + $user_platform['user_id'] = $user_id; + if(self::UserPlatformUpdate('user_id', $user_id, $user_platform, $params) === false) + { + return DataReturn(MyLang('update_fail'), -100); + } + + // 更新成功后钩子 + $hook_name = 'plugins_service_user_update_success'; + $ret = EventReturnHandle(MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'user_id' => $user_id, + 'data' => $data, + ])); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + return DataReturn(MyLang('update_success'), 0); } /** @@ -921,7 +1120,7 @@ class UserService } // 获取用户账户信息 - $user = self::UserInfo($ac['data'], $params['accounts']); + $user = self::UserBaseInfo($ac['data'], $params['accounts']); if(empty($user)) { return DataReturn(MyLang('accounts_error_tips'), -3); @@ -938,6 +1137,16 @@ class UserService } } + // 用户平台信息、不存在则添加 + $user_platform = self::UserPlatformInfo('user_id', $user['id']); + if(empty($user_platform)) + { + if(!self::UserPlatformInsert(['user_id' => $user['id']], $params)) + { + return DataReturn(MyLang('insert_fail'), -1); + } + } + // 用户状态 if(in_array($user['status'], [2,3])) { @@ -958,50 +1167,53 @@ class UserService } // 返回数据,更新数据库 - $data = [ - 'upd_time' => time(), - ]; + $upd_data = []; if($params['type'] == 'username') { $salt = GetNumberCode(6); - $data['salt'] = $salt; - $data['pwd'] = LoginPwdEncryption($params['pwd'], $salt); + $upd_data['salt'] = $salt; + $upd_data['pwd'] = LoginPwdEncryption($params['pwd'], $salt); } // 用户openid - if(empty($user[APPLICATION_CLIENT_TYPE.'_openid'])) + if(empty($user_platform[APPLICATION_CLIENT_TYPE.'_openid'])) { $openid = self::UserOpenidHandle($params); if(!empty($openid['field']) && !empty($openid['value'])) { // openid放入用户data中 - $data[$openid['field']] = $openid['value']; + $upd_data[$openid['field']] = $openid['value']; } } // 用户unionid - if(empty($user[APPLICATION_CLIENT_TYPE.'_unionid'])) + if(empty($user_platform[APPLICATION_CLIENT_TYPE.'_unionid'])) { $unionid = self::UserUnionidHandle($params); if(!empty($unionid['field']) && !empty($unionid['value'])) { // unionid放入用户data中 - $data[$unionid['field']] = $unionid['value']; + $upd_data[$unionid['field']] = $unionid['value']; } } // 更新用户信息 - if(Db::name('User')->where(['id'=>$user['id']])->update($data) !== false) + if(!empty($upd_data)) { - // 清除图片验证码 - if(isset($verify) && isset($verify['data']) && is_object($verify['data'])) + $ret = self::UserUpdateHandle($upd_data, $user['id'], $params); + if($ret['code'] != 0) { - $verify['data']->Remove(); + return DataReturn(MyLang('login_failure_tips'), -100); } - - return self::UserLoginHandle($user['id'], $params); } - return DataReturn(MyLang('login_failure_tips'), -100); + + // 清除图片验证码 + if(isset($verify) && isset($verify['data']) && is_object($verify['data'])) + { + $verify['data']->Remove(); + } + + return self::UserLoginHandle($user['id'], $params); } /** @@ -1016,48 +1228,48 @@ class UserService */ public static function UserLoginHandle($user_id, $params = []) { - // 登录记录 - if(self::UserLoginRecord($user_id)) + // 返回前端html代码 + $body_html = []; + + // 用户登录后钩子 + $user = self::UserInfo('id', $user_id, 'id,number_code,system_type,username,nickname,mobile,email,gender,avatar,province,city,county,birthday'); + + // 会员码生成处理 + if(empty($user['number_code'])) { - // 返回前端html代码 - $body_html = []; - - // 用户登录后钩子 - $user = self::UserInfo('id', $user_id, 'id,number_code,system_type,username,nickname,mobile,email,gender,avatar,province,city,county,birthday'); - - // 会员码生成处理 - if(empty($user['number_code'])) - { - $user['number_code'] = self::UserNumberCodeCreatedHandle($user_id); - } - - // 登录钩子 - $hook_name = 'plugins_service_user_login_end'; - $ret = EventReturnHandle(MyEventTrigger($hook_name, [ - 'hook_name' => $hook_name, - 'is_backend' => true, - 'params' => &$params, - 'user_id' => $user_id, - 'user' => $user, - 'body_html' => &$body_html, - ])); - if(isset($ret['code']) && $ret['code'] != 0) - { - return $ret; - } - - // 成功返回 - if(APPLICATION == 'app') - { - $result = self::AppUserInfoHandle($user_id); - } else { - $result = [ - 'body_html' => is_array($body_html) ? implode(' ', $body_html) : $body_html, - ]; - } - return DataReturn(MyLang('login_success'), 0, $result); + $user['number_code'] = self::UserNumberCodeCreatedHandle($user_id); } - return DataReturn(MyLang('login_failure_tips'), -100); + + // 登录钩子 + $hook_name = 'plugins_service_user_login_end'; + $ret = EventReturnHandle(MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'user_id' => $user_id, + 'user' => $user, + 'body_html' => &$body_html, + ])); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + + // 成功返回 + if(APPLICATION == 'app') + { + $result = self::AppUserInfoHandle($user_id); + } else { + // 登录记录 + if(!self::UserLoginRecord($user_id)) + { + return DataReturn(MyLang('login_failure_tips'), -100); + } + $result = [ + 'body_html' => is_array($body_html) ? implode(' ', $body_html) : $body_html, + ]; + } + return DataReturn(MyLang('login_success'), 0, $result); } /** @@ -1272,6 +1484,11 @@ class UserService { return DataReturn(MyLang('common_service.user.username_format_error_tips'), -2); } + // 用户名是否已存在 + if(self::IsExistAccounts($params['accounts'], 'username')) + { + return DataReturn(str_replace('{$var}', $params['accounts'], MyLang('common_service.user.save_user_already_exist_tips')), -3); + } break; } return DataReturn(MyLang('operate_success'), 0); @@ -1289,7 +1506,7 @@ class UserService */ private static function IsExistAccounts($accounts, $field = 'mobile') { - $temp = self::UserInfo($field, $accounts, 'id'); + $temp = self::UserBaseInfo($field, $accounts, 'id'); return !empty($temp); } @@ -1344,12 +1561,12 @@ class UserService // 手机号码格式 if(!CheckMobile($params['accounts'])) { - return DataReturn(MyLang('mobile_format_error_tips'), -2); + return DataReturn(MyLang('mobile_format_error_tips'), -2); } // 手机号码是否不存在 if(!self::IsExistAccounts($params['accounts'], 'mobile')) { - return DataReturn(MyLang('mobile_no_exist_error_tips'), -3); + return DataReturn(MyLang('mobile_no_exist_error_tips'), -3); } $field = 'mobile'; break; @@ -1364,7 +1581,7 @@ class UserService // 电子邮箱是否不存在 if(!self::IsExistAccounts($params['accounts'], 'email')) { - return DataReturn(MyLang('email_no_exist_error_tips'), -3); + return DataReturn(MyLang('email_no_exist_error_tips'), -3); } $field = 'email'; break; @@ -1374,7 +1591,7 @@ class UserService // 帐号是否不存在 if(!self::IsExistAccounts($params['accounts'], 'username|mobile|email')) { - return DataReturn(MyLang('accounts_error_tips'), -3); + return DataReturn(MyLang('accounts_error_tips'), -3); } $field = 'username|mobile|email'; break; @@ -1890,9 +2107,15 @@ class UserService $is_onekey_mobile_bind = isset($params['is_onekey_mobile_bind']) && $params['is_onekey_mobile_bind'] == 1 ? 1 : 0; // 用户信息处理 - $user = self::AppUserInfoHandle(null, $field, $params['openid']); - if(!empty($user)) + $user_platform = self::UserPlatformInfo($field, $params['openid']); + if(!empty($user_platform)) { + // 用户信息 + $user = self::UserBaseInfo('id', $user_platform['user_id']); + if(empty($user)) + { + return DataReturn(MyLang('common_service.user.user_no_exist_tips'), -1); + } // 用户状态 if($user['status'] != 0) { @@ -1903,7 +2126,7 @@ class UserService if(empty($user['mobile']) && !empty($data['mobile']) && $is_onekey_mobile_bind == 1) { // 手机号码不存在则绑定到当前账号下 - $temp = self::AppUserInfoHandle(null, 'mobile', $data['mobile']); + $temp = self::UserBaseInfo('mobile', $data['mobile']); if(empty($temp)) { $upd_data = [ @@ -1931,40 +2154,50 @@ class UserService if(!empty($unionid['field']) && !empty($unionid['value'])) { // unionid字段是否存在用户 - $user_unionid = self::AppUserInfoHandle(null, $unionid['field'], $unionid['value']); - if(!empty($user_unionid)) + $unionid_user_platform = self::UserPlatformInfo($unionid['field'], $unionid['value']); + if(!empty($unionid_user_platform)) { + // 用户信息 + $unionid_user_base = self::UserBaseInfo('id', $user_platform['user_id']); + if(empty($user)) + { + return DataReturn(MyLang('common_service.user.user_no_exist_tips'), -1); + } // 用户状态 - if($user_unionid['status'] != 0) + if($unionid_user_base['status'] != 0) { return DataReturn(MyLang('common_service.user.user_not_audit_tips'), -301); } // openid绑定 - $upd_data = [ - $field => $params['openid'], - 'upd_time' => time(), - ]; + if(!self::UserPlatformUpdate('id', $unionid_user_platform['id'], [$field => $params['openid']], $params)) + { + return DataReturn(MyLang('bind_fail'), -1); + } // 如果是一键登录、如当前用户不存在手机号码则绑定 - if(empty($user_unionid['mobile']) && !empty($data['mobile']) && $is_onekey_mobile_bind == 1) + if(empty($unionid_user_base['mobile']) && !empty($data['mobile']) && $is_onekey_mobile_bind == 1) { // 手机号码不存在则绑定到当前账号下 - $temp = self::AppUserInfoHandle(null, 'mobile', $data['mobile']); + $temp = self::UserBaseInfo('mobile', $data['mobile']); if(empty($temp)) { - $upd_data['mobile'] = $data['mobile']; + $upd_data = [ + 'mobile' => $data['mobile'], + 'upd_time' => time(), + ]; + if(!Db::name('User')->where(['id'=>$unionid_user_base['id']])->update($upd_data)) + { + return DataReturn(MyLang('bind_fail'), -1); + } } else { - if($user_unionid['id'] != $temp['id']) + if($unionid_user_base['id'] != $temp['id']) { return DataReturn(MyLang('common_service.user.mobile_already_bind_account_tips'), -1); } } } - if(Db::name('User')->where(['id'=>$user_unionid['id']])->update($upd_data)) - { - return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($user_unionid['id'])); - } + return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($unionid_user_base['id'])); } // 如果用户不存在数据库中，则unionid放入用户data中 @@ -1981,18 +2214,19 @@ class UserService { // 如果手机号码存在则直接绑定openid // 不存在添加，存在更新openid - $user = self::AppUserInfoHandle(null, 'mobile', $data['mobile']); + $user = self::UserBaseInfo('mobile', $data['mobile']); if(!empty($user)) { - $upd_data = [ - $field => $params['openid'], - 'upd_time' => time(), + // 上面openid和unionid都没存在信息，但是存在手机号码信息则增加用户平台数据 + $user_platform_insert = [ + 'user_id' => $user['id'], + $field => $params['openid'], ]; if(!empty($unionid['field']) && !empty($unionid['value'])) { - $upd_data[$unionid['field']] = $unionid['value']; + $user_platform_insert[$unionid['field']] = $unionid['value']; } - if(Db::name('User')->where(['id'=>$user['id']])->update($upd_data)) + if(self::UserPlatformInsert($user_platform_insert, $params)) { return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($user['id'])); } @@ -2039,11 +2273,7 @@ class UserService */ public static function UserOpenidBind($user_id, $openid, $field) { - $data = [ - $field => $openid, - 'upd_time' => time(), - ]; - return Db::name('User')->where(['id'=>$user_id])->update($data); + return self::UserPlatformUpdate('user_id', $user_id, [$field => $openid]); } /** @@ -2184,8 +2414,8 @@ class UserService if(!empty($user)) { // token生成并存储缓存 - $user['token'] = self::CreatedUserToken($user_id); - if(Db::name('User')->where(['id'=>$user_id])->update(['token'=>$user['token'], 'upd_time'=>time()])) + $user['token'] = ApiService::CreatedUserToken($user_id); + if(self::UserPlatformUpdate('user_id', $user_id, ['token'=>$user['token']])) { MyCache(SystemService::CacheKey('shopxo.cache_user_info').$user['token'], $user); } @@ -2196,47 +2426,6 @@ class UserService return $user; } - /** - * 用户token生成 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2021-02-26 - * @desc description - * @param [int] $user_id [用户id] - */ - public static function CreatedUserToken($user_id) - { - return md5(md5($user_id.time()).rand(100, 1000000)); - } - - /** - * 根据字段获取用户信息 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-01-25 - * @desc description - * @param [string] $where_field [字段名称] - * @param [string] $where_value [字段值] - * @param [string] $field [指定字段] - */ - public static function UserInfo($where_field, $where_value, $field = '*') - { - if(empty($where_field) || empty($where_value)) - { - return ''; - } - - $where = [ - ['system_type', '=', SystemService::SystemTypeValue()], - [$where_field, '=', $where_value], - ['is_delete_time', '=', 0], - ['is_logout_time', '=', 0], - ]; - return Db::name('User')->where($where)->field($field)->find(); - } - /** * 用户添加 * @author Devil @@ -2249,20 +2438,24 @@ class UserService */ public static function UserInsert($data, $params = []) { - // 账号是否存在，以用户名 手机 邮箱 作为唯一 + // 账号是否存在，以用户名作为唯一（用户名不允许重复注册） if(!empty($data['username'])) { - $temp = self::UserInfo('username', $data['username']); - } else if(!empty($data['mobile'])) + $temp = self::UserBaseInfo('username', $data['username']); + if(!empty($temp)) + { + return DataReturn(str_replace('{$var}', $data['username'], MyLang('common_service.user.save_user_already_exist_tips')), -10); + } + } + + // 手机 邮箱（通过验证码注册可以直接绑定现有的账户） + $user = []; + if(!empty($data['mobile'])) { - $temp = self::UserInfo('mobile', $data['mobile']); + $user = self::UserBaseInfo('mobile', $data['mobile']); } else if(!empty($data['email'])) { - $temp = self::UserInfo('email', $data['email']); - } - if(!empty($temp)) - { - return DataReturn(MyLang('common_service.user.account_already_exist_tips'), -10); + $user = self::UserBaseInfo('email', $data['email']); } // 用户基础信息处理 @@ -2287,47 +2480,82 @@ class UserService // 推荐人id $data['referrer'] = self::UserReferrerDecrypt($params); - // 添加用户 - $data['add_time'] = time(); - $user_id = Db::name('User')->insertGetId($data); - if($user_id > 0) + // 注册数据分离处理 + // 用户平台表结构 + $structure = ResourcesService::TableStructureData('UserPlatform'); + unset($structure['id'], $structure['user_id'], $structure['add_time'], $structure['upd_time']); + $user_base = []; + $user_platform = []; + foreach($data as $k=>$v) { - // 会员码生成处理 - self::UserNumberCodeCreatedHandle($user_id); - - // 清除推荐id - if(isset($data['referrer'])) + if(array_key_exists($k, $structure)) { - MySession('share_referrer_id', null); + $user_platform[$k] = $v; + } else { + $user_base[$k] = $v; } - - // 返回前端html代码 - $body_html = []; - - // 注册成功后钩子 - $user = self::UserInfo('id', $user_id, 'id,number_code,system_type,username,nickname,mobile,email,gender,avatar,province,city,county,birthday'); - $hook_name = 'plugins_service_user_register_end'; - $ret = EventReturnHandle(MyEventTrigger($hook_name, [ - 'hook_name' => $hook_name, - 'is_backend' => true, - 'params' => &$params, - 'user_id' => $user_id, - 'user' => $user, - 'body_html' => &$body_html, - ])); - if(isset($ret['code']) && $ret['code'] != 0) - { - return $ret; - } - - // 登录返回 - $result = [ - 'body_html' => is_array($body_html) ? implode(' ', $body_html) : $body_html, - 'user_id' => $user_id, - ]; - return DataReturn(MyLang('insert_success'), 0, $result); } - return DataReturn(MyLang('insert_fail'), -100); + + // 用户信息以手机或邮箱、不存在则添加 + if(empty($user)) + { + $user_base['add_time'] = time(); + $user_id = Db::name('User')->insertGetId($user_base); + if($user_id <= 0) + { + return DataReturn(MyLang('insert_fail'), -100); + } + } else { + // 存在密码则仅更新密码 + if(!empty($data['salt']) && !empty($data['pwd'])) + { + $ret = self::UserUpdateHandle(['salt'=>$data['salt'], 'pwd'=>$data['pwd']], $user['id']); + if($ret['code'] != 0) + { + return $ret; + } + } + $user_id = $user['id']; + } + + // 用户平台信息添加 + $user_platform['user_id'] = $user_id; + if(!self::UserPlatformInsert($user_platform, $params)) + { + return DataReturn(MyLang('insert_fail'), -100); + } + + // 会员码生成处理 + self::UserNumberCodeCreatedHandle($user_id); + + // 清除推荐id + MySession('share_referrer_id', null); + + // 返回前端html代码 + $body_html = []; + + // 注册成功后钩子 + $user = self::UserInfo('id', $user_id, 'id,number_code,system_type,username,nickname,mobile,email,gender,avatar,province,city,county,birthday'); + $hook_name = 'plugins_service_user_register_end'; + $ret = EventReturnHandle(MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'user_id' => $user_id, + 'user' => $user, + 'body_html' => &$body_html, + ])); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + + // 登录返回 + $result = [ + 'body_html' => is_array($body_html) ? implode(' ', $body_html) : $body_html, + 'user_id' => $user_id, + ]; + return DataReturn(MyLang('insert_success'), 0, $result); } /** @@ -2504,7 +2732,7 @@ class UserService $is_appmini = array_key_exists(APPLICATION_CLIENT_TYPE, MyLang('common_appmini_type')); // 手机号码获取用户信息 - $mobile_user = self::UserInfo('mobile', $data['mobile']); + $mobile_user = self::UserBaseInfo('mobile', $data['mobile']); // 额外信息 if(empty($mobile_user)) @@ -2549,7 +2777,8 @@ class UserService $data[$accounts_field] = $params[$accounts_field]; // 小程序请求获取用户信息 - $current_user = self::UserInfo($accounts_field, $params[$accounts_field]); + $user_platform = self::UserPlatformInfo($accounts_field, $params[$accounts_field]); + $current_user = empty($user_platform) ? [] : self::UserBaseInfo('id', $user_platform['user_id']); } else { // 当前登录用户 $current_user = self::LoginUserInfo(); @@ -2588,12 +2817,11 @@ class UserService // 新增用户 $user_ret = self::UserInsert($data, $params); - if($user_ret['code'] == 0) + if($user_ret['code'] != 0) { - $user_id = $user_ret['data']['user_id']; - } else { return $user_ret; } + $user_id = $user_ret['data']['user_id']; } else { // 小程序请求处理 if($is_appmini) @@ -2611,11 +2839,12 @@ class UserService } // 帐号信息更新 - $data['upd_time'] = time(); - if(Db::name('User')->where(['id'=>$mobile_user['id']])->update($data)) + $ret = self::UserUpdateHandle($data, $mobile_user['id'], $params); + if($ret['code'] != 0) { - $user_id = $mobile_user['id']; + return $ret; } + $user_id = $mobile_user['id']; } if(isset($user_id) && $user_id > 0) { @@ -2767,7 +2996,7 @@ class UserService } if(!empty($user_ids)) { - $data = Db::name('User')->where(['id'=>$user_ids])->column('id,number_code,system_type,username,nickname,mobile,email,avatar,province,city,county,gender', 'id'); + $data = Db::name('User')->where(['id'=>$user_ids])->column('id,number_code,username,nickname,mobile,email,avatar,province,city,county,gender', 'id'); } // 数据处理 diff --git a/config/shopxo.php b/config/shopxo.php index b95bbbe1f..3fb0135ed 100755 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -115,6 +115,9 @@ return [ // 用户中心左侧菜单 'cache_user_center_left_nav_key' => 'cache_user_center_left_nav_key_data', + // 表结构缓存 + 'cache_table_structure_key' => 'cache_table_structure_key_data', + // 站点域名地址 'domain_url' => $domain_url,