gx

@@ -46,9 +46,6 @@ class LoginLogic extends BaseLogic
         if (Manage::STATUS_DISABLE == $manage->status) {
         if (Manage::STATUS_DISABLE == $manage->status) {
             $this->fail('帐号已被禁用');
             $this->fail('帐号已被禁用');
         }
         }
-//        if($this->param['password'] == '123456'){
-//            $this->fail('请使用短信登录，修改初始密码');
-//        }
         $type = 1;//账号密码登录
         $type = 1;//账号密码登录
         if (!Hash::check($this->param['password'], $manage->password)) {
         if (!Hash::check($this->param['password'], $manage->password)) {
             //验证验证码
             //验证验证码
@@ -61,8 +58,6 @@ class LoginLogic extends BaseLogic
         }
         }
         //生成新token
         //生成新token
         $token = md5(uniqid().$manage['id']);
         $token = md5(uniqid().$manage['id']);
-        //存储缓存
-        $manage['token'] = $token;
         unset($manage['password']);
         unset($manage['password']);
         Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
         Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
         //更新用户信息
         //更新用户信息

@@ -13,6 +13,7 @@ use App\Models\Template\BSetting;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\Template;
 use App\Models\Template\Template;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use mysql_xdevapi\Exception;
 use mysql_xdevapi\Exception;
 
 
@@ -56,15 +57,20 @@ class BTemplateLogic extends BaseLogic
     public function getTemplate(){
     public function getTemplate(){
         $bSettingModel = new BSetting();
         $bSettingModel = new BSetting();
         $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
         $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+        if($info === false){
+            $this->fail('请先选择模版');
+        }
         $TemplateInfo = [];
         $TemplateInfo = [];
-        if($info !== false){
+        $key = 'template_'.$this->user['project_id'].'_'.$this->param['source'].'_'.$this->param['source_id'];
+        if(!empty(Cache::add($key))){
+            $this->fail('当前页面正在装修中');
+        }
         if($this->param['source'] == $this->model::SOURCE_HOME){//首页
         if($this->param['source'] == $this->model::SOURCE_HOME){//首页
             $TemplateInfo = $this->homeHtml($info,$this->param['source'],$this->param['source_id']);
             $TemplateInfo = $this->homeHtml($info,$this->param['source'],$this->param['source_id']);
         }
         }
         if($this->param['source'] == $this->model::SOURCE_PRODUCT){//产品页
         if($this->param['source'] == $this->model::SOURCE_PRODUCT){//产品页
             $TemplateInfo = $this->productHtml($info,$this->param['source'],$this->param['source_id']);
             $TemplateInfo = $this->productHtml($info,$this->param['source'],$this->param['source_id']);
         }
         }
-        }
         return $this->success($TemplateInfo);
         return $this->success($TemplateInfo);
     }
     }