Merge branch 'master' of gitlab.linanquan.com:jiangyipeng/doc_phone

application/api/controller/Index.php

@@ -6,15 +6,29 @@ use think\Request;
 use think\Controller;
 use app\api\model\Folder;
 use app\api\model\Doclist;
-
+use think\Cache;
 class Index extends Controller
 {
-    public function index()
+
+    public function _initialize()
     {
+        $token = input('post.token');
+        $old_token =Cache::get('token');
+        if($old_token){
+            if($token!=$old_token){
+                $rs = json_encode(code([], 10003, 'token不合法'));
+                exit($rs);
+
+            }
+        }else{
+            $rs = json_encode(code([], 10003, 'token不存在或已过期'));
+            exit($rs);
+        }
 
 
     }
 
+
     public function folderList()
     {
         $request = Request::instance();
@@ -180,7 +194,7 @@ class Index extends Controller
         $doc = input('post.doc');
         $docid = input('post.docid');
         $model = new Doclist();
-        if (  empty($title) || empty($doc) || empty($docid)) {
+        if (empty($folderid) || empty($title) || empty($doc) || empty($docid)) {
             return json(code([], 10001, '参数不足'));
         }
         $res = $model->editArticle($title, $folderid, $doc, $docid);

application/common.php

@@ -62,3 +62,11 @@ function randomkeys($length)
     }
     return $key;
 }
+function create_unique()
+{
+    $uniqid = uniqid();
+    $uniqid = str_replace('.', '', $uniqid);
+    $unString = base_convert($uniqid, 16, 36);
+    // 补足17位
+    return str_pad($unString, 17, rand(1,9999999));
+}

application/login/controller/Index.php

@@ -50,9 +50,10 @@ class Index extends Controller
 
         $User =new Dingtalk\User();
         $userid =$User->code($code);
-
-        $result= $this->create($userid);
-        return $result;
+        //$userid='231115647';
+        $token = md5(create_unique());
+        $expireSecond = config('token_expire_second');
+        $rs = cache('token',$token ,$expireSecond);
         if($userid===false){
             $data['status']=-10001;
             $data['errmsg']='登录失败';
@@ -60,20 +61,20 @@ class Index extends Controller
             $data['status']=0;
             $data['errmsg']='登录成功';
             $data['userid']=$userid;
-            $data['token']=$result;
+            $data['token']=$token;
         }
 //        return json($data);
         return json(code([$data], 0, 'ok'));
     }
-    public function create($uid)
-    {
-
-        $tokenModel = new TokenModel();
-        $token = $tokenModel->createToken($uid);
-        if ($token == false) {
-            return json(code([], $tokenModel->getErrCode(), $tokenModel->getError()));
-        } else {
-            return json(code(['token' => $token, 'expire_second' => config('token_expire_second')]));
-        }
-    }
+//    public function create($uid)
+//    {
+//
+//        $tokenModel = new TokenModel();
+//        $token = $tokenModel->createToken($uid);
+//        if ($token == false) {
+//            return json(code([], $tokenModel->getErrCode(), $tokenModel->getError()));
+//        } else {
+//            return json(code(['token' => $token, 'expire_second' => config('token_expire_second')]));
+//        }
+//    }
 }