Browse Source

Merge branch 'plm'

wugg 3 years ago
parent
commit
0c22e8adfb

+ 1 - 1
.gitignore

@@ -3,4 +3,4 @@
 /vendor
 *.log
 /config
-/config/
+

+ 21 - 92
app/admin/controller/Action.php

@@ -45,47 +45,35 @@ class Action extends BaseController
 
     public function ActionSave(){
         $post  =$this->request->post();
-        $actionid = isset($post['id']) ? intval($post['id']) : "";
-        if($actionid!=""){
-            $isf= Db::name("action_list")->where("id","=",$actionid)->find();
-            if($isf==false){
-                return error_show(1005,"未找到数据");
-            }
+        $actid = isset($post['id']) ? intval($post['id']) : "";
+        if($actid==""){
+            return error_show(1001,'功能id不能为空');
         }
-        $action = isset($post['action_name']) ? trim($post['action_name']) : "";
-        if($action==""){
-            return error_show(1003,'功能名称不能为空');
+        $menuid = isset($post['menuid']) ? intval($post['menuid']) : "";
+        if($menuid==""){
+            return error_show(1001,'页面menuid不能为空');
         }
-        $desc = isset($post['action_desc']) ? trim($post['action_desc']) : "";
-        $status = isset($post['status']) ? intval($post['status']) : 0;
-        $data=[
-            "action_name"=>$action,
-            "action_desc"=>$desc,
-            "action_code"=>"",
-        ];
 
-        $isTrue =  Db::name("action_list")->where(["action_name"=>$action])->find();
-        if($isTrue){
-            if($isTrue['id']!=$actionid || $actionid==""){
-                return error_show(1003,'功能名称不能重复');
-            }
+        $code = isset($post['action_code']) ? trim($post['action_code']) : "";
+        $status = isset($post['status']) ? intval($post['status']) : 1;
+        if($code==""){
+            return error_show(1002,'功能code不能为空');
+        }
+        $istrue =Db::name("action")->where(['menuid'=>$menuid,"action_code"=>$code])->find();
+        if($istrue && $istrue['id']!=$actid){
+            return error_show(1005,'此功能已存在');
         }
-
         try{
-            $message = "";
-            if($actionid==""){
-                $data['status']=$status;
-                $data['is_show']=1;
-                $message = "新建成功";
+            $data = ['action_code'=>$code,'status'=>$status,"updatetime"=>date("Y-m-d H:i:s")];
+            $result=Db::name("action")->where("id","=",$actid)->save($data);
+            if($result){
+                return app_show(0,"更新成功");
             }else{
-                $data['status']=$status;
-                $data['id']=$actionid;
-                $message = "更新成功";
+                return error_show(1004,"更新失败");
             }
-            Db::name("action_list")->save($data);
-            return app_show(0,$message);
+
         }catch (\Exception $e){
-            return  error_show(1005,$e->getMessage());
+            return error_show(1003,$e->getMessage());
         }
     }
 
@@ -142,63 +130,4 @@ class Action extends BaseController
         }
     }
 
-    /**
-     * @return \think\response\Json
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index(){
-        $post  =$this->request->post();
-        $data = Db::name("admin_menu")->where(["pid"=>0,"status"=>1])->select();
-        $result = [];
-        if(empty($data)){
-            return app_show(0,"获取成功",$result);
-        }
-        foreach ($data as $key=>$val){
-            $val["child"]=[];
-            $result[$val['id']] =$val;
-        }
-
-        $child =Db::name("admin_menu")->where("pid","<>",0)->where('status',"=",1)->select();
-        foreach ($child as $k=>$value){
-            // $act = PasAction::all(['menuid'=>$value['id'],"status"=>1]);
-            $act =Db::name("action")->alias("a")->leftJoin("action_list l","a.action_code=l.action_code")->field
-            ("a.*,action_name")->where(['a.menuid'=>$value['id'],"a.status"=>1])->select();
-            $act_data = Db::name("action_field")->where(['menuid'=>$value['id'],"status"=>1])->select();
-            $value['action'] = $act;
-            $value['action_data'] = $act_data;
-            if(array_key_exists($value['pid'],$result)){
-                $result[$value['pid']]["child"][]=$value;
-            }
-        }
-
-        return app_show(0,"获取成功",array_values($result));
-    }
-
-    /**@param id menu 主键id
-     * @return \think\response\Json
-     * @throws \think\exception\DbException
-     */
-    public function ActionInfo(){
-        $post  =$this->request->post();
-        $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($post['id'])? intval($post['id']) :"";
-        if($id==""){
-            return error_show(1002,'功能id不能为空');
-        }
-        $menu =  Db::name("action_list")->where("id","=",$id)->find();
-        if(empty($menu)){
-            return error_show(1003,"未找到对应的数据");
-        }
-        return app_show(0,"获取成功!",$menu);
-    }
 }

+ 133 - 0
app/admin/controller/Departuser.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\BaseController;
+use think\App;
+use think\db\Where;
+use think\facade\Db;
+class Departuser 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;
+        $us=[];
+        $count = Db::name("depart_user")->where($us)->count();
+        $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
+        $list =  Db::name("depart_user")->alias('b')->join('company_item a','a.id=b.itemid','left')
+            ->field('a.name,b.itemid,b.uid,b.nickname')->where($us)->page($page,$size)->select();
+       $i=[];
+        foreach ($list as $p){
+            $tips = Db::name('depart_tips')->where(['is_del'=>0,'depart_uid'=>$p['uid']])->select();
+           $p['total_tips']=$tips;
+           $i[]=$p;
+        }
+        return app_show(0, '信息获取成功', ['list' => $i, 'count' => $count]);
+        }
+        /*添加*/
+    public function attend(){
+        $uid = isset($this->post['uid']) && $this->post['uid'] !==""? trim($this->post['uid']):"";
+        if($uid==""){
+            return error_show(1004,"员工id不能为空");
+        }
+        $nickname = isset($this->post['nickname']) && $this->post['nickname'] !==""? trim($this->post['nickname']):"";
+        if($nickname==""){
+            return error_show(1004,"员工名称不能为空");
+        }
+        $itemid = isset($this->post['itemid']) && $this->post['itemid'] !==""? trim($this->post['itemid']):"";
+        if($itemid==""){
+            return error_show(1004,"部门不能为空");
+        }
+        $tid = Db::name('company_item')->where(['id'=>$itemid,'is_del'=>0])->find();
+        //var_dump( Db::name('company_item')->getLastSql());
+        if(empty($tid)){
+            return error_show(1004,"部门不能为空");
+        }
+       $status = isset($this->post['status']) && $this->post['status'] !==""? trim($this->post['status']) : "1";
+        if($status==""){
+            return error_show(0,"状态不能为空");
+        }
+        //$stats['status_n'] = $status==1?"在职": $status==2? "离职":"在职";
+
+        try{
+            $data = [
+                'uid'=>$uid,'nickname'=>$nickname,'itemid'=>$itemid,
+                'is_del'=>0,'status'=>$status,
+                'addtime'=>date("Y-m-d h:i:s"),
+                'updatetime'=>date("Y-m-d h:i:s")
+            ];
+            Db::name('depart_user')->insert($data);
+      return error_show(0,"添加成功");
+        }catch (\Exception $e){
+            return error_show(1003,$e->getMessage());
+        }
+    }
+    /*编辑*/
+    public function useredit(){
+        $id = isset($this->post['id']) &&$this->post['id'] !==""? trim($this->post['id']):"";
+        if($id ==""){
+            return error_show(1004,"id不能为空");
+        }
+        $uid = isset($this->post['uid']) && $this->post['uid'] !==""? trim($this->post['uid']):"";
+        if($uid ==""){
+            return error_show(1004,"员工id不能为空");
+        }
+        $nickname = isset($this->post['nickname']) && $this->post['nickname'] !==""?($this->post)['nickname']: "";
+        $itemid = isset($this->post['itemid']) && $this->post['itemid'] !==""?($this->post)['itemid']: "";
+        if($itemid==""){
+            return error_show(1004,"部门id不能为空");
+        }
+        $repeat_itemid = Db::name("depart_user")->where(["is_del"=>0,"itemid"=>$itemid])->where('id','<>',$id)->find();
+        if(!empty($repeat_itemid)){
+            return error_show(1004,"部门id已存在");
+        }
+        try{
+            $d=[
+                'uid'=>$uid,'nickname'=>$nickname,'itemid'=>$itemid,
+                'is_del'=>0,'addtime'=>date("Y-m-d h:i:s"),
+                'updatetime'=>date("Y-m-d h:i:s"),
+            ];
+            $r = Db::name("depart_user")->where(["is_del"=>0,"itemid"=>$itemid])->update($d);
+            return  $r ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
+        }catch (\Exception $e){
+            return error_show(1003,$e->getMessage());
+        }
+    }
+    /*查询*/
+    public function found(){
+        $id = isset($this->post['uid'])&& $this->post['uid'] !==""? trim($this->post['uid']) : "";
+        if($id==""){
+            return error_show(1004,'员工不能为空');
+        }
+
+        $fo = Db::name('depart_user')->alias('a')->join('company_item b',"b.id=a.uid",'left')
+            ->field('a.uid,a.itemid')->where(['uid'=>$id,'a.is_del'=>0,'b.is_del'=>0])->find();
+        //var_dump( Db::name('depart_user')->getLastSql());
+        if(empty($fo)){
+            return error_show(1004,"信息获取失败");
+        }
+        $fi = Db::name('depart_tips')->field('year,month,total_tips')->where(['depart_uid'=>$id,'is_del'=>0])->select();
+       $fo['depart_user']=$fi;
+        return app_show(0,"获取成功",$fo);
+    }
+    /*删除*/
+    public function userdel(){
+        $uid = isset($this->post['uid']) && $this->post['uid'] !==""? trim($this->post['uid']) :"";
+        $de = Db::name('depart_user')->where(['is_del'=>0,'uid'=>$uid])->find();
+        if($de==false){
+            return error_show(1004,"员工信息不存在");
+        }
+        $de['is_del']=1;
+        $de['updatetime']= date("Y-m-d H:i:s");
+        $back = Db::name('depart_user')->save($de);
+       // var_dump(Db::name('depart_user')->getLastSql());
+        return $back ? app_show(0,"删除成功") :error_show(1004,"删除失败");
+    }
+}

+ 186 - 0
app/admin/controller/Newfill.php

@@ -0,0 +1,186 @@
+<?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']):"";
+        if($pid==""){
+            return error_show(1002,"父级id不能为空");
+        }
+        $spid = Db::name('company_item')->where(['pid'=>0,'is_del'=>0])->find();
+        $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";
+        Db::startTrans();
+        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"),
+
+            ];
+
+            $t= Db::name("company_item")->insert($data,true);
+            if($t>0){
+                $depart_link=$spid['depart_link']."{$t}-";
+                $level =explode('-',$depart_link);
+                $level = array_filter($level);
+                $level= count($level);
+                $i=['depart_link'=>$depart_link,'level'=>$level];
+                $o=Db::name('company_item')->where(['id'=>$t])->update($i);
+                if($o){
+                   Db::commit();
+                   return error_show(0,"添加成功");
+                }
+            }
+            Db::rollback();
+
+        }catch (\Exception $e){
+            Db::rollback();
+            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,"部门信息不存在");
+      }
+        $pid = isset($this->post['pid']) && $this->post['pid'] !==""? trim($this->post['pid']):"";
+      if($pid==""){
+          return error_show(1002,"父级id不能为空");
+      }
+      $spid = Db::name('company_item')->where(['pid'=>0,'is_del'=>0])->find();
+      if(empty($spid)){
+          return error_show(1004,"父级id不能为空");
+      }
+      $weight = isset($this->post['weight']) && $this->post['weight'] !==""? trim($this->post['weight']):"1";
+      $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,"部门名称已存在");
+        }
+        $depart_link=$spid['depart_link']."{$id}-";
+        $itemlevel =explode('-',$depart_link);
+       $itemlevel = array_filter($itemlevel);
+        $itemlevel= count($itemlevel);
+
+        $item=[
+        "id"=>$id,
+        "name"=>$itemname,
+        "updatetime"=>date("Y-m-d H:i:s"),
+            "weight"=>$weight,"pid"=>$pid,
+            'depart_link'=>$depart_link,
+            'level'=>$itemlevel
+        ];
+      $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,"删除失败");
+    }
+}

+ 54 - 138
app/admin/controller/User.php

@@ -4,9 +4,7 @@ declare (strict_types = 1);
 namespace app\admin\controller;
 
 use app\BaseController;
-use think\App;
-use think\facade\Db;
-
+use think\Request;
 
 class User extends BaseController
 {
@@ -15,9 +13,8 @@ class User extends BaseController
      *
      * @return \think\Response
      */
-    public function __construct(App $app)
+    public function list()
     {
-        parent::__construct($app);
         $post  =$this->request->post();
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
@@ -27,160 +24,79 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
-    }
-
-    public function list()
-    {
-        $post  =$this->request->post();
-
         $page = isset($post['page'])&& $post['page']!='' ? intval($post['page']) : 1;
         $size = isset($post['size'])&& $post['size']!='' ? intval($post['size']) : 10;
         $condition = ['page'=>$page,'size'=>$size];
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        $data = Getlist($token,$condition);
+        $data = GetUserlist($token,$condition);
         if(!empty($data) && $data['code']!=0){
-            return error_show($data['code'],$data['message']);
-        }
-        $list=[];
-        foreach($data['data']['list'] as $key=>$value){
-            $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
-                ->field("roleid,role_name")->find();
-            $value['roleid'] = isset($role['roleid']) ? $role['roleid'] :"";
-            $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
-            $list[]=$value;
+            return error_show($effetc['code'],$effetc['message']);
         }
-        $data['data']['list'] = $list;
         return app_show($data['code'],$data['message'],$data['data']);
     }
 
     /**
-     * @param token
-     * @return \think\response\Json
-     * @throws \think\exception\DbException
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
      */
-    public function userInfo(){
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        $userinfo=GetUserInfo($token);
-        if(empty($userinfo)||$userinfo['code']!=0){
-            return app_show(1002,"员工信息不存在");
-        }
-        $data = $userinfo['data'];
-        $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$data['id'])
-            ->field("roleid,role_name")->find();
-        $data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";
-        $data['roleid']=isset($role['roleid']) ? $role['roleid'] :"";
-        return app_show(0,"获取成功",$data);
+    public function info()
+    {
+
     }
+
     /**
-     * @param  token
-     * @param  passwd
-     * @return \think\response\Json
-     * @throws \think\exception\DbException
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
      */
-    public function  resetPwd(){
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = verfiyToken($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
-        $newPwd= isset($post['passwd']) ? trim($post['passwd']) : "";
-        if($newPwd==""){
-            return error_show(1001,'新密码不能为空');
-        }
-        $oldpasswd= isset($post['oldpasswd']) ? trim($post['oldpasswd']) : "";
-        if($oldpasswd==""){
-            return error_show(1001,'旧密码不能为空');
-        }
-
-
-        $account =model("AdminAccount")->GetAccountByUid($effetc['user']['id']);
-        if(!empty ($account) && $account->status!=1){
-            return error_show(10005, '账户已被禁止登录');
-        }
-        if($account->password!=sha1($oldpasswd.$account->salt)){
-            return error_show(10005, '旧密码错误!');
-        }
-        $salt=makeSalt();
-        $data=['password'=>sha1($newPwd.$salt),'salt'=>$salt,"updatetime"=>date("Y-m-d H:i:s")];
-
-        return  AdminAccount::update($data,["id"=>$account->id]) ? app_show(0, '密码修改成功') : error_show(1001,"密码修改失败");
+    public function save(Request $request)
+    {
+        //
     }
 
-    public  function  userAll(){
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        $userinfo=GetAccountall($token);
-
-        if(empty($userinfo)||$userinfo['code']!=0){
-            return app_show(1002,"员工信息不存在");
-        }
-        $data = $userinfo['data'];
-        $role = Db::name("role")->column("role_name","id");
-        $role[0]="";
-        $list=[];
-        foreach ($data as $value){
-            $value["role_name"] = isset($role[$value["roleid"]]) ? $role[$value["roleid"]]:"";
-            $list[]=$value;
-        }
-        return app_show(0,"获取成功",$list);
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
     }
 
     /**
-     * @return \think\response\Json|void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
      */
-    public  function  userList(){
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        $userinfo=GetList($token,$post);
-        if(empty($userinfo)||$userinfo['code']!=0){
-            return app_show($userinfo['code'],$userinfo['msg']);
-        }
-        $data = $userinfo['data']['list'];
-        $list=[];
-        foreach ($data as $value){
-            $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
-                ->field("roleid,role_name")->find();
-            $value['roleid'] = isset($role['roleid']) ? $role['roleid'] :"";
-            $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
-            $list[]=$value;
-        }
-        return app_show(0,"获取成功",["list"=>$list,"count"=>$userinfo['data']["count"]]);
+    public function edit($id)
+    {
+        //
     }
 
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
 
-    public function setRole(){
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        $uid = isset($post['id'])&&$post['id']!=='' ? intval($post['id']) :"";
-        if($uid===''){
-            return error_show(1004,"参数id 不能为空");
-        }
-        $role =isset($post['roleid']) && $post['roleid']!=="" ? intval($post['roleid']) :"";
-        if($role===''){
-            return error_show(1004,"参数roleid 不能为空");
-        }
-        $isRole = Db::name('role')->where([['id',"=",$role],['status',"=",1]])->find();
-        if(empty($isRole)){
-            return error_show(1004,"所选角色不存在");
-        }
-        $data = [
-            'uid'=>$uid,
-            'roleid'=>$role,
-            'status'=>1,
-            'addtime'=>date('Y-m-d H:i:s'),
-            'updatetime'=>date('Y-m-d H:i:s'),
-        ];
-        $insert = Db::name('user_role')->insert($data);
-
-        return $insert? app_show(0,'数据新建成功'):error_show(1004,'数据新建失败');
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
     }
 }

+ 17 - 0
app/admin/route/app.php

@@ -11,12 +11,15 @@
 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');
 Route::rule('menustatus', 'admin/Menu/MenuStatus');
 Route::rule("menulist","admin/Menu/MenuAllList");
 
+
 Route::rule('menuaction', 'admin/Action/ActionList');
 Route::rule('menuactionsave', 'admin/Action/ActionSave');
 Route::rule('menuactionstatus', 'admin/Action/ActionStatus');
@@ -29,6 +32,7 @@ Route::rule("actionstatus","admin/Action/ActionStatus");
 Route::rule("actioninfo","admin/Action/ActionInfo");
 Route::rule("actionlist","admin/Action/ActionList");
 
+
 Route::rule('grouplist', 'admin/Group/GroupList');
 Route::rule('groupall', 'admin/Group/GroupAll');
 Route::rule('groupinfo', 'admin/Group/GroupInfo');
@@ -43,6 +47,19 @@ Route::rule('roleadd', 'admin/Role/RoleAdd');
 Route::rule('rolesave', 'admin/Role/RoleSave');
 Route::rule('rolestatus', 'admin/Role/RoleStatus');
 
+
+Route::rule('ulist','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');
+Route::rule('clist','admin/Departuser/list');
+Route::rule('attend','admin/Departuser/attend');
+Route::rule('useredit','admin/Departuser/useredit');
+Route::rule('ifound','admin/Departuser/found');
+Route::rule('iuserdel','admin/Departuser/userdel');
+
 Route::rule('userlist', 'admin/User/list');
 Route::rule('userinfo', 'admin/User/userInfo');
 Route::rule('userall', 'admin/User/userList');
+

+ 36 - 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,29 +175,33 @@ 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();
     }
@@ -232,3 +237,23 @@ function resetinfo($token,$condition){
     return json_decode($response,true);
 }
 
+/**
+ * @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;
+}
+

+ 0 - 1050
composer.lock

@@ -1,1050 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "9ef3f6f1993fcd90da3b2fda07e08183",
-    "packages": [
-        {
-            "name": "league/flysystem",
-            "version": "1.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "18634df356bfd4119fe3d6156bdb990c414c14ea"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "ext-fileinfo": "*",
-                "league/mime-type-detection": "^1.3",
-                "php": "^7.2.5 || ^8.0"
-            },
-            "conflict": {
-                "league/flysystem-sftp": "<1.0.6"
-            },
-            "require-dev": {
-                "phpspec/prophecy": "^1.11.1",
-                "phpunit/phpunit": "^8.5.8"
-            },
-            "suggest": {
-                "ext-ftp": "Allows you to use FTP server storage",
-                "ext-openssl": "Allows you to use FTPS server storage",
-                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
-                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
-                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
-                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
-                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
-                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
-                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
-                "league/flysystem-webdav": "Allows you to use WebDAV storage",
-                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
-                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
-                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "Filesystem abstraction: Many filesystems, one API.",
-            "keywords": [
-                "Cloud Files",
-                "WebDAV",
-                "abstraction",
-                "aws",
-                "cloud",
-                "copy.com",
-                "dropbox",
-                "file systems",
-                "files",
-                "filesystem",
-                "filesystems",
-                "ftp",
-                "rackspace",
-                "remote",
-                "s3",
-                "sftp",
-                "storage"
-            ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
-            "time": "2021-08-17T13:49:42+00:00"
-        },
-        {
-            "name": "league/flysystem-cached-adapter",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
-                "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "league/flysystem": "~1.0",
-                "psr/cache": "^1.0.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "~0.9",
-                "phpspec/phpspec": "^3.4",
-                "phpunit/phpunit": "^5.7",
-                "predis/predis": "~1.0",
-                "tedivm/stash": "~0.12"
-            },
-            "suggest": {
-                "ext-phpredis": "Pure C implemented extension for PHP"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\Cached\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "frankdejonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "An adapter decorator to enable meta-data caching.",
-            "time": "2020-07-25T15:56:04+00:00"
-        },
-        {
-            "name": "league/mime-type-detection",
-            "version": "1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "ext-fileinfo": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "phpstan/phpstan": "^0.12.68",
-                "phpunit/phpunit": "^8.5.8 || ^9.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "League\\MimeTypeDetection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frankdejonge.nl"
-                }
-            ],
-            "description": "Mime-type detection for Flysystem",
-            "funding": [
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-01-18T20:58:21+00:00"
-        },
-        {
-            "name": "psr/cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "time": "2016-08-06T20:24:11+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2021-03-05T17:36:06+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2021-05-03T11:20:27+00:00"
-        },
-        {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for simple caching",
-            "keywords": [
-                "cache",
-                "caching",
-                "psr",
-                "psr-16",
-                "simple-cache"
-            ],
-            "time": "2017-10-23T01:57:42+00:00"
-        },
-        {
-            "name": "topthink/framework",
-            "version": "v6.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/top-think/framework.git",
-                "reference": "0b5fb453f0e533de3af3a1ab6a202510b61be617"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "league/flysystem": "^1.1.4",
-                "league/flysystem-cached-adapter": "^1.0",
-                "php": ">=7.2.5",
-                "psr/container": "~1.0",
-                "psr/log": "~1.0",
-                "psr/simple-cache": "^1.0",
-                "topthink/think-helper": "^3.1.1",
-                "topthink/think-orm": "^2.0"
-            },
-            "require-dev": {
-                "mikey179/vfsstream": "^1.6",
-                "mockery/mockery": "^1.2",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [],
-                "psr-4": {
-                    "think\\": "src/think/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "liu21st",
-                    "email": "liu21st@gmail.com"
-                },
-                {
-                    "name": "yunwuxin",
-                    "email": "448901948@qq.com"
-                }
-            ],
-            "description": "The ThinkPHP Framework.",
-            "homepage": "http://thinkphp.cn/",
-            "keywords": [
-                "framework",
-                "orm",
-                "thinkphp"
-            ],
-            "time": "2021-07-22T03:24:49+00:00"
-        },
-        {
-            "name": "topthink/think-helper",
-            "version": "v3.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/top-think/think-helper.git",
-                "reference": "f98e3ad44acd27ae85a4d923b1bdfd16c6d8d905"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "think\\": "src"
-                },
-                "files": [
-                    "src/helper.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "yunwuxin",
-                    "email": "448901948@qq.com"
-                }
-            ],
-            "description": "The ThinkPHP6 Helper Package",
-            "time": "2021-06-21T06:17:31+00:00"
-        },
-        {
-            "name": "topthink/think-multi-app",
-            "version": "v1.0.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/top-think/think-multi-app.git",
-                "reference": "ccaad7c2d33f42cb1cc2a78d6610aaec02cea4c3"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1.0",
-                "topthink/framework": "^6.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "think": {
-                    "services": [
-                        "think\\app\\Service"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "think\\app\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "liu21st",
-                    "email": "liu21st@gmail.com"
-                }
-            ],
-            "description": "thinkphp6 multi app support",
-            "time": "2020-07-12T13:50:37+00:00"
-        },
-        {
-            "name": "topthink/think-orm",
-            "version": "v2.0.44",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/top-think/think-orm.git",
-                "reference": "5d3d5c1ebf8bfccf34bacd90edb42989b16ea409"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pdo": "*",
-                "php": ">=7.1.0",
-                "psr/log": "~1.0",
-                "psr/simple-cache": "^1.0",
-                "topthink/think-helper": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7|^8|^9.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "think\\": "src"
-                },
-                "files": [
-                    "stubs/load_stubs.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "liu21st",
-                    "email": "liu21st@gmail.com"
-                }
-            ],
-            "description": "think orm",
-            "keywords": [
-                "database",
-                "orm"
-            ],
-            "time": "2021-07-21T02:22:31+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-05-27T12:26:48+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-05-27T09:17:38+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.23.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-07-28T13:41:28+00:00"
-        },
-        {
-            "name": "symfony/var-dumper",
-            "version": "v4.4.30",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "7f65c44c2ce80d3a0fcdb6385ee0ad535e45660c"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1.3",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php72": "~1.5",
-                "symfony/polyfill-php80": "^1.16"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "ext-iconv": "*",
-                "symfony/console": "^3.4|^4.0|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "twig/twig": "^1.43|^2.13|^3.0.4"
-            },
-            "suggest": {
-                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-                "ext-intl": "To show region name in time zone dump",
-                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
-            },
-            "bin": [
-                "Resources/bin/var-dump-server"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Resources/functions/dump.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Component\\VarDumper\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "debug",
-                "dump"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-08-04T20:31:23+00:00"
-        },
-        {
-            "name": "topthink/think-trace",
-            "version": "v1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/top-think/think-trace.git",
-                "reference": "9a9fa8f767b6c66c5a133ad21ca1bc96ad329444"
-            },
-            "dist": {
-                "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
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=7.1.0",
-                "topthink/framework": "^6.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "think": {
-                    "services": [
-                        "think\\trace\\Service"
-                    ],
-                    "config": {
-                        "trace": "src/config.php"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "think\\trace\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "liu21st",
-                    "email": "liu21st@gmail.com"
-                }
-            ],
-            "description": "thinkphp debug trace",
-            "time": "2020-06-29T05:27:28+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=7.1.0"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
-}

+ 0 - 29
config/cache.php

@@ -1,29 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | 缓存设置
-// +----------------------------------------------------------------------
-
-return [
-    // 默认缓存驱动
-    'default' => env('cache.driver', 'file'),
-
-    // 缓存连接方式配置
-    'stores'  => [
-        'file' => [
-            // 驱动方式
-            'type'       => 'File',
-            // 缓存保存目录
-            'path'       => '',
-            // 缓存前缀
-            'prefix'     => '',
-            // 缓存有效期 0表示永久缓存
-            'expire'     => 0,
-            // 缓存标签前缀
-            'tag_prefix' => 'tag:',
-            // 序列化机制 例如 ['serialize', 'unserialize']
-            'serialize'  => [],
-        ],
-        // 更多的缓存连接
-    ],
-];

+ 0 - 9
config/console.php

@@ -1,9 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 控制台配置
-// +----------------------------------------------------------------------
-return [
-    // 指令定义
-    'commands' => [
-    ],
-];

+ 0 - 20
config/cookie.php

@@ -1,20 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Cookie设置
-// +----------------------------------------------------------------------
-return [
-    // cookie 保存时间
-    'expire'    => 0,
-    // cookie 保存路径
-    'path'      => '/',
-    // cookie 有效域名
-    'domain'    => '',
-    //  cookie 启用安全传输
-    'secure'    => false,
-    // httponly设置
-    'httponly'  => false,
-    // 是否使用 setcookie
-    'setcookie' => true,
-    // samesite 设置,支持 'strict' 'lax'
-    'samesite'  => '',
-];

+ 0 - 63
config/database.php

@@ -1,63 +0,0 @@
-<?php
-
-return [
-    // 默认使用的数据库连接配置
-    'default'         => env('database.driver', 'mysql'),
-
-    // 自定义时间查询规则
-    'time_query_rule' => [],
-
-    // 自动写入时间戳字段
-    // true为自动识别类型 false关闭
-    // 字符串则明确指定时间字段类型 支持 int timestamp datetime date
-    'auto_timestamp'  => true,
-
-    // 时间字段取出后的默认时间格式
-    'datetime_format' => 'Y-m-d H:i:s',
-
-    // 时间字段配置 配置格式:create_time,update_time
-    'datetime_field'  => '',
-
-    // 数据库连接配置信息
-    'connections'     => [
-        'mysql' => [
-            // 数据库类型
-            'type'            => env('database.type', 'mysql'),
-            // 服务器地址
-            'hostname'        => env('database.hostname', '192.168.10.210'),
-            // 数据库名
-            'database'        => env('database.database', 'wms'),
-            // 用户名
-            'username'        => env('database.username', 'root'),
-            // 密码
-            'password'        => env('database.password', '123456'),
-            // 端口
-            'hostport'        => env('database.hostport', '3307'),
-            // 数据库连接参数
-            'params'          => [],
-            // 数据库编码默认采用utf8
-            'charset'         => env('database.charset', 'utf8'),
-            // 数据库表前缀
-            'prefix'          => env('database.prefix', 'wsm_'),
-
-            // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
-            'deploy'          => 0,
-            // 数据库读写是否分离 主从式有效
-            'rw_separate'     => false,
-            // 读写分离后 主服务器数量
-            'master_num'      => 1,
-            // 指定从服务器序号
-            'slave_no'        => '',
-            // 是否严格检查字段是否存在
-            'fields_strict'   => true,
-            // 是否需要断线重连
-            'break_reconnect' => false,
-            // 监听SQL
-            'trigger_sql'     => env('app_debug', true),
-            // 开启字段缓存
-            'fields_cache'    => false,
-        ],
-
-        // 更多的数据库配置信息
-    ],
-];

+ 0 - 24
config/filesystem.php

@@ -1,24 +0,0 @@
-<?php
-
-return [
-    // 默认磁盘
-    'default' => env('filesystem.driver', 'local'),
-    // 磁盘列表
-    'disks'   => [
-        'local'  => [
-            'type' => 'local',
-            'root' => app()->getRuntimePath() . 'storage',
-        ],
-        'public' => [
-            // 磁盘类型
-            'type'       => 'local',
-            // 磁盘路径
-            'root'       => app()->getRootPath() . 'public/storage',
-            // 磁盘路径对应的外部URL路径
-            'url'        => '/storage',
-            // 可见性
-            'visibility' => 'public',
-        ],
-        // 更多的磁盘配置信息
-    ],
-];

+ 0 - 27
config/lang.php

@@ -1,27 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 多语言设置
-// +----------------------------------------------------------------------
-
-return [
-    // 默认语言
-    'default_lang'    => env('lang.default_lang', 'zh-cn'),
-    // 允许的语言列表
-    'allow_lang_list' => [],
-    // 多语言自动侦测变量名
-    'detect_var'      => 'lang',
-    // 是否使用Cookie记录
-    'use_cookie'      => true,
-    // 多语言cookie变量
-    'cookie_var'      => 'think_lang',
-    // 多语言header变量
-    'header_var'      => 'think-lang',
-    // 扩展语言包
-    'extend_list'     => [],
-    // Accept-Language转义为对应语言包名称
-    'accept_language' => [
-        'zh-hans-cn' => 'zh-cn',
-    ],
-    // 是否支持语言分组
-    'allow_group'     => false,
-];

+ 0 - 45
config/log.php

@@ -1,45 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | 日志设置
-// +----------------------------------------------------------------------
-return [
-    // 默认日志记录通道
-    'default'      => env('log.channel', 'file'),
-    // 日志记录级别
-    'level'        => [],
-    // 日志类型记录的通道 ['error'=>'email',...]
-    'type_channel' => [],
-    // 关闭全局日志写入
-    'close'        => false,
-    // 全局日志处理 支持闭包
-    'processor'    => null,
-
-    // 日志通道列表
-    'channels'     => [
-        'file' => [
-            // 日志记录方式
-            'type'           => 'File',
-            // 日志保存目录
-            'path'           => '',
-            // 单文件日志写入
-            'single'         => false,
-            // 独立日志级别
-            'apart_level'    => [],
-            // 最大日志文件数量
-            'max_files'      => 0,
-            // 使用JSON格式记录
-            'json'           => false,
-            // 日志处理
-            'processor'      => null,
-            // 关闭通道日志写入
-            'close'          => false,
-            // 日志输出格式化
-            'format'         => '[%s][%s] %s',
-            // 是否实时写入
-            'realtime_write' => false,
-        ],
-        // 其它日志通道配置
-    ],
-
-];

+ 0 - 8
config/middleware.php

@@ -1,8 +0,0 @@
-<?php
-// 中间件配置
-return [
-    // 别名或分组
-    'alias'    => [],
-    // 优先级设置,此数组中的中间件会按照数组中的顺序优先执行
-    'priority' => [],
-];

+ 0 - 45
config/route.php

@@ -1,45 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 路由设置
-// +----------------------------------------------------------------------
-
-return [
-    // pathinfo分隔符
-    'pathinfo_depr'         => '/',
-    // URL伪静态后缀
-    'url_html_suffix'       => 'html',
-    // URL普通方式参数 用于自动生成
-    'url_common_param'      => true,
-    // 是否开启路由延迟解析
-    'url_lazy_route'        => false,
-    // 是否强制使用路由
-    'url_route_must'        => false,
-    // 合并路由规则
-    'route_rule_merge'      => false,
-    // 路由是否完全匹配
-    'route_complete_match'  => false,
-    // 访问控制器层名称
-    'controller_layer'      => 'controller',
-    // 空控制器名
-    'empty_controller'      => 'Error',
-    // 是否使用控制器后缀
-    'controller_suffix'     => false,
-    // 默认的路由变量规则
-    'default_route_pattern' => '[\w\.]+',
-    // 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
-    'request_cache_key'     => false,
-    // 请求缓存有效期
-    'request_cache_expire'  => null,
-    // 全局请求缓存排除规则
-    'request_cache_except'  => [],
-    // 默认控制器名
-    'default_controller'    => 'Index',
-    // 默认操作名
-    'default_action'        => 'index',
-    // 操作方法后缀
-    'action_suffix'         => '',
-    // 默认JSONP格式返回的处理方法
-    'default_jsonp_handler' => 'jsonpReturn',
-    // 默认JSONP处理方法
-    'var_jsonp_handler'     => 'callback',
-];

+ 0 - 19
config/session.php

@@ -1,19 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 会话设置
-// +----------------------------------------------------------------------
-
-return [
-    // session name
-    'name'           => 'PHPSESSID',
-    // SESSION_ID的提交变量,解决flash上传跨域
-    'var_session_id' => '',
-    // 驱动方式 支持file cache
-    'type'           => 'file',
-    // 存储连接标识 当type使用cache的时候有效
-    'store'          => null,
-    // 过期时间
-    'expire'         => 1440,
-    // 前缀
-    'prefix'         => '',
-];

+ 0 - 10
config/trace.php

@@ -1,10 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Trace设置 开启调试模式后有效
-// +----------------------------------------------------------------------
-return [
-    // 内置Html和Console两种方式 支持扩展
-    'type'    => 'Html',
-    // 读取的日志通道名
-    'channel' => '',
-];

+ 0 - 25
config/view.php

@@ -1,25 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 模板设置
-// +----------------------------------------------------------------------
-
-return [
-    // 模板引擎类型使用Think
-    'type'          => 'Think',
-    // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
-    'auto_rule'     => 1,
-    // 模板目录名
-    'view_dir_name' => 'view',
-    // 模板后缀
-    'view_suffix'   => 'html',
-    // 模板文件名分隔符
-    'view_depr'     => DIRECTORY_SEPARATOR,
-    // 模板引擎普通标签开始标记
-    'tpl_begin'     => '{',
-    // 模板引擎普通标签结束标记
-    'tpl_end'       => '}',
-    // 标签库标签开始标记
-    'taglib_begin'  => '{',
-    // 标签库标签结束标记
-    'taglib_end'    => '}',
-];

+ 0 - 4
public/nginx.htaccess

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