From 5c8062c1f9947acb95f7c5e1b18954681e3d2447 Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 8 Mar 2023 16:37:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=EF=BC=9A$this->request->=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/nk/user/auths.html | 1 - app/api/BaseController.php | 102 ++++++++++++++---------------- app/api/controller/Userinfo.php | 2 +- app/api/middleware.php | 3 +- 4 files changed, 50 insertions(+), 58 deletions(-) diff --git a/app/admin/view/nk/user/auths.html b/app/admin/view/nk/user/auths.html index 567cc53..9a18e30 100644 --- a/app/admin/view/nk/user/auths.html +++ b/app/admin/view/nk/user/auths.html @@ -132,7 +132,6 @@ height: 500 }); - if (area_id != 0) { street(area_id) } diff --git a/app/api/BaseController.php b/app/api/BaseController.php index 823bf71..d8f1be9 100644 --- a/app/api/BaseController.php +++ b/app/api/BaseController.php @@ -80,65 +80,59 @@ abstract class BaseController protected function initialize() { - //每页显示数据量 $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'); + $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'); + try { + JWT::$leeway = 60;//当前时间减去60，把时间留点余地 + $decoded = JWT::decode($token, new Key('ae47e94a7dcd1fdfacb499b60e361a8d', 'HS256')); //HS256方式，这里要和签发的时候对应 + $user=Db::connect('shop')->name('nk_user')->where('user_id',$decoded->jti[0])->find(); + if ($user && $user['n_user_id']!=0){ + $this->request->uid=$user['n_user_id']; + }else{ + $this->request->uid=$this->addUser($decoded->jti[0],$user); + } + //return (array)$decoded; +// $decoded_array = json_decode(json_encode($decoded),TRUE); +// $jwt_data = $decoded_array['data']; -// return json($token); -// JWT::$leeway = 60;//当前时间减去60，把时间留点余地 -// $decoded = JWT::decode($token, new Key('ae47e94a7dcd1fdfacb499b60e361a8d', 'HS256')); //HS256方式，这里要和签发的时候对应 + 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('JWT_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('JWT_UID', ''); + return json(['code'=>404,'msg'=>'token不能为空']); + } -// 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('JWT_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('JWT_UID', ''); -// } - -// 暂时去除 ----------------------------------------------------- } /** diff --git a/app/api/controller/Userinfo.php b/app/api/controller/Userinfo.php index 7617a8b..a55f57a 100644 --- a/app/api/controller/Userinfo.php +++ b/app/api/controller/Userinfo.php @@ -104,7 +104,7 @@ class Userinfo extends BaseController $where['id'] = $this->request->uid; $post['user_id'] = $this->request->uid; $user = Db::table('fa_user')->where($where)->field('id,nickname,group_id,mobile,avatar,username,createtime,score')->find(); - + // 已绑定 if ($user) { Db::startTrans(); diff --git a/app/api/middleware.php b/app/api/middleware.php index e695fbe..5be4973 100644 --- a/app/api/middleware.php +++ b/app/api/middleware.php @@ -6,6 +6,5 @@ return [ //验证勾股cms是否完成安装 \app\home\middleware\Install::class, \app\api\middleware\AllowOriginMiddleware::class, - \app\api\middleware\Auth::class, - + // \app\api\middleware\Auth::class, ]; \ No newline at end of file From cd0ebf8e5bda88fd9f27058610bebd051054b3d5 Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 15 Mar 2023 09:49:43 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BA=9F=E5=BC=83=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/.htaccess | 13 +++++------ public/nginx.htaccess | 51 ------------------------------------------- 2 files changed, 6 insertions(+), 58 deletions(-) diff --git a/public/.htaccess b/public/.htaccess index cbc7868..8932768 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,8 +1,7 @@ - Options +FollowSymlinks -Multiviews - RewriteEngine On - - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L] - + Options +FollowSymlinks -Multiviews + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L] + \ No newline at end of file diff --git a/public/nginx.htaccess b/public/nginx.htaccess index a9942c4..e69de29 100644 --- a/public/nginx.htaccess +++ b/public/nginx.htaccess @@ -1,51 +0,0 @@ -#ļΪNginxα̬ļ PHPCUSTOMٷַhttp://www.phpcustom.com http://www.lccee.com - - - - - -# 301תãԶ޸Ϊ - if ($Host = 'xxx.com'){ - rewrite ^/(.*)$ http://www.phpcustom.com/$1 permanent; - } - - - - - - -#Ϊphpwind9.0α̬,ȥ#Ч -#------------------------------------------------------------------------------------------------ - -# if (-f $request_filename) { -# break; -# } -# if ($request_filename ~* "\.(js|ico|gif|jpe?g|bmp|png|css)$") { -# break; -# } -# if (!-e $request_filename) { -# rewrite . /index.php last; -# } - - - - - -# ThinkPHP V5α̬ʾ ȥ´ǰߵ#żЧ - -#------------------------------------------------------------------------------------------------ -#if (!-e $request_filename) { -# rewrite ^(.*)$ /index.php?s=/$1 last; -# break; -# } - -#------------------------------------------------------------------------------------------------ - - - - - - - - - From b0ae2c70878ba6cb0cb9ed3cd45a81959ba2be8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com> Date: Wed, 15 Mar 2023 16:26:36 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserExtract.php | 149 ++++++++++++ app/admin/controller/supplychain/Merchant.php | 6 +- app/admin/model/UserExtract.php | 102 ++++++++ app/admin/validate/UserExtractValidate.php | 20 ++ app/admin/view/supply_brokerage/datalist.html | 2 +- app/admin/view/supplychain/merchant/bill.html | 14 +- .../view/supplychain/merchant/index.html | 14 +- app/admin/view/user_extract/add.html | 45 ++++ app/admin/view/user_extract/datalist.html | 218 ++++++++++++++++++ app/admin/view/user_extract/edit.html | 45 ++++ app/admin/view/user_extract/read.html | 13 ++ 11 files changed, 611 insertions(+), 17 deletions(-) create mode 100644 app/admin/controller/UserExtract.php create mode 100644 app/admin/model/UserExtract.php create mode 100644 app/admin/validate/UserExtractValidate.php create mode 100644 app/admin/view/user_extract/add.html create mode 100644 app/admin/view/user_extract/datalist.html create mode 100644 app/admin/view/user_extract/edit.html create mode 100644 app/admin/view/user_extract/read.html diff --git a/app/admin/controller/UserExtract.php b/app/admin/controller/UserExtract.php new file mode 100644 index 0000000..1de0be5 --- /dev/null +++ b/app/admin/controller/UserExtract.php @@ -0,0 +1,149 @@ +model = new UserExtractModel(); + $this->uid = get_login_admin('id'); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $param = get_params(); + $where = []; + + $list = $this->model->getUserExtractList($where,$param); + foreach ($list as $k =>$v){ + $list[$k]['uid'] = Db::connect('shop')->table('eb_user')->where('uid',$v['uid'])->value('nickname'); + if($v['extract_type'] == 0){ + $list[$k]['extract_type'] = '银行卡'; + } + if($v['extract_type'] == 1){ + $list[$k]['extract_type'] = '支付宝'; + } + if($v['extract_type'] == 2){ + $list[$k]['extract_type'] = '微信'; + } + if($v['extract_type'] == 3){ + $list[$k]['extract_type'] = '零钱'; + } + + $list[$k]['admin_id'] = Db::connect('shop')->table('eb_system_admin')->where('admin_id',$v['admin_id'])->value('real_name'); + + } + return table_assign(0, '', $list); + } + else{ + return view(); + } + } + + /** + * 添加 + */ + public function add() + { + if (request()->isAjax()) { + $param = get_params(); + + // 检验完整性 + try { + validate(UserExtractValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->addUserExtract($param); + }else{ + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(UserExtractValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->editUserExtract($param); + }else{ + $extract_id = isset($param['extract_id']) ? $param['extract_id'] : 0; + $detail = $this->model->getUserExtractById($extract_id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $extract_id = isset($param['extract_id']) ? $param['extract_id'] : 0; + $detail = $this->model->getUserExtractById($extract_id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + * type=0,逻辑删除，默认 + * type=1,物理删除 + */ + public function del() + { + $param = get_params(); + $extract_id = isset($param['extract_id']) ? $param['extract_id'] : 0; + $type = 1; + + $this->model->delUserExtractById($extract_id,$type); + } +} diff --git a/app/admin/controller/supplychain/Merchant.php b/app/admin/controller/supplychain/Merchant.php index d77e5f8..9e9e74e 100644 --- a/app/admin/controller/supplychain/Merchant.php +++ b/app/admin/controller/supplychain/Merchant.php @@ -129,8 +129,10 @@ class Merchant extends BaseController $total = StoreOrderModel::where($where)->count(); - $list = StoreOrderModel::with(['merchant'])->order('order_id desc')->select(); - + $list = StoreOrderModel::with(['merchant'])->order('order_id desc')->page($params['page'])->limit($params['limit'])->select(); + foreach ($list as $k =>$v){ + $list[$k]['uid'] = Db::connect('shop')->table('eb_user')->where('uid',$v['uid'])->value('nickname'); + } View::assign('url', $this->url); View::assign('list', $list); diff --git a/app/admin/model/UserExtract.php b/app/admin/model/UserExtract.php new file mode 100644 index 0000000..45883eb --- /dev/null +++ b/app/admin/model/UserExtract.php @@ -0,0 +1,102 @@ +field('extract_id,extract_id,uid,extract_sn,real_name,extract_type,bank_code,bank_address,alipay_code,wechat,extract_pic,extract_price,balance,mark,admin_id,fail_msg,status_time,create_time,status,bank_name')->order($order)->paginate($rows, false, ['query' => $param]); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function addUserExtract($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = self::strict(false)->field(true)->insertGetId($param); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editUserExtract($param) + { + try { + $param['update_time'] = time(); + self::where('extract_id', $param['extract_id'])->strict(false)->field(true)->update($param); + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getUserExtractById($id) + { + $info = self::where('extract_id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delUserExtractById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + self::where('extract_id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + self::where('extract_id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } +} + diff --git a/app/admin/validate/UserExtractValidate.php b/app/admin/validate/UserExtractValidate.php new file mode 100644 index 0000000..de6ec0f --- /dev/null +++ b/app/admin/validate/UserExtractValidate.php @@ -0,0 +1,20 @@ + 'require', +]; + + protected $message = [ + 'extract_id.require' => 'ID不能为空', +]; +} \ No newline at end of file diff --git a/app/admin/view/supply_brokerage/datalist.html b/app/admin/view/supply_brokerage/datalist.html index d61742a..efe1796 100644 --- a/app/admin/view/supply_brokerage/datalist.html +++ b/app/admin/view/supply_brokerage/datalist.html @@ -19,7 +19,7 @@ {/block} diff --git a/app/admin/view/supplychain/merchant/bill.html b/app/admin/view/supplychain/merchant/bill.html index d1e1ab5..404208c 100644 --- a/app/admin/view/supplychain/merchant/bill.html +++ b/app/admin/view/supplychain/merchant/bill.html @@ -21,13 +21,13 @@ - + + + + + + + - + + + + + + + +{/block} + \ No newline at end of file diff --git a/app/admin/view/user_extract/datalist.html b/app/admin/view/user_extract/datalist.html new file mode 100644 index 0000000..d326138 --- /dev/null +++ b/app/admin/view/user_extract/datalist.html @@ -0,0 +1,218 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/user_extract/edit.html b/app/admin/view/user_extract/edit.html new file mode 100644 index 0000000..b37f699 --- /dev/null +++ b/app/admin/view/user_extract/edit.html @@ -0,0 +1,45 @@ +{extend name="common/base"/} + +{block name="body"} +
+

编辑用户提现表

+ + + + +
ID*
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/user_extract/read.html b/app/admin/view/user_extract/read.html new file mode 100644 index 0000000..9099df0 --- /dev/null +++ b/app/admin/view/user_extract/read.html @@ -0,0 +1,13 @@ +{extend name="common/base"/} + +{block name="body"} +
+

用户提现表详情

+ + + + +
ID{$detail.extract_id}
+
+{/block} + \ No newline at end of file From 489ee32f99820be2313db1227a4efd8de7cc8f57 Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 15 Mar 2023 17:03:31 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Revert=20"=E5=BA=9F=E5=BC=83=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cd0ebf8e5bda88fd9f27058610bebd051054b3d5. --- public/.htaccess | 13 ++++++----- public/nginx.htaccess | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/public/.htaccess b/public/.htaccess index 8932768..cbc7868 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,7 +1,8 @@ - Options +FollowSymlinks -Multiviews - RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L] - \ No newline at end of file + Options +FollowSymlinks -Multiviews + RewriteEngine On + + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L] + diff --git a/public/nginx.htaccess b/public/nginx.htaccess index e69de29..a9942c4 100644 --- a/public/nginx.htaccess +++ b/public/nginx.htaccess @@ -0,0 +1,51 @@ +#ļΪNginxα̬ļ PHPCUSTOMٷַhttp://www.phpcustom.com http://www.lccee.com + + + + + +# 301תãԶ޸Ϊ + if ($Host = 'xxx.com'){ + rewrite ^/(.*)$ http://www.phpcustom.com/$1 permanent; + } + + + + + + +#Ϊphpwind9.0α̬,ȥ#Ч +#------------------------------------------------------------------------------------------------ + +# if (-f $request_filename) { +# break; +# } +# if ($request_filename ~* "\.(js|ico|gif|jpe?g|bmp|png|css)$") { +# break; +# } +# if (!-e $request_filename) { +# rewrite . /index.php last; +# } + + + + + +# ThinkPHP V5α̬ʾ ȥ´ǰߵ#żЧ + +#------------------------------------------------------------------------------------------------ +#if (!-e $request_filename) { +# rewrite ^(.*)$ /index.php?s=/$1 last; +# break; +# } + +#------------------------------------------------------------------------------------------------ + + + + + + + + + From b6bc7746a28623077ac31b157943ca1fcc5c331a Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 15 Mar 2023 17:10:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?Revert=20"Revert=20"=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=88?= =?UTF-8?q?=E5=B9=B6""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 489ee32f99820be2313db1227a4efd8de7cc8f57. --- public/.htaccess | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/public/.htaccess b/public/.htaccess index cbc7868..8932768 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,8 +1,7 @@ - Options +FollowSymlinks -Multiviews - RewriteEngine On - - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L] - + Options +FollowSymlinks -Multiviews + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L] + \ No newline at end of file From d301d2eb9ff6cb10829a19688f12f1b8ca333ffe Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 15 Mar 2023 18:07:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/BaseController.php | 3 --- app/api/middleware.php | 5 ----- 2 files changed, 8 deletions(-) diff --git a/app/api/BaseController.php b/app/api/BaseController.php index 4f36c9d..55d2299 100644 --- a/app/api/BaseController.php +++ b/app/api/BaseController.php @@ -133,8 +133,6 @@ abstract class BaseController return json(['code'=>404,'msg'=>'token不能为空']); } -<<<<<<< HEAD -======= // return $decoded->jti[0]; // exit; // //var_dump($config);exit; @@ -175,7 +173,6 @@ abstract class BaseController // } // 暂时去除 ----------------------------------------------------- ->>>>>>> master } /** diff --git a/app/api/middleware.php b/app/api/middleware.php index 13e3f70..91dea02 100644 --- a/app/api/middleware.php +++ b/app/api/middleware.php @@ -6,9 +6,4 @@ return [ //验证勾股cms是否完成安装 \app\home\middleware\Install::class, \app\api\middleware\AllowOriginMiddleware::class, -<<<<<<< HEAD - // \app\api\middleware\Auth::class, -======= - ->>>>>>> master ]; \ No newline at end of file From 4432c47dd0683ffc99c7511329e85420ed2ed66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com> Date: Thu, 16 Mar 2023 10:50:58 +0800 Subject: [PATCH 7/7] 1 --- app/api/route/api.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/api/route/api.php b/app/api/route/api.php index a0218d2..16bed8c 100644 --- a/app/api/route/api.php +++ b/app/api/route/api.php @@ -2,6 +2,7 @@ use think\facade\Route; Route::group('/',function () { Route::get('ArticleComment/isread', 'ArticleComment/isread'); + Route::get('ArticleComment/one list', 'ArticleComment/OneList'); Route::get('Village/get_my_village', 'Village/get_my_village'); Route::get('Village/get_my_town', 'Village/get_my_town'); Route::get('Userinfo/get_ranking', 'Userinfo/get_ranking'); @@ -114,6 +115,7 @@ Route::group('/',function () { //红白喜事轮播图 Route::get('Slide/get_slide_two', 'Slide/get_slide_two'); Route::get('User/index', 'User/index'); + Route::get('Village/thumbs_up', 'Village/thumbs_up'); })->middleware(\app\api\middleware\Auth::class); Route::group('/',function () { @@ -156,7 +158,7 @@ Route::group('/',function () { Route::get('Village/get_ranking_list', 'Village/get_ranking_list'); Route::get('Census/get_list', 'Census/get_list'); Route::get('Village/get_village', 'Village/get_village'); - Route::get('Village/thumbs_up', 'Village/thumbs_up'); + Route::get('Village/get_detail', 'Village/get_detail'); Route::get('Village/get_list', 'Village/get_list'); Route::get('Village/get_json', 'Village/get_json');