mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改user_id

Browse Source
This commit is contained in:
mkm 2023-03-18 17:37:05 +08:00
parent 8bccaac1a8
commit 0e0d48f25a
20 changed files with 109 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/admin/controller/Index.php
View File

@ -133,13 +133,11 @@ class Index extends BaseController
$work_num = Db::table('fa_szxc_information_usermsg')
->alias('m')
->where($where)
->join(['fa_user'=>'u'],'m.user_id=u.id and u.group_id = 3')->count();
->join(['shop.eb_user'=>'u'],'m.user_id=u.id and u.group_id = 3')->count();
}else{
$work_num = Db::table('fa_user')
->alias('u')
->where($where)
->where('u.group_id',3)
->join(['fa_szxc_information_usermsg'=>'m'],'u.id = m.user_id')->count();
$work_num = Db::connect('shop')->table('eb_user')
->where('group_id',3)
->count();
}
//土地
$land_area_num = Db::table('fa_szxc_information_useraddress')

2
app/admin/controller/accounts/Accounts.php
View File

@ -29,7 +29,7 @@ class Accounts extends BaseController
$total=0;
$list=[];
$brokerage_price=0;
$find=Db::table('fa_szxc_information_useraddress')->where('user_id',$this->adminInfo['id'])->value('street_id');
$find=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->value('street_id');
if ($find!=0) {
$brokerage_price=Db::connect('shop')->name('store_order_region_commission')->where('street_id',$find)->sum('commission_rate');
}

55
app/admin/controller/nk/User.php
View File

@ -87,9 +87,14 @@ class User extends BaseController
->alias('m')
->where($mmm)
->where($map)
->join(['fa_user' => 'u'], 'm.user_id=u.id')
->join(['fa_user_group' => 'g'], 'g.id=u.group_id')
->field('u.id,m.name,m.phone,u.avatar,u.group_id,u.status,m.gender,m.age,g.name group_name,m.householder_id')
// ->join(['shop.eb_user' => 'u'], 'm.user_id=u.uid')u.avatar,u.group_id,u.status,
->field('m.user_id id,m.name,m.phone,m.gender,m.age,m.householder_id,m.user_id')
->withAttr('shop_info', function ($value, $data) {
$find=Db::connect('shop')->name('user')->where('uid',$data['user_id'])->field('uid,avatar,status,group_id')->find();
if (!$find) return false;
$find['group_name']=Db::connect('shop')->name('user_group')->where('group_id',$find['group_id'])->value('group_name');
return $find;
})
->withAttr('count', function ($value, $data) {
if ($data['householder_id'] != 0) {
$count = Db::table('fa_szxc_information_usermsg')->where('householder_id', $data['householder_id'])->count();
@ -427,7 +432,7 @@ class User extends BaseController
->order('id desc')
->field("id,user_id,name,age,gender,family_num,political_outlook,householder_id,is_hz,address_name,family_relation,phone")
->withAttr('avatar', function ($value, $data) {
return Db::table('fa_user')->where('id', $data['user_id'])->value('avatar');
return Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->value('avatar');
})
->select()->toArray();
if ($find['householder_id'] == $find['user_id']) {
@ -535,7 +540,7 @@ class User extends BaseController
$params = get_params();
if (request()->isPost()) {
$admin = Db::name('Admin')->where('user_id', $params['id'])->find();
$user = Db::table('fa_user')->where('id', $params['id'])->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $params['id'])->find();
if ($params['village_id'] != '') {
$village = Db::table('fa_geo_village')->where('village_code', $params['village_id'])->find();
@ -602,15 +607,15 @@ class User extends BaseController
// 修改user表
$ddd['is_admin'] = 1;
$ddd['group_id'] = $params['group_id'];
Db::table('fa_user')->where('id', $params['id'])->update($ddd);
// Db::table('fa_user')->where('id', $params['id'])->update($ddd);
Db::connect('shop')->table('eb_user')->where('uid',$params['id'])->update($ddd);
// 修改商城关系表
$nk_user['n_user_id'] = $params['id'];
$is_nk_user = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
if ($is_nk_user) {
$nk_data['group_id'] = $params['group_id'];
Db::connect('shop')->name('nk_user')->where($nk_user)->update($nk_data);
}
// $nk_user['n_user_id'] = $params['id'];
// $is_nk_user = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
// if ($is_nk_user) {
// $nk_data['group_id'] = $params['group_id'];
// Db::connect('shop')->name('nk_user')->where($nk_user)->update($nk_data);
// }
// 修改用户详细地址
$u_msg['address_name'] = $address_name;
@ -657,12 +662,14 @@ class User extends BaseController
// 修改user表
$ddd['is_admin'] = 1;
$ddd['group_id'] = $params['group_id'];
Db::table('fa_user')->where('id', $params['id'])->update($ddd);
Db::connect('shop')->table('eb_user')->where('uid',$params['id'])->update($ddd);
// Db::table('fa_user')->where('id', $params['id'])->update($ddd);
// 修改商城关系表
$nk_user['n_user_id'] = $params['id'];
$is_nk_user = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
if ($is_have) {
// $nk_user['n_user_id'] = $params['id'];
// $is_nk_user = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
$address=Db::table('fa_szxc_information_useraddress')->where($w)->find();
if ($address) {
$useraddress = [
'user_id' => $params['id'],
'admin_id' => $admin_id,
@ -674,11 +681,11 @@ class User extends BaseController
'auth_range' => $params['auth_range'],
];
Db::table('fa_szxc_information_useraddress')->where($w)->update($useraddress);
if ($is_nk_user) {
$useraddress['group_id'] = $params['group_id'];
unset($useraddress['user_id'],$useraddress['admin_id'],$useraddress['auth_range']);
Db::connect('shop')->name('nk_user')->where($nk_user)->update($useraddress);
}
// if ($is_nk_user) {
// $useraddress['group_id'] = $params['group_id'];
// unset($useraddress['user_id'],$useraddress['admin_id'],$useraddress['auth_range']);
// Db::connect('shop')->name('nk_user')->where($nk_user)->update($useraddress);
// }
} else {
$useraddress = [
'user_id' => $params['id'],
@ -713,7 +720,7 @@ class User extends BaseController
}
}
$user = Db::table('fa_user')->where('id', $params['id'])->field('id,nickname,group_id')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $params['id'])->field('uid id,nickname,group_id')->find();
// $geo_brigade = Db::table('fa_geo_brigade')->select();
@ -777,7 +784,7 @@ class User extends BaseController
->select();
$groupdata[] = ['id' => 0, 'title' => '无后台权限'];
//前端权限
$user_group = Db::table('fa_user_group')
$user_group = Db::connect('shop')->table('eb_user_group')
->limit(30)
->select();
View::assign('id', $params['id']);

4
app/admin/view/nk/user/index.html
View File

@ -151,6 +151,8 @@
},{
field: 'group_name',
title: '角色组',
templet: '<div>{{ d.shop_info.group_name }}</div>',
},{
field: 'name',
title: '姓名',
@ -163,7 +165,7 @@
field: 'avatar',
title: '头像',
align: 'center',
templet: '<div><img src="{{ d.avatar }}" style="width:30px; height:30px;"></div>',
templet: '<div><img src="{{ d.shop_info.avatar }}" style="width:30px; height:30px;"></div>',
},{
field: 'gender',
title: '性别',

55
app/api/BaseController.php
View File

@ -84,61 +84,6 @@ abstract class BaseController
//每页显示数据量
$this->pageSize = Request::param('page_size', \think\facade\Config::get('app.page_size'));
// 暂时去除 -----------------------------------------------------
// $token = Request::header('x-Token');
// if ($token) {
// if (strpos($token, 'Bearer') === 0){
// $token = trim(substr($token, 6));
// }
// if (count(explode('.', $token)) != 3) {
// return json(['code'=>404,'msg'=>'非法请求']);
// }
// $config = get_system_config('token');
// return json($token);
// JWT::$leeway = 60;//当前时间减去60，把时间留点余地
// $decoded = JWT::decode($token, new Key('ae47e94a7dcd1fdfacb499b60e361a8d', 'HS256')); //HS256方式，这里要和签发的时候对应
// return $decoded->jti[0];
// exit;
// //var_dump($config);exit;
// try {
// JWT::$leeway = 60;//当前时间减去60，把时间留点余地
// $decoded = JWT::decode($token, new Key('ae47e94a7dcd1fdfacb499b60e361a8d', 'HS256')); //HS256方式，这里要和签发的时候对应
// //return (array)$decoded;
// // $decoded_array = json_decode(json_encode($decoded),TRUE);
// // $jwt_data = $decoded_array['data'];
// $user=Db::connect('shop')->name('nk_user')->where('user_id',$decoded->jti[0])->find();
// if (!$user){
// return json(['code'=>403,'msg'=>'签名错误']);
// return false;
// }
// $user = Db::table('fa_user')->where('id',$user['n_user_id'])->find();
// //$request->uid = $jwt_data['userid'];
// define('$this->request->uid', $user['id']);
// // $response = $next($request);
// // return $response;
// //return $next($request);
// } catch(\Firebase\JWT\SignatureInvalidException $e) { //签名不正确
// return json(['code'=>403,'msg'=>'签名错误']);
// }catch(\Firebase\JWT\BeforeValidException $e) { // 签名在某个时间点之后才能用
// return json(['code'=>401,'msg'=>'token失效']);
// }catch(\Firebase\JWT\ExpiredException $e) { // token过期
// return json(['code'=>401,'msg'=>'token已过期']);
// }catch(Exception $e) { //其他错误
// return json(['code'=>404,'msg'=>'非法请求']);
// }catch(\UnexpectedValueException $e) { //其他错误
// return json(['code'=>404,'msg'=>'非法请求']);
// } catch(\DomainException $e) { //其他错误
// return json(['code'=>404,'msg'=>'非法请求']);
// }
// }else{
// define('$this->request->uid', '');
// }
// 暂时去除 -----------------------------------------------------
}
/**

10
app/api/controller/Article.php
View File

@ -210,7 +210,7 @@ class Article extends BaseController
->whereTime('view_time','between', [date("H:i:s",strtotime("-5 minute")), date("H:i:s",strtotime("+5 minute"))])
->page($page)->limit(3)
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -235,7 +235,7 @@ class Article extends BaseController
$mapo[] = [['category_id','=','1'],['status','=','1']];
$select = Db::table('fa_article')->where($where)->whereOr($mapo)->page($page)->limit(20)
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -268,7 +268,7 @@ class Article extends BaseController
->select()->toArray();
$personal=Db::table('fa_szxc_personal_news')
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -339,7 +339,7 @@ class Article extends BaseController
}
})
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -398,7 +398,7 @@ class Article extends BaseController
$find['end_count'] = 0;
$find['overdue_count'] = 0;
if ($value['is_nickname'] == 0) {
$user = Db::table('fa_user')->where('id', $value['user_id'])->field('nickname,avatar,mobile')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $value['user_id'])->field('nickname,avatar,phone mobile')->find();
if ($user) {
$find = $user;
}

8
app/api/controller/ArticleComment.php
View File

@ -25,7 +25,7 @@ class ArticleComment extends BaseController{
public function index($search='',$vote_id=1,$page=1) {
$select=Db::table('fa_article_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$msg=Db::table('fa_szxc_information_usermsg')->where('user_id',$value['user_id'])->field('political_outlook,name')->find();
$data = $find;
$data['user_type_info']='群众';
@ -47,7 +47,7 @@ class ArticleComment extends BaseController{
->where('vote_id', $vote_id)->where('status', 1)->where('type',1)->page($page)->limit(20)->select();
$select_type2=Db::table('fa_article_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$msg=Db::table('fa_szxc_information_usermsg')->where('user_id',$value['user_id'])->field('political_outlook,name')->find();
$data = $find;
$data['user_type_info']='群众';
@ -69,7 +69,7 @@ class ArticleComment extends BaseController{
->where('vote_id', $vote_id)->where('status', 1)->where('type',2)->page($page)->limit(20)->select();
$select_type3=Db::table('fa_article_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$msg=Db::table('fa_szxc_information_usermsg')->where('user_id',$value['user_id'])->field('political_outlook,name')->find();
$data = $find;
$data['user_type_info']='群众';
@ -94,7 +94,7 @@ class ArticleComment extends BaseController{
public function one_list($vote_id=1,$page=1) {
$select=Db::table('fa_article_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$msg=Db::table('fa_szxc_information_usermsg')->where('user_id',$value['user_id'])->field('political_outlook,name')->find();
$data = $find;
$data['user_type_info']='群众';

309
app/api/controller/Ceshi.php
View File

@ -1,309 +0,0 @@
<?php
namespace app\api\controller;
use app\api\BaseController;
use app\api\middleware\Auth;
use Firebase\JWT\JWT;
use think\facade\Db;
class Ceshi extends BaseController
{
/**
* 控制器中间件 [不需要鉴权]
* @var array
*/
protected $middleware = [
Auth::class => ['except' => ['index', 'ceshi2'] ]
];
public function ceshi2()
{
$config = [
'app_id' => 'wx0b3defb62f0f910b',
'secret' => 'c02aa7ad9e4a5c423862e068b6cb4ad4',
'token' => 'e5511202e4104e0aa9963e244b3e3785',
'aes_key' => '', // 明文模式请勿填写 EncodingAESKey
/**
* OAuth 配置
*
* scopes：公众平台（snsapi_userinfo / snsapi_base），开放平台：snsapi_login
* callback：OAuth授权完成后的回调页地址
*/
'oauth' => [
'scopes' => ['snsapi_userinfo'],
'callback' => '/examples/oauth_callback.php',
],
/**
* 接口请求相关配置，超时时间等，具体可用参数请参考：
* https://github.com/symfony/symfony/blob/5.3/src/Symfony/Contracts/HttpClient/HttpClientInterface.php
*/
'http' => [
'timeout' => 5.0,
// 'base_uri' => 'https://api.weixin.qq.com/', // 如果你在国外想要覆盖默认的 url 的时候才使用，根据不同的模块配置不同的 uri
'retry' => true, // 使用默认重试配置
// 'retry' => [
// // 仅以下状态码重试
// 'http_codes' => [429, 500]
// // 最大重试次数
// 'max_retries' => 3,
// // 请求间隔 (毫秒)
// 'delay' => 1000,
// // 如果设置，每次重试的等待时间都会增加这个系数
// // (例如. 首次:1000ms; 第二次: 3 * 1000ms; etc.)
// 'multiplier' => 3
// ],
],
];
$app = new wxApplication($config);
$utils = $app->getUtils();
$config = $utils->buildJsSdkConfig(
'https://h5.lihaink.cn',
['updateAppMessageShareData', 'updateTimelineShareData'],
[],
false
);
return $this->apiSuccess('ok', $config);
}
public function index($code)
{
$config = [
'app_id' => 'wxfb4695444ab8d0d0',
'secret' => '9d73b21c39586ccb55c716546a0b999e',
'token' => 'easywechat',
/**
* 接口请求相关配置，超时时间等，具体可用参数请参考：
* https://github.com/symfony/symfony/blob/5.3/src/Symfony/Contracts/HttpClient/HttpClientInterface.php
*/
'http' => [
'throw' => true, // 状态码非 200、300 时是否抛出异常，默认为开启
'timeout' => 5.0,
// 'base_uri' => 'https://api.weixin.qq.com/', // 如果你在国外想要覆盖默认的 url 的时候才使用，根据不同的模块配置不同的 uri
'retry' => true, // 使用默认重试配置
// 'retry' => [
// // 仅以下状态码重试
// 'http_codes' => [429, 500]
// // 最大重试次数
// 'max_retries' => 3,
// // 请求间隔 (毫秒)
// 'delay' => 1000,
// // 如果设置，每次重试的等待时间都会增加这个系数
// // (例如. 首次:1000ms; 第二次: 3 * 1000ms; etc.)
// 'multiplier' => 3
// ],
],
];
$app = new Application($config);
$utils = $app->getUtils();
$response = $utils->codeToSession($code);
if ($response['openid']) {
$user = Db::table('fa_user')->where('openid', $response['openid'])->field('id,nickname,group_id,avatar,group_id')->find();
if ($user) {
$find = Db::table('fa_szxc_information_usermsg')->where('user_id', $user['id'])->find();
if ($find) {
$user['no_update'] = 0;
} else {
$user['no_update'] = 1;
}
//创建新Token
$token = self::getToken($user['id']);
$user['token'] = $token;
$user['expires_in'] = 2222222;
return $this->apiSuccess('ok', ['user_info' => $user]);
} else {
$time = time();
$data = [
'openid' => $response['openid'],
'group_id' => 1,
'username' => 'wx' . $time,
'nickname' => '微信用户' . $time,
'avatar' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230111/58c84995456bc63b2660d9526f7062fc.png',
'level' => 1,
'createtime' => $time,
'updatetime' => $time,
'status' => 'normal'
];
$id = Db::table('fa_user')->insertGetId($data);
// 写入商城关系表
$nk_user['n_user_id'] = $id;
$is_nk_user_id = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
if (!$is_nk_user_id) {
Db::connect('shop')->name('nk_user')->insert($nk_user);
}
//创建新Token
$token = self::getToken($user['id']);
$userinfo = ['user_id' => $id, 'no_update' => 1, 'token' => $token, 'expires_in' => 2222222, 'nickname' => $data['nickname'], 'avatar' => $data['avatar'], 'group_id' => 1];
return $this->apiSuccess('ok', ['user_info' => $userinfo]);
}
}
halt($response);
}
/**
* @param $user_id
* @return string
*/
public function getToken($user_id){
$time = time(); //当前时间
$conf = $this->jwt_conf;
$token = [
'iss' => $conf['iss'], //签发者 可选
'aud' => $conf['aud'], //接收该JWT的一方，可选
'iat' => $time, //签发时间
'nbf' => $time-1 , //(Not Before)：某个时间点后才能访问，比如设置time+30，表示当前时间30秒后才能使用
'exp' => $time+$conf['exptime'], //过期时间,这里设置2个小时
'data' => [
//自定义信息，不要定义敏感信息
'userid' =>$user_id,
]
];
return JWT::encode($token, $conf['secrect'], 'HS256'); //输出Token 默认'HS256'
}
public function getopenid()
{
$code = get_params('code');
if (empty($code)) {
$this->apiError('缺少参数');
}
$config = [
'app_id' => 'wx6e14cb98394e36bc',
'secret' => 'd8b7c06bbdb29309fed11fe62fe6b022',
'token' => 'easywechat',
/**
* 接口请求相关配置，超时时间等，具体可用参数请参考：
* https://github.com/symfony/symfony/blob/5.3/src/Symfony/Contracts/HttpClient/HttpClientInterface.php
*/
'http' => [
'throw' => true, // 状态码非 200、300 时是否抛出异常，默认为开启
'timeout' => 5.0,
// 'base_uri' => 'https://api.weixin.qq.com/', // 如果你在国外想要覆盖默认的 url 的时候才使用，根据不同的模块配置不同的 uri
'retry' => true, // 使用默认重试配置
// 'retry' => [
// // 仅以下状态码重试
// 'http_codes' => [429, 500]
// // 最大重试次数
// 'max_retries' => 3,
// // 请求间隔 (毫秒)
// 'delay' => 1000,
// // 如果设置，每次重试的等待时间都会增加这个系数
// // (例如. 首次:1000ms; 第二次: 3 * 1000ms; etc.)
// 'multiplier' => 3
// ],
],
];
$app = new Application($config);
$utils = $app->getUtils();
$response = $utils->codeToSession($code);
if ($response['openid']) {
$where['user_id'] = $this->request->uid;
$user = Db::table('fa_user_openid')->where($where)->find();
if ($user) {
if (!empty($user['openid']) && $user['openid'] == $response['openid']) {
$this->apiError('您已授权');
} else {
$data['openid'] = $response['openid'];
Db::table('fa_user_openid')->where($where)->update($data);
}
} else {
$time = time();
$data = [
'openid' => $response['openid'],
'user_id' => $this->request->uid,
'createtime' => $time,
];
$res = Db::table('fa_user_openid')->insert($data);
if ($res) {
$this->apiSuccess('授权成功');
} else {
$this->apiError('授权失败');
}
}
} else {
$this->apiError('操作失败');
}
}
public function getoffopenid()
{
$code = get_params('code');
if (empty($code)) {
$this->apiError('缺少参数');
}
$config = [
'app_id' => 'wx0b3defb62f0f910b',
'secret' => 'c02aa7ad9e4a5c423862e068b6cb4ad4',
'token' => 'easywechat',
/**
* 接口请求相关配置，超时时间等，具体可用参数请参考：
* https://github.com/symfony/symfony/blob/5.3/src/Symfony/Contracts/HttpClient/HttpClientInterface.php
*/
'http' => [
'throw' => true, // 状态码非 200、300 时是否抛出异常，默认为开启
'timeout' => 5.0,
// 'base_uri' => 'https://api.weixin.qq.com/', // 如果你在国外想要覆盖默认的 url 的时候才使用，根据不同的模块配置不同的 uri
'retry' => true, // 使用默认重试配置
// 'retry' => [
// // 仅以下状态码重试
// 'http_codes' => [429, 500]
// // 最大重试次数
// 'max_retries' => 3,
// // 请求间隔 (毫秒)
// 'delay' => 1000,
// // 如果设置，每次重试的等待时间都会增加这个系数
// // (例如. 首次:1000ms; 第二次: 3 * 1000ms; etc.)
// 'multiplier' => 3
// ],
],
];
$app = new Application($config);
$utils = $app->getUtils();
$response = $utils->codeToSession($code);
if ($response['openid']) {
$where['user_id'] = $this->request->uid;
$user = Db::table('fa_user_openid')->where($where)->find();
if ($user) {
if (!empty($user['official_account_openid']) && $user['official_account_openid'] == $response['openid']) {
$this->apiError('您已授权');
} else {
$data['official_account_openid'] = $response['openid'];
Db::table('fa_user_openid')->where($where)->update($data);
}
} else {
$time = time();
$data = [
'official_account_openid' => $response['openid'],
'user_id' => $this->request->uid,
'createtime' => $time,
];
$res = Db::table('fa_user_openid')->insert($data);
if ($res) {
$this->apiSuccess('授权成功');
} else {
$this->apiError('授权失败');
}
}
} else {
$this->apiError('操作失败');
}
}
}

10
app/api/controller/Cultural.php
View File

@ -244,7 +244,7 @@ class Cultural extends BaseController
->whereTime('view_time','between', [date("H:i:s",strtotime("-5 minute")), date("H:i:s",strtotime("+5 minute"))])
->page($page)->limit(3)
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -269,7 +269,7 @@ class Cultural extends BaseController
$mapo[] = [['category_id','=','1'],['status','=','1']];
$select = Db::table('fa_article')->where($where)->whereOr($mapo)->page($page)->limit(20)
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -302,7 +302,7 @@ class Cultural extends BaseController
->select()->toArray();
$personal=Db::table('fa_szxc_personal_news')
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -373,7 +373,7 @@ class Cultural extends BaseController
}
})
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -432,7 +432,7 @@ class Cultural extends BaseController
$find['end_count'] = 0;
$find['overdue_count'] = 0;
if ($value['is_nickname'] == 0) {
$user = Db::table('fa_user')->where('id', $value['user_id'])->field('nickname,avatar,mobile')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $value['user_id'])->field('nickname,avatar,phone mobile')->find();
if ($user) {
$find = $user;
}

154
app/api/controller/Index.php
View File

@ -23,160 +23,6 @@ class Index extends BaseController
protected $middleware = [
Auth::class => ['except' => ['index','reg','login'] ]
];
/**
* @param $user_id
* @return string
*/
public function getToken($user_id){
$time = time(); //当前时间
$conf = $this->jwt_conf;
$token = [
'iss' => $conf['iss'], //签发者 可选
'aud' => $conf['aud'], //接收该JWT的一方，可选
'iat' => $time, //签发时间
'nbf' => $time-1 , //(Not Before)：某个时间点后才能访问，比如设置time+30，表示当前时间30秒后才能使用
'exp' => $time+$conf['exptime'], //过期时间,这里设置2个小时
'data' => [
//自定义信息，不要定义敏感信息
'userid' =>$user_id,
]
];
return JWT::encode($token, $conf['secrect'], 'HS256'); //输出Token 默认'HS256'
}
/**
* @param $token
*/
public static function checkToken($token){
try {
JWT::$leeway = 60;//当前时间减去60，把时间留点余地
$decoded = JWT::decode($token, self::$config['secrect'], ['HS256']); //HS256方式，这里要和签发的时候对应
return (array)$decoded;
} catch(\Firebase\JWT\SignatureInvalidException $e) { //签名不正确
return json(['code'=>403,'msg'=>'签名错误']);
}catch(\Firebase\JWT\BeforeValidException $e) { // 签名在某个时间点之后才能用
return json(['code'=>401,'msg'=>'token失效']);
}catch(\Firebase\JWT\ExpiredException $e) { // token过期
return json(['code'=>401,'msg'=>'token已过期']);
}catch(Exception $e) { //其他错误
return json(['code'=>404,'msg'=>'非法请求']);
}catch(\UnexpectedValueException $e) { //其他错误
return json(['code'=>404,'msg'=>'非法请求']);
} catch(\DomainException $e) { //其他错误
return json(['code'=>404,'msg'=>'非法请求']);
}
}
/**
* @api {post} /index/index API页面
* @apiDescription 返回首页信息
*/
public function index()
{
$list = Db::table('fa_Article')->select();
$seo = get_system_config('web');
add_user_log('api', '首页');
$this->apiSuccess('请求成功',['list' => $list,'seo' => $seo]);
}
/**
* @api {post} /index/login 会员登录
* @apiDescription 系统登录接口，返回 token 用于操作需验证身份的接口
* @apiParam (请求参数：) {string} username 登录用户名
* @apiParam (请求参数：) {string} password 登录密码
* @apiParam (响应字段：) {string} token Token
* @apiSuccessExample {json} 成功示例
* {"code":0,"msg":"登录成功","time":1627374739,"data":{"token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuZ291Z3VjbXMuY29tIiwiYXVkIjoiZ291Z3VjbXMiLCJpYXQiOjE2MjczNzQ3MzksImV4cCI6MTYyNzM3ODMzOSwidWlkIjoxfQ.gjYMtCIwKKY7AalFTlwB2ZVWULxiQpsGvrz5I5t2qTs"}}
* @apiErrorExample {json} 失败示例
* {"code":1,"msg":"帐号或密码错误","time":1627374820,"data":[]}
*/
public function login()
{
$param = get_params();
if(empty($param['username']) || empty($param['password'])){
$this->apiError('参数错误');
}
// 校验用户名密码
$user = Db::table('fa_user')->where(['mobile' => $param['username']])->find();
if (empty($user)) {
$this->apiError('帐号或密码错误');
}
$param['pwd'] = set_password($param['password'], $user['salt']);
if ($param['pwd'] !== $user['password']) {
$this->apiError('帐号或密码错误');
}
if ($user['status'] == -1) {
$this->apiError('该用户禁止登录,请于平台联系');
}
$data = [
'prevtime' => time(),
'loginip' => request()->ip(),
];
$res = Db::table('fa_user')->where(['id' => $user['id']])->update($data);
if ($res) {
$token = self::getToken($user['id']);
add_user_log('api', '登录');
$this->apiSuccess('登录成功', ['token' => $token]);
}
}
/**
* @api {post} /index/reg 会员注册
* @apiDescription 系统注册接口，返回是否成功的提示，需再次登录
* @apiParam (请求参数：) {string} username 用户名
* @apiParam (请求参数：) {string} password 密码
* @apiSuccessExample {json} 成功示例
* {"code":0,"msg":"注册成功","time":1627375117,"data":[]}
* @apiErrorExample {json} 失败示例
* {"code":1,"msg":"该账户已经存在","time":1627374899,"data":[]}
*/
public function reg()
{
$param = get_params();
if(empty($param['username']) || empty($param['pwd'])){
$this->apiError('参数错误');
}
$user = Db::table('fa_user')->where(['username' => $param['username']])->find();
if (!empty($user)) {
$this->apiError('该账户已经存在');
}
$param['salt'] = set_salt(20);
$param['password'] = set_password($param['pwd'], $param['salt']);
$param['register_time'] = time();
$param['headimgurl'] = '/static/admin/images/icon.png';
$param['register_ip'] = request()->ip();
$char = mb_substr($param['username'], 0, 1, 'utf-8');
$uid = Db::table('fa_user')->strict(false)->field(true)->insertGetId($param);
if($uid){
add_user_log('api', '注册');
$this->apiSuccess('注册成功,请登录');
}else{
$this->apiError('注册失败');
}
}
/**
* @api {post} /index/demo 测试页面
* @apiDescription 返回文章列表信息
* @apiParam (请求参数：) {string} token Token
* @apiSuccessExample {json} 响应数据样例
* {"code":1,"msg":"","time":1563517637,"data":{"id":13,"email":"test110@qq.com","password":"e10adc3949ba59abbe56e057f20f883e","sex":1,"last_login_time":1563517503,"last_login_ip":"127.0.0.1","qq":"123455","mobile":"","mobile_validated":0,"email_validated":0,"type_id":1,"status":1,"create_ip":"127.0.0.1","update_time":1563507130,"create_time":1563503991,"type_name":"注册会员"}}
*/
public function demo()
{
$uid = $this->request->uid;
$userInfo = Db::table('fa_user')->where(['id' => $uid])->find();
$this->apiSuccess('请求成功', ['user' => $userInfo]);
}
/**
* 文章投诉接口.

104
app/api/controller/Maintainentry.php
View File

@ -140,7 +140,7 @@ class Maintainentry extends BaseController
if($value['is_hz']==1){
return 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230129/0dc8d0a0f3bcc168550ef263a9a170dc.png';
}else{
$msg= Db::table('fa_user')->where('id',$value['user_id'])->value('avatar');
$msg= Db::connect('shop')->table('eb_user')->where('uid',$value['user_id'])->value('avatar');
return $msg??'';
}
})
@ -438,7 +438,7 @@ class Maintainentry extends BaseController
$oldmsg = Db::table('fa_szxc_information_usermsg')->where($map)->find();
if($oldmsg['phone'] != $post['phone']){
// 判断手机号是否已经注册
$is_mobile = Db::table('fa_user')->where('mobile',$post['phone'])->find();
$is_mobile=Db::connect('shop')->table('eb_user')->where('phone',$post['phone'])->find();
if ($is_mobile) {
$this->apiError('手机号已被使用');
}
@ -1229,8 +1229,8 @@ class Maintainentry extends BaseController
if(empty($add)){
$this->apiError('录入出错，请联系系统管理员');
}
// 判断手机号是否已经注册
$is_mobile = Db::table('fa_user')->where('mobile',$post['phone'])->find();
//判断手机号是否已经注册
$is_mobile = Db::connect('shop')->table('eb_user')->where('phone',$post['phone'])->find();
if ($is_mobile) {
$this->apiError('手机号已被使用');
}
@ -1261,48 +1261,20 @@ class Maintainentry extends BaseController
$mobile = $post['phone'];
$ip = request()->ip();
$time = time();
$salt = set_salt(); //随机字符串
// 注册用户
// 注册用户
$params = [
'username' => $mobile,
'nickname' => $post['name'],
'group_id' => 1,
'password' => $this->getEncryptPassword('', $salt),
'email' => '',
'mobile' => $mobile,
'level' => 1,
'score' => 0,
'avatar' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230111/58c84995456bc63b2660d9526f7062fc.png',
'salt' => $salt,
'jointime' => $time,
'joinip' => $ip,
'logintime' => $time,
'loginip' => $ip,
'prevtime' => $time,
'status' => 'normal',
'createtime' => $time,
'updatetime' => $time
'account' => $mobile,
'pwd' => password_hash(123456, PASSWORD_BCRYPT),
'nickname' => substr($mobile, 0, 3) . '****' . substr($mobile, 7, 4),
'avatar' => '',
'phone' => $mobile,
'last_ip' =>$ip
];
//写入用户表
$userid = Db::table('fa_user')->strict(false)->insertGetId($params);
// 写入商城关系表
$nk_user['n_user_id'] = $userid;
$is_user_phone = Db::connect('shop')->name('user')->where('phone',$mobile)->find();
if(!$is_user_phone){
Db::connect('shop')->name('nk_user')->insert($nk_user);
}else{
$is_user_id = Db::connect('shop')->name('nk_user')->where('user_id',$is_user_phone['uid'])->find();
if($is_user_id){
Db::connect('shop')->name('nk_user')->where('user_id',$is_user_phone['uid'])->update($nk_user);
}else{
$nk_user['user_id'] = $is_user_phone['uid'];
Db::connect('shop')->name('nk_user')->insert($nk_user);
}
}
$userid = Db::connect('shop')->table('eb_user')->strict(false)->insertGetId($params);
//写入用户信息表
$post['user_id'] = $userid;
$post['user_id'] = 0;
$post['createtime'] = $time;
$post['enter_id'] = $this->request->uid;
$post['gender']= $post['gender_id'];
@ -1530,7 +1502,7 @@ class Maintainentry extends BaseController
$this->apiError('录入出错，请联系系统管理员');
}
// 判断手机号是否已经注册
$is_mobile = Db::table('fa_user')->where('mobile',$post['phone'])->find();
$is_mobile = Db::connect('shop')->table('eb_user')->where('phone',$post['phone'])->find();
if ($is_mobile) {
$this->apiError('手机号已被使用');
}
@ -1561,45 +1533,17 @@ class Maintainentry extends BaseController
$mobile = $post['phone'];
$ip = request()->ip();
$time = time();
$salt = set_salt(); //随机字符串
// 注册用户
$params = [
'username' => $mobile,
'nickname' => $post['name'],
'group_id' => 1,
'password' => $this->getEncryptPassword('', $salt),
'email' => '',
'mobile' => $mobile,
'level' => 1,
'score' => 0,
'avatar' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230111/58c84995456bc63b2660d9526f7062fc.png',
'salt' => $salt,
'jointime' => $time,
'joinip' => $ip,
'logintime' => $time,
'loginip' => $ip,
'prevtime' => $time,
'status' => 'normal',
'createtime' => $time,
'updatetime' => $time
'account' => $mobile,
'pwd' => password_hash(123456, PASSWORD_BCRYPT),
'nickname' => substr($mobile, 0, 3) . '****' . substr($mobile, 7, 4),
'avatar' => '',
'phone' => $mobile,
'last_ip' =>$ip
];
//写入用户表
$userid = Db::table('fa_user')->strict(false)->insertGetId($params);
// 写入商城关系表
$nk_user['n_user_id'] = $userid;
$is_user_phone = Db::connect('shop')->name('user')->where('phone',$mobile)->find();
if(!$is_user_phone){
Db::connect('shop')->name('nk_user')->insert($nk_user);
}else{
$is_user_id = Db::connect('shop')->name('nk_user')->where('user_id',$is_user_phone['uid'])->find();
if($is_user_id){
Db::connect('shop')->name('nk_user')->where('user_id',$is_user_phone['uid'])->update($nk_user);
}else{
$nk_user['user_id'] = $is_user_phone['uid'];
Db::connect('shop')->name('nk_user')->insert($nk_user);
}
}
$userid = Db::connect('shop')->table('eb_user')->strict(false)->insertGetId($params);
//写入用户信息表
$post['user_id'] = $userid;
@ -1682,7 +1626,7 @@ class Maintainentry extends BaseController
->order('is_hz desc')
->field("id,user_id,name,age,gender,family_num,political_outlook,householder_id,is_hz,address_name,family_relation,phone")
->withAttr('avatar', function ($value, $data) {
return Db::table('fa_user')->where('id', $data['user_id'])->value('avatar');
return Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->value('avatar');
})
->select()->toArray();
if ($res){
@ -1744,7 +1688,7 @@ class Maintainentry extends BaseController
$return['name'] = $name;
$return['family_num'] = Db::table('fa_szxc_information_usermsg')->where($map)->count();
$return['is_set_hz'] = $is_set_hz;
$return['avatar'] = Db::table('fa_user')->where('id', $user_id)->value('avatar');
$return['avatar'] = Db::connect('shop')->table('eb_user')->where('uid', $user_id)->value('avatar');
$return['data'] = $res;
$this->apiSuccess('获取成功', $return, 1);
}
@ -1807,7 +1751,7 @@ class Maintainentry extends BaseController
// }
// 判断手机号是否已经注册
$is_mobile = Db::table('fa_user')->where('mobile',$phone)->find();
$is_mobile = Db::connect('shop')->table('eb_user')->where('phone',$phone)->find();
if ($is_mobile) {
$this->apiError('手机号已被使用');
}

4
app/api/controller/MyArticle.php
View File

@ -81,7 +81,7 @@ class MyArticle extends BaseController
}
$name['address_name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $this->request->uid)->value('address_name');
$name['vartar'] = Db::table('fa_user')->where('id', $this->request->uid)->value('avatar');
$name['vartar'] = Db::connect('shop')->table('eb_user')->where('id', $this->request->uid)->value('avatar');
$name['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $this->request->uid)->value('name');
return $this->apiSuccess('ok', ['list' => $select, 'count' => ['count' => $count, 'month_count' => $month_count],'actor'=>$name]);
@ -111,7 +111,7 @@ class MyArticle extends BaseController
$find['end_count'] = 0;
$find['overdue_count'] = 0;
if ($value['is_nickname'] == 0) {
$user = Db::table('fa_user')->where('id', $value['user_id'])->field('nickname,avatar,mobile')->find();
$user = Db::connect('shop')->table('eb_user')->where('id', $value['user_id'])->field('nickname,avatar,phone')->find();
if ($user) {
$find = $user;
}

14
app/api/controller/Personal.php
View File

@ -92,7 +92,7 @@ class Personal extends BaseController
$list[$key]['createtime'] = date('Y-m-d', $value['createtime']);
$list[$key]['news_author'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['uid'])->value('name');
$list[$key]['username'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name');
$list[$key]['avatar'] = Db::table('fa_user')->where('id', $value['user_id'])->value('avatar');
$list[$key]['avatar'] = Db::connect('shop')->table('eb_user')->where('uid', $value['user_id'])->value('avatar');
$list[$key]['type'] = 'friends';
}
}
@ -105,7 +105,7 @@ class Personal extends BaseController
$list2[$key]['createtime'] = substr($value['add_time'], 0, 10);
$list2[$key]['news_author'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $uid)->value('name');
$list2[$key]['username'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $uid)->value('name');
$list2[$key]['avatar'] = Db::table('fa_user')->where('id', $uid)->value('avatar');
$list2[$key]['avatar'] = Db::connect('shop')->table('eb_user')->where('uid', $uid)->value('avatar');
$list2[$key]['type'] = 'article';
}
}
@ -355,7 +355,7 @@ class Personal extends BaseController
}
$news['view_time'] = date("Y-m-d", $news['createtime']);
$news['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$news['user_id'])->value('name');
$news['avatar'] = Db::table('fa_user')->where('id',$news['user_id'])->value('avatar');
$news['avatar'] = Db::connect('shop')->table('eb_user')->where('uid',$news['user_id'])->value('avatar');
$this->apiSuccess('获取成功', $news);
} else {
$this->apiError('获取失败');
@ -384,7 +384,7 @@ class Personal extends BaseController
return Db::table('fa_szxc_information_usermsg')->where('user_id',$data['user_id'])->value('name');
})
->withAttr('avatar',function($value,$data){
return Db::table('fa_user')->where('id',$data['user_id'])->value('avatar');
return Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->value('avatar');
})
->withAttr('createtime',function($value,$data){
return date("Y-m-d", $data['createtime']);
@ -421,7 +421,7 @@ class Personal extends BaseController
$where[] = ['category_id', 'in', $category_id_arr];
$list = Db::table('fa_szxc_personal_news')
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -456,7 +456,7 @@ class Personal extends BaseController
$list = Db::table('fa_szxc_personal_news')
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})
@ -491,7 +491,7 @@ class Personal extends BaseController
$list = Db::table('fa_szxc_personal_news')
->withAttr('user_info', function ($value, $data) {
$user = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,avatar')->find();
$user['name'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $data['user_id'])->value('name');
return $user;
})

110
app/api/controller/Sms.php
View File

@ -1,110 +0,0 @@
<?php
namespace app\api\controller;
use think\facade\Event;
use \think\facade\Validate;
use app\common\library\Sms as Smslib;
use app\api\BaseController;
use app\api\middleware\Auth;
use think\facade\Db;
/**
* 手机短信接口.
*/
class Sms extends BaseController
{
/**
* 控制器中间件 [不需要鉴权]
* @var array
*/
protected $middleware = [
Auth::class => ['except' => ['send','check'] ]
];
/**
* 发送验证码
*
* @param string $mobile 手机号
* @param string $event 事件名称
*/
public function send()
{
$mobile = get_params('mobile');
$event = get_params('event');
$event = $event ? $event : 'register';
if (! $mobile || ! Validate::regex($mobile, "^1\d{10}$")) {
$this->apiError('手机号不正确');
}
$last = Smslib::get($mobile, $event);
if ($last && time() - $last['createtime'] < 60) {
$this->apiError('发送频繁');
}
$ipSendTotal = \app\common\model\Sms::where(['ip' => $this->request->ip()])->whereTime('createtime', '-1 hours')->count();
if ($ipSendTotal >= 5) {
$this->apiError('发送频繁');
}
if ($event) {
$userinfo = Db::table('fa_user')->where('mobile',$mobile)->find();
if ($event == 'register' && $userinfo) {
//已被注册
$this->apiError('已被注册');
} elseif (in_array($event, ['changemobile']) && $userinfo) {
//被占用
$this->apiError('已被占用');
} elseif (in_array($event, ['changepwd', 'resetpwd']) && ! $userinfo) {
//未注册
$this->apiError('未注册');
}
}
if (!Event::hasListener('sms_send')) {
$this->apiError('请在后台插件管理安装短信验证插件');
}
$ret = Smslib::send($mobile, null, $event);
if ($ret) {
$this->apiSuccess('发送成功');
} else {
$this->apiError('发送失败，请检查短信配置是否正确');
}
}
/**
* 检测验证码
*
* @param string $mobile 手机号
* @param string $event 事件名称
* @param string $captcha 验证码
*/
public function check()
{
$mobile = get_params('mobile');
$event = get_params('event');
$event = $event ? $event : 'register';
$captcha = get_params('captcha');
if (! $mobile || ! Validate::regex($mobile, "^1\d{10}$")) {
$this->apiError('手机号不正确');
}
if ($event) {
$userinfo = Db::table('fa_user')->where('mobile',$mobile)->find();
if ($event == 'register' && $userinfo) {
//已被注册
$this->apiError('已被注册');
} elseif (in_array($event, ['changemobile']) && $userinfo) {
//被占用
$this->apiError('已被占用');
} elseif (in_array($event, ['changepwd', 'resetpwd']) && ! $userinfo) {
//未注册
$this->apiError('未注册');
}
}
$ret = Smslib::check($mobile, $captcha, $event);
if ($ret) {
$this->apiSuccess('成功');
} else {
$this->apiError('验证码不正确');
}
}
}

18
app/api/controller/party/Branch.php
View File

@ -45,12 +45,12 @@ class Branch extends BaseController{
}
$select=Db::table('fa_szxc_party_branch')->where($where)
->withAttr('nickname',function ($value, $data){
$find= Db::table('fa_user')->where('id',$data['user_id'])->field('nickname')->find();
return $find?$find['nickname']:'';
$find= Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->value('nickname');
return $find?:'';
})
->withAttr('two_nickname',function ($value, $data){
$find= Db::table('fa_user')->where('id',$data['two_user_id'])->field('nickname')->find();
return $find?$find['nickname']:'';
$find= Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->value('nickname');
return $find?:'';
})
->withAttr('count',function ($value, $data){
$find= Db::table('fa_szxc_party_info')->where('party_branch',$data['id'])->where('branch_type',1)->count();
@ -143,7 +143,7 @@ class Branch extends BaseController{
$branch=Db::table('fa_szxc_party_branch')->where('id',$id)->find();
$select = Db::table('fa_szxc_party_info')->withAttr('user_info', function ($value, $data) {
$find = Db::table('fa_user')->where('id', $data['user_id'])->field('nickname,mobile,avatar')->find();
$find = Db::connect('shop')->table('eb_user')->where('uid', $data['user_id'])->field('nickname,phone mobile,avatar')->find();
return $find;
})
->where($where)->page($page)->limit(20)->select();
@ -178,12 +178,12 @@ class Branch extends BaseController{
public function edit($id){
$find=Db::table('fa_szxc_party_branch')->where('id',$id)->where('status', 1)
->withAttr('nickname',function ($value, $data){
$find= Db::table('fa_user')->where('id',$data['user_id'])->field('nickname')->find();
return $find?$find['nickname']:'';
$find= Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->value('nickname');
return $find?:'';
})
->withAttr('two_nickname',function ($value, $data){
$find= Db::table('fa_user')->where('id',$data['two_user_id'])->field('nickname')->find();
return $find?$find['nickname']:'';
$find= Db::connect('shop')->table('eb_user')->where('uid',$data['two_user_id'])->value('nickname');
return $find?:'';
})->find();
return $this->apiSuccess('ok',$find);

8
app/api/controller/party/BranchPayList.php
View File

@ -43,12 +43,12 @@ class BranchPayList extends BaseController
$find = Db::table('fa_szxc_party_branch_pay_list')->where('branch_id',$value['id'])->where('status', 1)->field('pay,no_pay')->find();
return $find;
})->withAttr('nickname', function ($datas, $value) {
$finds = Db::table('fa_user')->where('id', $value['user_id'])->field('nickname')->find();
return $finds?$finds['nickname']:'';
$finds = Db::connect('shop')->table('eb_user')->where('uid', $value['user_id'])->value('nickname');
return $finds?:'';
})
->withAttr('two_nickname', function ($datas, $value) {
$finds = Db::table('fa_user')->where('id', $value['two_user_id'])->field('nickname')->find();
return $finds?$finds['nickname']:'';
$finds = Db::connect('shop')->table('eb_user')->where('uid', $value['user_id'])->value('nickname');
return $finds?:'';
})
->page($page)->limit(20)->select();
$branch_count = $this->model->where('status', 1)->count();

6
app/api/controller/party/BranchPayUser.php
View File

@ -33,7 +33,7 @@ class BranchPayUser extends BaseController{
['status','=', 1]
];
if ($search!=''){
$userall=Db::table('fa_user')->where('nickname','like', $search . '%')->field('id')->select();
$userall=Db::connect('shop')->table('eb_user')->where('nickname','like', $search . '%')->field('id')->select();
if ($userall){
$ids=[];
foreach ($userall as $user){
@ -50,7 +50,7 @@ class BranchPayUser extends BaseController{
}
$select=Db::table('fa_szxc_party_branch_pay_user')->where($where)
->withAttr('user',function ($value, $data){
$user = Db::table('fa_user')->where('id',$data['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->field('nickname,avatar')->find();
return $user;
})
@ -73,7 +73,7 @@ class BranchPayUser extends BaseController{
if (!$find) return $this->edit('清单数据不存在');
$select=Db::table('fa_szxc_party_info')->where('party_branch',$find['branch_id'])
->withAttr('user_info',function($data,$value){
$user = Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid',$value['user_id'])->field('nickname,avatar')->find();
return $user;
})->field('id,user_id,branch_pay')
->select();

6
app/api/controller/party/Info.php
View File

@ -29,7 +29,7 @@ class Info extends BaseController{
['status','=', 1]
];
if ($search!=''){
$userall=Db::table('fa_user')->where('nickname','like', $search . '%')->field('id')->select();
$userall=Db::connect('shop')->table('eb_user')->where('nickname','like', $search . '%')->field('id')->select();
if ($userall){
$ids=[];
foreach ($userall as $user){
@ -48,7 +48,7 @@ class Info extends BaseController{
}
$select=Db::table('fa_szxc_party_info')->where($where)
->withAttr('user_info',function ($value, $data){
$user = Db::table('fa_user')->where('id',$data['user_id'])->field('nickname,avatar,mobile')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->field('nickname,avatar,phone mobile')->find();
$usermsg = Db::table('fa_szxc_information_usermsg')->where('user_id',$data['user_id'])->field('idcard')->find();
$user['idcard'] =$usermsg?$usermsg['idcard']:'';
return $user;
@ -62,7 +62,7 @@ class Info extends BaseController{
}
public function add($user_id){
$user = Db::table('fa_user')->where('id',$user_id)->field('nickname,avatar,mobile,gender')->find();
$user = Db::connect('shop')->table('eb_user')->where('uid',$user_id)->field('nickname,avatar,phone mobile,gender')->find();
$usermsg = Db::table('fa_szxc_information_usermsg')->where('user_id',$user_id)->field('idcard,age,political_outlook,marriage')->find();
return $this->apiSuccess('ok',['userinfo'=>array_merge($user,$usermsg)]);

3
app/api/controller/party/Vote.php
View File

@ -70,8 +70,7 @@ class Vote extends BaseController{
return $find;
})
->withAttr('nickname',function($value,$data){
$find=Db::table('fa_user')->where('id',$data['user_id'])->field('nickname')->find();
return $find['nickname'];
return Db::connect('shop')->table('eb_user')->where('uid',$data['user_id'])->value('nickname');
})->order('id DESC')
->field('id,title,image,user_id,view,start_time,end_time,agree,opposition,other')->select();
return $this->apiSuccess('ok',['list'=>$select,'count'=>['count'=>$count,'month_count'=>$month_count]]);

6
app/api/controller/party/VoteComment.php
View File

@ -28,7 +28,7 @@ class VoteComment extends BaseController{
public function index($search='',$vote_id=1,$page=1) {
$select=Db::table('fa_szxc_party_vote_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('uid',$value['user_id'])->field('nickname,avatar')->find();
$data = $find;
$data['user_type_info']='党员';
return $data;
@ -44,7 +44,7 @@ class VoteComment extends BaseController{
->where('vote_id', $vote_id)->where('status', 1)->where('type',1)->page($page)->limit(20)->select();
$select_type2=Db::table('fa_szxc_party_vote_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('uid',$value['user_id'])->field('nickname,avatar')->find();
$data = $find;
$data['user_type_info']='党员';
return $data;
@ -60,7 +60,7 @@ class VoteComment extends BaseController{
->where('vote_id', $vote_id)->where('status', 1)->where('type',2)->page($page)->limit(20)->select();
$select_type3=Db::table('fa_szxc_party_vote_comment')
->withAttr('user_info',function ($data,$value){
$find=Db::table('fa_user')->where('id',$value['user_id'])->field('nickname,avatar')->find();
$find=Db::connect('shop')->table('eb_user')->where('uid',$value['user_id'])->field('nickname,avatar')->find();
$data = $find;
$data['user_type_info']='党员';
return $data;