wugg 3 years ago
parent
commit
ecf2674eeb

+ 1 - 1
.env

@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = test
USERNAME = username
PASSWORD = password
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

+ 20 - 33
app/Admin/controller/Action.php

@@ -6,9 +6,26 @@ namespace app\Admin\controller;
 use app\BaseController;
 use think\facade\Db;
 use think\Request;
+use think\App;
 
 class Action extends BaseController
 {
+
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $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']);
+//
+//        }
+    }
     /**
      * 显示资源列表
      *
@@ -16,34 +33,18 @@ class Action extends BaseController
      */
     public function ActionList(){
         $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']);
-        }
         $pageid = isset($post['id']) ? intval($post['id']) : "";
         if($pageid==""){
             return error_show(1001,'页面id不能为空');
         }
         $condition = ['menuid'=>$pageid];
-        $data=Db::name('action')->alias("a")->leftJoin("cfp_action_list l","a.action_code=l.action_code")->field
+        $data=Db::name('action')->alias("a")->leftJoin("action_list l","a.action_code=l.action_code")->field
         ("a.*,action_name")->where($condition)->select();
         return app_show(0,"获取成功",$data);
     }
 
     public function ActionSave(){
         $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']);
-        }
         $actid = isset($post['id']) ? intval($post['id']) : "";
         if($actid==""){
             return error_show(1001,'功能id不能为空');
@@ -78,14 +79,7 @@ class Action extends BaseController
 
     public function ActionStatus(){
         $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']);
-        }
+
         $actid = isset($post['id']) ? intval($post['id']) : "";
         if($actid==""){
             return error_show(1001,'功能id不能为空');
@@ -110,14 +104,7 @@ class Action extends BaseController
      */
     public function ActionAdd(){
         $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']);
-        }
+
         $pageid = isset($post['menuid']) ? intval($post['menuid']) : "";
         if($pageid==""){
             return error_show(1001,'页面id不能为空');

+ 18 - 32
app/Admin/controller/Group.php

@@ -3,8 +3,25 @@ namespace app\Admin\controller;
 
 use app\BaseController;
 use think\facade\Db;
+use think\app;
+
 class Group extends BaseController
 {
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $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']);
+        }
+    }
+
     /**
      * @return \think\response\Json
      * @throws \think\db\exception\DataNotFoundException
@@ -15,13 +32,7 @@ class Group extends BaseController
     public function GroupList(){
         $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']);
-        }
+
         $page = isset($post['page']) ? intval($post['page']): 1;
         $size = isset($post['size']) ? intval($post['size']):10;
         $condition=[];
@@ -61,10 +72,6 @@ class Group extends BaseController
         if($token==""){
             return error_show(101,'token不能为空');
         }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
         $condition=[];
         isset($post['name']) && $post['name']!=="" ? $condition[]= ['group_name',"like","%{$post['name']}%"] : "";
         isset($post['status']) && $post['status']!=="" ? $condition[] = ['status',"=",$post['status']] : "";
@@ -78,7 +85,6 @@ class Group extends BaseController
                 $user = GetUserlist($token, $cond);
                 if ($user['code'] == 0 && !empty($user['data'])) {
                     foreach ($user['data'] as $v) {
-
                         $userlist[] = isset($v['nickname']) ?$v['nickname']:"";
                     }
                 }
@@ -99,10 +105,6 @@ class Group extends BaseController
         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不能为空");
@@ -135,10 +137,6 @@ class Group extends BaseController
         if($token==""){
             return error_show(101,'token不能为空');
         }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
         $groupname = isset($post['name']) ? trim($post['name']):"";
         if($groupname==""){
             return error_show(1002,"用户组名不能为空");
@@ -175,10 +173,6 @@ class Group extends BaseController
         if($token==""){
             return error_show(101,'token不能为空');
         }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
         $groupid = isset($post['id']) ? intval($post['id']):"";
         if($groupid==""){
             return error_show(1002,"用户组id不能为空");
@@ -214,14 +208,6 @@ class Group extends BaseController
      */
     public function GroupStatus(){
         $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']);
-        }
         $groupid = isset($post['id']) ? intval($post['id']):"";
         if($groupid==""){
             return error_show(1002,"用户组id不能为空");

+ 52 - 3
app/Admin/controller/Menu.php

@@ -4,6 +4,7 @@ declare (strict_types = 1);
 namespace app\Admin\controller;
 
 use app\BaseController;
+use think\App;
 use think\facade\Db;
 use think\Request;
 
@@ -14,10 +15,26 @@ class Menu extends BaseController
      *
      * @return \think\Response
      */
+    public  function __construct(App $app)
+    {
+        parent::__construct($app);
+        $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']);
+//
+//        }
+    }
+
     public function list()
     {
         $post=$this->request->post();
-        $role = Db::name("role_action")->where("role_id","=",$guserinfo['data']['roleid'])->find();
+        $role = Db::name("role_action")->where("role_id","=",1)->find();
 
         if($role==false){
             return app_show(0,"获取成功",[]);
@@ -159,15 +176,47 @@ class Menu extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
-        $data = Db::name("admin_menu")->where(['pid'=>0])->order("weight desc,id asc")->select();
+        $data = Db::name("admin_menu")->where(['pid'=>0,'is_del'=>0])->order("weight desc,id asc")->select();
         $l=[];
         foreach ($data as $key=>$value){
             $temp=[];
-            $temp =  Db::name("admin_menu")->where(['pid'=>$value['id']])->order("weight desc,id asc")->select();
+            $temp =  Db::name("admin_menu")->where(['pid'=>$value['id'],'is_del'=>0])->order("weight desc,id asc")
+                ->select();
             $value['child']=$temp;
             $l[]=$value;
         }
         return app_show(0,"获取成功",$l);
     }
 
+    /**
+     * @return \think\response\Json|void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+
+    public function MenuDel(){
+        $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']) :"";
+        $menu =  Db::name("admin_menu")->where("id","=",$id)->find();
+        if($menu==false){
+            return error_show(1003,"菜单不信息不存在");
+        }
+        $menu['is_show']=0;
+        $menu['status']=0;
+        $menu['is_del']=1;
+        $menu['updatetime']=date("Y-m-d H:i:s");
+        $result =  Db::name("admin_menu")->save($menu);
+        return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
+    }
+
 }

+ 89 - 60
app/Admin/controller/Role.php

@@ -3,10 +3,28 @@
 
 namespace app\Admin\controller;
 use app\BaseController;
+use think\App;
 use think\facade\Db;
 
 class Role extends BaseController
 {
+
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $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']);
+//
+//        }
+    }
+
     /**
      * @param status
      * @param role_name
@@ -18,24 +36,20 @@ class Role extends BaseController
      */
     public function  RoleList(){
         $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']);
-        }
+
         $condition=[];
         isset($post['status'])&&$post['status']!=="" ? $condition[]=['a.status',"=",$post['status']]:"";
         isset($post['role_name'])&&$post['role_name']!=="" ? $condition[]=['a.role_name',"like","%".$post['role_name']."%"]:"";
-        isset($post['level'])&&$post['level']!=="" ? $condition[]=["a.level","=",$post['level']]:"";
+        isset($post['item'])&&$post['item']!=="" ? $condition[]=["a.item","=",$post['item']]:"";
+        isset($post['createrId'])&&$post['createrId']!=="" ? $condition[]=["a.createrId","=",$post['createrId']]:"";
         $roleList = Db::name("role");
         $count =$roleList->alias("a")->where($condition)->count();
-        $page = isset($post['page']) ? intval($post['page']) : 1;
-        $size = isset($post['size']) ? intval($post['size']) : 10;
+        $page = isset($post['page'])&& $post['page']!=''? intval($post['page']) : 1;
+        $size = isset($post['size'])&& $post['size']!=''? intval($post['size']) : 10;
         $page >=ceil($count/$size) ? $page=ceil($count/$size) :"";
-        $list=$roleList->alias("a")->leftJoin("cfp_role_action t","a.id=t.role_id")->field("a.*,t.action_conllect as action,t.action_data")->where($condition)->page($page,$size)->select();
+        $list=$roleList->alias("a")->leftJoin("role_action t","a.id=t.role_id")->leftJoin("company_item i","a
+        .item=i.id")->field("a.*,i.name as item_name,t.action_conllect as action,t.action_data")->where($condition)
+            ->page($page,$size)->select();
 
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
@@ -51,13 +65,13 @@ class Role extends BaseController
      */
     public function RoleAdd(){
         $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']);
+        $creater= GetUserInfo($post['token']);
+        if(isset($creater['code'])&&$creater['code']==0){
+            $uid= isset($userinfo['data']['id']) ? $userinfo['data']['id']: "0";
+            $username = isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname']: "";
+        }else{
+            $username = '';
+            $uid= 0;
         }
         $rolename = isset($post['role_name']) ? trim($post['role_name']) : "";
         if($rolename==""){
@@ -67,10 +81,27 @@ class Role extends BaseController
         if($isT){
             return error_show(1002,"角色名称已存在");
         }
-        $level = isset($post['level']) ? intval($post['level']) : "";
-        if($level==""){
-            return error_show(1003,"角色等级不能为空");
+        $role_code= isset($post['role_code'])&&$post['role_code']!=''?trim($post['role_code']) :"";
+        if($role_code==""){
+            return error_show(1002,"参数role_code 不能为空");
+        }
+        $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
+        if($isCode){
+            return error_show(1002,"角色编号已存在");
+        }
+        $item = isset($post['item']) ? trim($post['item']) : "";
+        if($item==""){
+            return error_show(1003,"参数item 不能为空");
         }
+        $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
+        if(empty($iteminfo) || $iteminfo['is_del']==1){
+            return error_show(1003,"该部门不存在");
+        }
+        $level = isset($post['level']) ? intval($post['level']) : 0;
+        $remark = isset($post['remark']) ? trim($post['remark']) : '';
+//        if($level==""){
+//            return error_show(1003,"参数不能为空");
+//        }
         $action = isset($post['action'])&&is_array($post['action']) ? implode(",",$post['action']) : "";
         if($action==""){
             return error_show(1004,"功能权限不能为空");
@@ -85,10 +116,15 @@ class Role extends BaseController
         try {
             $list = [
                 "role_name"=>$rolename,
+                "role_code"=>$role_code,
                 "status"=>1,
+                'creater'=>$username,
+                'createrId'=>$uid,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
                 "level"=>$level,
+                "desc"=>$remark,
+                "item"=>$item,
             ];
             $role= Db::name("role")->insert($list,true);
 
@@ -108,11 +144,11 @@ class Role extends BaseController
                     return app_show(0,"新建成功");
                 }else{
                     Db::rollback();
-                    return app_show(1005,"权限录入失败");
+                    return error_show(1005,"权限录入失败");
                 }
             }else{
                 Db::rollback();
-                return app_show(1006,"角色新建失败");
+                return error_show(1006,"角色新建失败");
             }
 
         }catch (\Exception $e){
@@ -128,22 +164,20 @@ class Role extends BaseController
      */
     public function RoleInfo(){
         $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']);
-        }
+
         $roleid= isset($post['roleid']) ? trim($post['roleid']) : "";
         if($roleid==""){
             return error_show(1001,'roleid不能为空');
         }
-        $info =  $list=Db::name("role")->alias("a")->leftJoin("cfp_role_action t","a.id=t.role_id")->field("a.*,t.action_conllect,t.action_data,t.private_data")->where("a.id","=",$roleid)->find();
+        $info =  $list=Db::name("role")->alias("a")->leftJoin("role_action t","a.id=t.role_id")->field("a.*,t.action_conllect,t.action_data,t.private_data")->where("a.id","=",$roleid)->find();
         if(!$info){
             return error_show(1002,"未找到对应的数据");
         }
+        $info['item_name'] ='';
+        if($info['item']!=''){
+            $iteminfo = Db::name('company_item')->where('id',"=",$info['item'])->find();
+            $info['item_name'] = isset($iteminfo['name'])? $iteminfo['name']:"";
+        }
         $info['action'] =explode(",",$info['action_conllect']);
         $info['action_data'] =$info['action_data']!=""?explode(",",$info['action_data']):"";
         $info['private_data'] =$info['private_data']!=""?explode(",",$info['private_data']) :"";
@@ -161,14 +195,7 @@ class Role extends BaseController
      */
     public function RoleSave(){
         $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']);
-        }
+
         $roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
         if($roleid==""){
             return error_show(1001,'roleid不能为空');
@@ -186,10 +213,24 @@ class Role extends BaseController
         if($vers){
             return error_show(1002,"角色名已存在");
         }
-        $level = isset($post['level']) ? intval($post['level']) : "";
-        if($level==""){
-            return error_show(1003,"角色等级不能为空");
+        $role_code= isset($post['role_code'])&&$post['role_code']!=''?trim($post['role_code']) :"";
+        if($role_code==""){
+            return error_show(1002,"参数role_code 不能为空");
+        }
+        $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
+        if($isCode){
+            return error_show(1002,"角色编号已存在");
         }
+        $item = isset($post['item']) ? trim($post['item']) : "";
+        if($item==""){
+            return error_show(1003,"参数item 不能为空");
+        }
+        $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
+        if($iteminfo['is_del']==1){
+            return error_show(1003,"该部门不存在");
+        }
+        $level = isset($post['level']) ? intval($post['level']) : 0;
+        $remark = isset($post['remark']) ? trim($post['remark']) : '';
         $action = isset($post['action'])&&is_array($post['action']) ? implode(",",$post['action']) : "";
         if($action==""){
             return error_show(1004,"功能权限不能为空");
@@ -204,6 +245,9 @@ class Role extends BaseController
             $list = [
                 "role_name"=>$rolename,
                 "level"=>$level,
+                'desc'=>$remark,
+                'role_code'=>$role_code,
+                'item'=>$item,
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'id'=>$roleid
             ];
@@ -241,14 +285,7 @@ class Role extends BaseController
      */
     public function RoleStatus(){
         $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']);
-        }
+
         $roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
         if($roleid==""){
             return error_show(1001,'roleid不能为空');
@@ -291,14 +328,6 @@ class Role extends BaseController
      */
     public function RoleAll(){
         $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']);
-        }
         $list =Db::name("role")->select();
         return app_show(0,"获取成功",$list);
     }

+ 2 - 2
app/Admin/controller/User.php

@@ -39,9 +39,9 @@ class User extends BaseController
      *
      * @return \think\Response
      */
-    public function create()
+    public function info()
     {
-        //
+
     }
 
     /**

+ 4 - 3
app/Admin/route/app.php

@@ -10,17 +10,18 @@
 // +----------------------------------------------------------------------
 use think\facade\Route;
 
-Route::rule('menu', 'Admin/Menu/MenuList');
+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(' action', 'Admin/Action/ActionList');
+Route::rule('action', 'Admin/Action/ActionList');
 Route::rule('actionsave', 'Admin/Action/ActionSave');
 Route::rule('actionstatus', 'Admin/Action/ActionStatus');
 Route::rule('actionadd', 'Admin/Action/ActionAdd');
-Route::rule("menulist","Admin/Menu/MenuAllList");
 
 Route::rule('grouplist', 'Admin/Group/GroupList');
 Route::rule('groupall', 'Admin/Group/GroupAll');

+ 2 - 0
app/common.php

@@ -6,12 +6,14 @@ use think\facade\Config;
 function app_show($code=0,$message="",$data=[]){
     $result = ['code'=>$code,"message"=>$message,"data"=>$data];
     echo json_encode($result,JSON_UNESCAPED_UNICODE);
+    die();
 }
 
 // 应用公共文件
 function error_show($code=0,$message=""){
     $result = ['code'=>$code,"message"=>$message];
     echo json_encode($result,JSON_UNESCAPED_UNICODE);
+    die();
 }
 
 function GetUserInfo($token){

+ 0 - 17
app/controller/Index.php

@@ -1,17 +0,0 @@
-<?php
-namespace app\controller;
-
-use app\BaseController;
-
-class Index extends BaseController
-{
-    public function index()
-    {
-        return '<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:) </h1><p> ThinkPHP V' . \think\facade\App::version() . '<br/><span style="font-size:30px;">14载初心不改 - 你值得信赖的PHP框架</span></p><span style="font-size:25px;">[ V6.0 版本由 <a href="https://www.yisu.com/" target="yisu">亿速云</a> 独家赞助发布 ]</span></div><script type="text/javascript" src="https://tajs.qq.com/stats?sId=64890268" charset="UTF-8"></script><script type="text/javascript" src="https://e.topthink.com/Public/static/client.js"></script><think id="ee9b1aa918103c4fc"></think>';
-    }
-
-    public function hello($name = 'ThinkPHP6')
-    {
-        return 'hello,' . $name;
-    }
-}

+ 1 - 1
config/database.php

@@ -38,7 +38,7 @@ return [
             // 数据库编码默认采用utf8
             'charset'         => env('database.charset', 'utf8'),
             // 数据库表前缀
-            'prefix'          => env('database.prefix', 'wsm'),
+            'prefix'          => env('database.prefix', 'wsm_'),
 
             // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
             'deploy'          => 0,