add

app/Admin/controller/Menu.php

@@ -10,6 +10,8 @@ use think\Request;
 
 class Menu extends BaseController
 {
+
+    private $uid = '';
     /**
      * 显示资源列表
      *
@@ -20,22 +22,29 @@ class Menu extends BaseController
         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']);
-//
-//        }
+        if($token==""){
+            return error_show(101,'token不能为空');
+
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+        $this->uid = isset($effetc['data']['user']['id']) ? $effetc['data']['user']['id'] :"";
     }
 
     public function list()
     {
         $post=$this->request->post();
-        $role = Db::name("role_action")->where("role_id","=",1)->find();
-
+        $uid = $this->uid;
+        if($uid==''){
+            return error_show(101,'未找到用户信息');
+        }
+        $roleid = Db::name("user_role")->where([["uid","=",$uid],["status","=",1],["is_del","=",0]])->find();
+        if(empty($roleid)){
+            return error_show(1004,'未找到用户权限信息');
+        }
+        $role = Db::name("role_action")->where("role_id","=", $roleid['roleid'])->find();
         if($role==false){
             return app_show(0,"获取成功",[]);
         }

app/Admin/controller/User.php

@@ -3,7 +3,9 @@ declare (strict_types = 1);
 
 namespace app\Admin\controller;
 
+use app\Admin\model\AdminAccount;
 use app\BaseController;
+use think\facade\Db;
 use think\Request;
 
 class User extends BaseController
@@ -31,72 +33,175 @@ class User extends BaseController
         if(!empty($data) && $data['code']!=0){
             return error_show($effetc['code'],$effetc['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;
+        }
+        $data['data']['list'] = $list;
         return app_show($data['code'],$data['message'],$data['data']);
     }
 
     /**
-     * 显示创建资源表单页.
-     *
-     * @return \think\Response
+     * @param token
+     * @return \think\response\Json
+     * @throws \think\exception\DbException
      */
-    public function info()
-    {
+    public function userInfo(){
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return app_show(101,'token不能为空');
+        }
 
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return app_show($effetc['code'],$effetc['message']);
+        }
+        $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);
     }
-
     /**
-     * 保存新建的资源
-     *
-     * @param  \think\Request  $request
-     * @return \think\Response
+     * @param  token
+     * @param  passwd
+     * @return \think\response\Json
+     * @throws \think\exception\DbException
      */
-    public function save(Request $request)
-    {
-        //
-    }
+    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,'旧密码不能为空');
+        }
 
-    /**
-     * 显示指定的资源
-     *
-     * @param  int  $id
-     * @return \think\Response
-     */
-    public function read($id)
-    {
-        //
+
+        $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,"密码修改失败");
     }
 
-    /**
-     * 显示编辑资源表单页.
-     *
-     * @param  int  $id
-     * @return \think\Response
-     */
-    public function edit($id)
-    {
-        //
+    public  function  userAll(){
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return app_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return app_show($effetc['code'],$effetc['message']);
+        }
+        $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  \think\Request  $request
-     * @param  int  $id
-     * @return \think\Response
+     * @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 update(Request $request, $id)
-    {
-        //
+    public  function  userList(){
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return app_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return app_show($effetc['code'],$effetc['message']);
+        }
+        $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"]]);
     }
 
-    /**
-     * 删除指定资源
-     *
-     * @param  int  $id
-     * @return \think\Response
-     */
-    public function delete($id)
-    {
-        //
+
+    public function setRole(){
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return app_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return app_show($effetc['code'],$effetc['message']);
+        }
+        $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,'数据新建失败');
     }
 }

app/Admin/controller/WareHouse.php

@@ -0,0 +1,77 @@
+<?php
+
+
+namespace app\Admin\controller;
+use app\BaseController;
+use think\App;
+use think\facade\Db;
+
+class WareHouse 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']);
+//
+//        }
+    }
+
+    public function add(){
+        $post  =$this->request->post();
+        $name = isset($post['name'])&& $post['name']!='' ?trim($post['name']) :'';
+        if($name==''){
+            return error_show(1004,'参数name 不能为空');
+        }
+        $supplier = isset($post['supplierid'])&& $post['supplierid']!='' ?intval($post['supplierid']) :'';
+        if($supplier==''){
+            return error_show(1004,'参数supplierid 不能为空');
+        }
+        $wsmtype = isset($post['wsmtype'])&& $post['wsmtype']!='' ?intval($post['wsmtype']) :'';
+        if($wsmtype==''){
+            return error_show(1004,'参数wsmtype 不能为空');
+        }
+        $isT = Db::name('warehouse_info')->where([['name',"=",$name]])->find();
+        if(!empty($isT)){
+            return error_show(1004,'仓库名称已存在');
+        }
+        $addr = isset($post['addr'])&& $post['addr']!='' ?trim($post['addr']) :'';
+        if($addr==''){
+            return error_show(1004,'参数addr 不能为空');
+        }
+        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
+        if($contactor==''){
+            return error_show(1004,'参数contactor 不能为空');
+        }
+        $mobile = isset($post['mobile'])&& $post['mobile']!='' ?trim($post['mobile']) :'';
+        if($mobile==''){
+            return error_show(1004,'参数mobile 不能为空');
+        }
+        $position = isset($post['position'])&& $post['position']!='' ?trim($post['position']) :'';
+        $data =[
+            'name'=>$name,
+            'wsm_type'=>$wsmtype,
+            'supplierid'=>$supplier,
+            'addr'=>$addr,
+            'contactor'=>$contactor,
+            'mobile'=>$mobile,
+            'position'=>$position,
+            'status'=>1,
+            'addtime'=>date("Y-m-d H:i:s"),
+            'updatetime'=>date("Y-m-d H:i:s")
+        ];
+        $add = Db::name('warehouse_info')->insert($data);
+        return $add ? app_show(0,'仓库创建成功'): error_show(1005,'仓库创建失败');
+    }
+
+    public function list(){
+
+    }
+}

app/Admin/route/app.php

@@ -11,7 +11,6 @@
 use think\facade\Route;
 
 Route::rule('menu', 'Admin/Menu/list');
-//Route::rule('menuadd', 'Admin/Menu/MenuAdd');
 Route::rule('menusave', 'Admin/Menu/MenuEdit');
 Route::rule('menudel', 'Admin/Menu/MenuDel');
 Route::rule('menustatus', 'Admin/Menu/MenuStatus');
@@ -35,4 +34,8 @@ Route::rule('roleall', 'Admin/Role/RoleAll');
 Route::rule('roleinfo', 'Admin/Role/RoleInfo');
 Route::rule('roleadd', 'Admin/Role/RoleAdd');
 Route::rule('rolesave', 'Admin/Role/RoleSave');
-Route::rule('rolestatus', 'Admin/Role/RoleStatus');
+Route::rule('rolestatus', 'Admin/Role/RoleStatus');
+
+Route::rule('userlist', 'Admin/User/list');
+Route::rule('userinfo', 'Admin/User/userInfo');
+Route::rule('userall', 'Admin/User/userList');

public/index.php

@@ -13,7 +13,9 @@
 namespace think;
 
 require __DIR__ . '/../vendor/autoload.php';
-
+header('Access-Control-Allow-Origin:*');
+header('Access-Control-Allow-Methods:POST,GET,OPTIONS,DELETE');
+header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization");
 // 执行HTTP应用并响应
 $http = (new App())->http;