Merge remote-tracking branch 'origin/develop' into akun

@@ -33,7 +33,7 @@ class BaseController extends Controller
         $this->token = $this->request->header('token');
         $this->token = $this->request->header('token');
         if(!empty($this->token) && !empty(Cache::get($this->token))){
         if(!empty($this->token) && !empty(Cache::get($this->token))){
             $info = Cache::get($this->token);
             $info = Cache::get($this->token);
-            Cache::put($this->token, $info, 3600);//更新缓存时间
+            Cache::put($this->token, $info, 3600 * 12);//更新缓存时间
             $this->user = $info;
             $this->user = $info;
             $this->uid = $info['id'];
             $this->uid = $info['id'];
             //参数处理
             //参数处理

@@ -41,7 +41,11 @@ class KeywordController extends BaseController
         if(!empty($data)){
         if(!empty($data)){
             foreach ($data['list'] as &$v){
             foreach ($data['list'] as &$v){
                 $v['product_num'] = Product::where('keyword_id','like' ,'%,'.$v['id'].',%')->count();
                 $v['product_num'] = Product::where('keyword_id','like' ,'%,'.$v['id'].',%')->count();
-                $v['tdk'] = boolval($v['seo_title']) * boolval($v['seo_keywords']) * boolval($v['seo_description']);
+                if(!empty($v['seo_title']) || !empty($v['seo_keywords']) || !empty($v['seo_description'])){
+                    $v['tdk'] = 1;
+                }else{
+                    $v['tdk'] = 0;
+                }
                 $v['url'] = $this->user['domain'] . $v['route'];
                 $v['url'] = $this->user['domain'] . $v['route'];
             }
             }
         }
         }

@@ -82,7 +82,7 @@ class UserLoginLogic
         $token = md5(uniqid().$info['id']);
         $token = md5(uniqid().$info['id']);
         //存储缓存
         //存储缓存
         $info['token'] = $token;
         $info['token'] = $token;
-        Cache::add($token,$info,3600 * 6);
+        Cache::add($token,$info,3600 * 12);
         //更新用户信息
         //更新用户信息
         $rs = $this->model->edit(['token'=>$token],['id'=>$info['id']]);
         $rs = $this->model->edit(['token'=>$token],['id'=>$info['id']]);
         if($rs === false){
         if($rs === false){
@@ -121,7 +121,7 @@ class UserLoginLogic
             //存储缓存
             //存储缓存
             $info['token'] = $token;
             $info['token'] = $token;
             $info['manager_id'] = $data['manager_id'];//代表自动登录写入日志
             $info['manager_id'] = $data['manager_id'];//代表自动登录写入日志
-            Cache::add($token,$info,3600 * 6);
+            Cache::add($token,$info,3600 * 12);
         }
         }
         Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip(),
         Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip(),
             'project_id'=>$info['project_id'], 'type'=>1 ,'remark' => '自动登录,操作管理员为：'.$data['manager_id']]);
             'project_id'=>$info['project_id'], 'type'=>1 ,'remark' => '自动登录,操作管理员为：'.$data['manager_id']]);