Browse Source

9/18/2251

panlumeng 3 years ago
parent
commit
a58ef8cc16
6 changed files with 286 additions and 127 deletions
  1. 3 1
      .gitignore
  2. 162 0
      app/Admin/controller/Newfill.php
  3. 8 1
      app/Admin/route/app.php
  4. 38 11
      app/common.php
  5. 74 113
      composer.lock
  6. 1 1
      public/nginx.htaccess

+ 3 - 1
.gitignore

@@ -2,4 +2,6 @@
 /.vscode
 /vendor
 *.log
-/config
+/config
+composer.lock
+/public/nginx.htaccess

+ 162 - 0
app/Admin/controller/Newfill.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace app\Admin\controller;
+
+use app\BaseController;
+use think\App;
+use think\facade\Db;
+
+class Newfill extends BaseController
+{
+    public $post = "";
+
+
+
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->post = $this->request->post();
+    }
+    public function list()
+    {
+        $page = isset($this->post['page']) && $this->post['page'] != "" ? intval($this->post['page']) : 1;
+        $size = isset($this->post['size']) && $this->post['size'] != "" ? intval($this->post['size']) : 10;
+        $condition = ['pid'=>0];
+        $count = Db::name("company_item")->where($condition)->count();
+        $page >= ceil($count / $size) ? $page = ceil($count / $size) : " ";
+        $list = Db::name("company_item")->where($condition)->page($page, $size)->select();
+//        $this->carray($this->treelist);
+//        var_dump($this->carray($this->treelist));
+        $data=[];
+        $act=[];
+        foreach ($list as $value){
+           // crea($value);
+       // var_dump($value);
+        $data[]=  crea($value);;
+        }
+       // array_walk($data,function (&$value){
+            //$value['child']= array_values($value['child']);
+       // });
+        return app_show(0,"获取成功",array_values($data));
+    }
+    public function add(){
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+
+        $item_name=isset($this->post['name']) && $this->post['name'] !==""? trim($this->post['name']) :"";
+        if($item_name==""){
+            return error_show(0,"部门名称不能为空");
+        }
+        $repeat_name = Db::name("company_item")->where(["is_del"=>0,"name"=>$item_name])->find();
+        if(!empty($repeat_name)){
+            return error_show(1004,"部门名称已存在");
+        }
+        $pid = isset($this->post['pid']) && $this->post['pid'] !==""? trim($this->post['pid']):"0";
+        $level = isset($this->post['level']) && $this->post['level'] !==""? trim($this->post['level']):"1";
+        $weight = isset($this->post['weight']) && $this->post['weight'] !==""? trim($this->post['weight']):"1";
+        try{
+
+            $data =[
+                "name"=>$item_name, "pid"=>$pid, "level"=>$level, "weight"=>$weight,
+                "is_del"=>0,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+
+                Db::name("company_item")->insert($data);
+                return error_show(0,"添加成功");
+
+        }catch (\Exception $e){
+
+            return error_show(1003,$e->getMessage());
+        }
+    }
+    public function refresh(){
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+      $id = isset($this->post['id'])?intval($this->post['id']):"";
+      $items = Db::name("company_item")->where("id","=",$id)->find();
+      if($items==false){
+          return error_show(1003,"部门信息不存在");
+      }
+      $itemname=isset($this->post['name'])? trim($this->post['name']):"";
+      if($itemname==""){
+          return error_show(1002,"部门名称不能为空");
+      }
+        $repeat_name = Db::name("company_item")->where(["is_del"=>0,"name"=>$itemname])->where('id','<>',$id)->find();
+      //echo Db::name("company_item")->getLastSql();
+        if(!empty($repeat_name)){
+            return error_show(1004,"部门名称已存在");
+        }
+      $itemlevel = isset($this->post['level'])? intval($this->post['level']):"";
+        if($itemlevel==""){
+            return error_show(1002,"部门层级不能为空");
+        }
+        $depart_link = isset($this->post['depart_link']) ? trim($this->post['depart_link']):"";
+        if($depart_link==""){
+            return error_show(1002,"快速查询不能为空");
+        }
+        $item=[
+        "id"=>$id,
+        "name"=>$itemname,
+        "level"=>$itemlevel,
+        "depart_link"=>$depart_link, "updatetime"=>date("Y-m-d H:i:s")
+
+        ];
+      $re = Db::name("company_item")->save($item);
+      return $re ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
+    }
+    public function query(){
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+
+        $dati = Db::name("company_item")->where(['pid'=>0,'is_del'=>0])->order("weight desc")->select();
+        $k=[];
+        foreach ($dati as $key=>$value){
+            $temp=[];
+            $temp= Db::name("company_item")->where(['pid'=>$value['id'],'is_del'=>0])->order("weight desc")->select();
+            $value['child'] =$temp;
+            $k[]=$value;
+        }
+        return app_show(0,"获取成功",$k);
+    }
+
+    public function itemdel(){
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+        $id = isset($this->post['id']) ? intval($this->post['id']):"";
+        $items = Db::name("company_item")->where(['is_del'=>0,'id'=>$id])->find();
+        if($items==false){
+            return error_show(1003,"部门信息不存在");
+        }
+        $items['is_del']=1;
+        $items['updatetime']=date("Y-m-d H:i:s");
+        $result = Db::name("company_item")->save($items);
+        return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
+    }
+
+}

+ 8 - 1
app/Admin/route/app.php

@@ -12,6 +12,7 @@ use think\facade\Route;
 
 Route::rule('menu', 'Admin/Menu/list');
 //Route::rule('menuadd', 'Admin/Menu/MenuAdd');
+
 Route::rule('menusave', 'Admin/Menu/MenuEdit');
 Route::rule('menudel', 'Admin/Menu/MenuDel');
 Route::rule('menustatus', 'Admin/Menu/MenuStatus');
@@ -35,4 +36,10 @@ Route::rule('roleall', 'Admin/Role/RoleAll');
 Route::rule('roleinfo', 'Admin/Role/RoleInfo');
 Route::rule('roleadd', 'Admin/Role/RoleAdd');
 Route::rule('rolesave', 'Admin/Role/RoleSave');
-Route::rule('rolestatus', 'Admin/Role/RoleStatus');
+Route::rule('rolestatus', 'Admin/Role/RoleStatus');
+
+Route::rule('newfillcarray','Admin/Newfill/list');
+Route::rule('add','Admin/Newfill/add');
+Route::rule('refresh',"Admin/Newfill/refresh");
+Route::rule('query','Admin/Newfill/query');
+Route::rule('itemdel','Admin/Newfill/itemdel');

+ 38 - 11
app/common.php

@@ -2,6 +2,7 @@
 // 应用公共文件
 
 use think\facade\Config;
+use think\facade\Db;
 // 应用公共文件
 function app_show($code=0,$message="",$data=[]){
     $result = ['code'=>$code,"message"=>$message,"data"=>$data];
@@ -174,31 +175,57 @@ function randomkeys($length) {
         $returnStr .= $pattern[mt_rand ( 0, strlen($pattern)-1 )]; //生成php随机数
     }
     return $returnStr;
+}
+function tree(){
+
 }
 /**
  * @param $files
  * @return array
  */
-function UploadImg($files){
+function UploadImg($files)
+{
     $savename = [];
-    $files= !is_array($files) ? [$files] : $files;
-    try{
+    $files = !is_array($files) ? [$files] : $files;
+    try {
         //验证
-        validate(['imgFile'=>['fileSize'=>10240000,'fileExt'=>'jpg,jpeg,png,bmp,gif', 'fileMime'=>'image/jpeg,image/png,image/gif']])->check(['imgFile'=>$files]);
+        validate(['imgFile' => ['fileSize' => 10240000, 'fileExt' => 'jpg,jpeg,png,bmp,gif', 'fileMime' => 'image/jpeg,image/png,image/gif']])->check(['imgFile' => $files]);
 
-        foreach($files as $file){
-            $url= Filesystem::disk('public')->putFile( 'topic/'.date("Ymd"), $file,function ()use($file){
-                return str_replace('.'.$file->getOriginalExtension(),'',$file->getOriginalName()."_".date('YmdHis'));
+        foreach ($files as $file) {
+            $url = Filesystem::disk('public')->putFile('topic/' . date("Ymd"), $file, function () use ($file) {
+                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
             });
-            $name = str_replace('.'.$file->getOriginalExtension(),'',$file->getOriginalName());
-            $temp = ["url"=>$url,"name"=>$name];
-            $savename[]=$temp;
+            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
+            $temp = ["url" => $url, "name" => $name];
+            $savename[] = $temp;
         }
 
         return $savename;
-    }catch (\think\exception\ValidateException $e) {
+    } catch (\think\exception\ValidateException $e) {
 
         return $e->getMessage();
     }
 
 }
+
+/**
+ * @param $data
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ */
+function crea($data)
+{
+    $db = Db::name("company_item")->where(['pid'=>$data['id'],'is_del'=>0])->select()->toArray();
+   if(empty($db)){
+       $data['child']=[];
+      return $data;
+   }
+
+   //var_dump($db);
+    foreach ($db as $p){
+        $data['child'][]=crea($p);;
+    }
+    return $data;
+}
+

+ 74 - 113
composer.lock

@@ -18,13 +18,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea",
                 "reference": "18634df356bfd4119fe3d6156bdb990c414c14ea",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
@@ -94,6 +88,10 @@
                 "sftp",
                 "storage"
             ],
+            "support": {
+                "issues": "https://github.com/thephpleague/flysystem/issues",
+                "source": "https://github.com/thephpleague/flysystem/tree/1.1.5"
+            },
             "funding": [
                 {
                     "url": "https://offset.earth/frankdejonge",
@@ -114,13 +112,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff",
                 "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "league/flysystem": "~1.0",
@@ -153,6 +145,10 @@
                 }
             ],
             "description": "An adapter decorator to enable meta-data caching.",
+            "support": {
+                "issues": "https://github.com/thephpleague/flysystem-cached-adapter/issues",
+                "source": "https://github.com/thephpleague/flysystem-cached-adapter/tree/master"
+            },
             "time": "2020-07-25T15:56:04+00:00"
         },
         {
@@ -167,13 +163,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
                 "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
@@ -201,6 +191,10 @@
                 }
             ],
             "description": "Mime-type detection for Flysystem",
+            "support": {
+                "issues": "https://github.com/thephpleague/mime-type-detection/issues",
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0"
+            },
             "funding": [
                 {
                     "url": "https://github.com/frankdejonge",
@@ -225,13 +219,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
                 "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
@@ -263,6 +251,9 @@
                 "psr",
                 "psr-6"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
             "time": "2016-08-06T20:24:11+00:00"
         },
         {
@@ -277,13 +268,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.2.0"
@@ -313,6 +298,10 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
             "time": "2021-03-05T17:36:06+00:00"
         },
         {
@@ -327,13 +316,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
                 "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
@@ -366,6 +349,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "time": "2021-05-03T11:20:27+00:00"
         },
         {
@@ -380,13 +366,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
                 "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
@@ -420,6 +400,9 @@
                 "psr-16",
                 "simple-cache"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/master"
+            },
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
@@ -434,13 +417,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/top-think/framework/zipball/0b5fb453f0e533de3af3a1ab6a202510b61be617",
                 "reference": "0b5fb453f0e533de3af3a1ab6a202510b61be617",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "ext-json": "*",
@@ -487,6 +464,10 @@
                 "orm",
                 "thinkphp"
             ],
+            "support": {
+                "issues": "https://github.com/top-think/framework/issues",
+                "source": "https://github.com/top-think/framework/tree/v6.0.9"
+            },
             "time": "2021-07-22T03:24:49+00:00"
         },
         {
@@ -501,13 +482,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/top-think/think-helper/zipball/f98e3ad44acd27ae85a4d923b1bdfd16c6d8d905",
                 "reference": "f98e3ad44acd27ae85a4d923b1bdfd16c6d8d905",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1.0"
@@ -532,6 +507,10 @@
                 }
             ],
             "description": "The ThinkPHP6 Helper Package",
+            "support": {
+                "issues": "https://github.com/top-think/think-helper/issues",
+                "source": "https://github.com/top-think/think-helper/tree/v3.1.5"
+            },
             "time": "2021-06-21T06:17:31+00:00"
         },
         {
@@ -546,13 +525,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/ccaad7c2d33f42cb1cc2a78d6610aaec02cea4c3",
                 "reference": "ccaad7c2d33f42cb1cc2a78d6610aaec02cea4c3",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1.0",
@@ -582,6 +555,10 @@
                 }
             ],
             "description": "thinkphp6 multi app support",
+            "support": {
+                "issues": "https://github.com/top-think/think-multi-app/issues",
+                "source": "https://github.com/top-think/think-multi-app/tree/master"
+            },
             "time": "2020-07-12T13:50:37+00:00"
         },
         {
@@ -596,13 +573,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/top-think/think-orm/zipball/5d3d5c1ebf8bfccf34bacd90edb42989b16ea409",
                 "reference": "5d3d5c1ebf8bfccf34bacd90edb42989b16ea409",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "ext-json": "*",
@@ -639,6 +610,10 @@
                 "database",
                 "orm"
             ],
+            "support": {
+                "issues": "https://github.com/top-think/think-orm/issues",
+                "source": "https://github.com/top-think/think-orm/tree/v2.0.44"
+            },
             "time": "2021-07-21T02:22:31+00:00"
         }
     ],
@@ -655,13 +630,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
                 "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
@@ -710,6 +679,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -738,13 +710,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
                 "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
@@ -789,6 +755,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -817,13 +786,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
                 "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
@@ -875,6 +838,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -903,13 +869,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7f65c44c2ce80d3a0fcdb6385ee0ad535e45660c",
                 "reference": "7f65c44c2ce80d3a0fcdb6385ee0ad535e45660c",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
@@ -967,6 +927,9 @@
                 "debug",
                 "dump"
             ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v4.4.30"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -995,13 +958,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/top-think/think-trace/zipball/9a9fa8f767b6c66c5a133ad21ca1bc96ad329444",
                 "reference": "9a9fa8f767b6c66c5a133ad21ca1bc96ad329444",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "shasum": ""
             },
             "require": {
                 "php": ">=7.1.0",
@@ -1034,6 +991,10 @@
                 }
             ],
             "description": "thinkphp debug trace",
+            "support": {
+                "issues": "https://github.com/top-think/think-trace/issues",
+                "source": "https://github.com/top-think/think-trace/tree/v1.4"
+            },
             "time": "2020-06-29T05:27:28+00:00"
         }
     ],
@@ -1046,5 +1007,5 @@
         "php": ">=7.1.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.1.0"
 }

+ 1 - 1
public/nginx.htaccess

@@ -1,4 +1,4 @@
 if (!-e $request_filename) {
    rewrite  ^/(.*)$  /index.php/$1  last;
    break;
-}
+}