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

刘锟
app/Http/Controllers/Bside/Template/BTemplateLogController.php
app/Http/Logic/Aside/LoginLogic.php
app/Http/Logic/Aside/Project/DomainInfoLogic.php
app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
app/Http/Logic/Bside/RankData/RankDataLogic.php
--- a/app/Http/Controllers/Bside/Template/BTemplateLogController.php
查看文件 @a6c172b
+++ b/app/Http/Controllers/Bside/Template/BTemplateLogController.php
查看文件 @a6c172b
@@ -34,13 +34,14 @@ class BTemplateLogController extends BaseController
      */
     public function lists(BTemplateLog $bTemplateLog){
         $this->map['project_id'] = $this->user['project_id'];
+        $this->map['source'] = 1;
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
         if(!empty($lists['list'])){
             $templateModel = new Template();
             $userModel = new User();
             foreach ($lists['list'] as $k => $v){
                 $v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name'];
-                $v['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
+                $v['operator_name'] = $userModel->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
             }
         }
--- a/app/Http/Logic/Aside/LoginLogic.php
查看文件 @a6c172b
+++ b/app/Http/Logic/Aside/LoginLogic.php
查看文件 @a6c172b
@@ -46,9 +46,6 @@ class LoginLogic extends BaseLogic
         if (Manage::STATUS_DISABLE == $manage->status) {
             $this->fail('帐号已被禁用');
         }
-//        if($this->param['password'] == '123456'){
-//            $this->fail('请使用短信登录，修改初始密码');
-//        }
         $type = 1;//账号密码登录
         if (!Hash::check($this->param['password'], $manage->password)) {
             //验证验证码
@@ -56,13 +53,10 @@ class LoginLogic extends BaseLogic
             $type = 2;//验证码登录
         }
         if(!empty($manage['token'])){
-            //清除上一次用户缓存
             Cache::pull(Common::MANAGE_TOKEN . $manage['token']);
         }
         //生成新token
         $token = md5(uniqid().$manage['id']);
-        //存储缓存
-        $manage['token'] = $token;
         unset($manage['password']);
         Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
         //更新用户信息
@@ -85,7 +79,7 @@ class LoginLogic extends BaseLogic
      * @time   :2023/9/7 16:30
      */
     public function logout(){
-        Cache::pull(request()->header('token'));
+        Cache::pull($this->request->header('token'));
         return $this->success();
     }
--- a/app/Http/Logic/Aside/Project/DomainInfoLogic.php
查看文件 @a6c172b
+++ b/app/Http/Logic/Aside/Project/DomainInfoLogic.php
查看文件 @a6c172b
@@ -18,7 +18,7 @@ class DomainInfoLogic extends BaseLogic
     public function getDomainInfo($project_id)
     {
-        $project = app(ProjectLogic::class)->getInfo($project_id);
+        $project = (new ProjectLogic())->getProjectInfo($project_id);
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new \App\Models\Domain\DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $info = $this->model->where('project_id', $project_id)->first();
         //不存在或时间过期了 重新获取信息
--- a/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @a6c172b
+++ b/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @a6c172b
@@ -13,6 +13,7 @@ use App\Models\Template\BSetting;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\Template;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use mysql_xdevapi\Exception;
@@ -56,15 +57,20 @@ class BTemplateLogic extends BaseLogic
     public function getTemplate(){
         $bSettingModel = new BSetting();
         $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+        if($info === false){
+            $this->fail('请先选择模版');
+        }
         $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){//首页
             $TemplateInfo = $this->homeHtml($info,$this->param['source'],$this->param['source_id']);
         }
         if($this->param['source'] == $this->model::SOURCE_PRODUCT){//产品页
             $TemplateInfo = $this->productHtml($info,$this->param['source'],$this->param['source_id']);
         }
-        }
         return $this->success($TemplateInfo);
     }
--- a/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @a6c172b
+++ b/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @a6c172b
@@ -143,9 +143,9 @@ class RankDataLogic extends BaseLogic
         $page = intval($this->request['page'] ?: 1);
         $lang = $this->request['lang'] ?: '';
         $project_id = $this->user['project_id'];
-        $project = app(ProjectLogic::class)->getInfo($project_id);
+        $project = (new ProjectLogic())->getProjectInfo($project_id);
         $api_no = $project['deploy_optimize']['api_no'] ?? '';
-        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
+        $domain = $this->user['domain'];
         $domain_arr = parse_url($domain);
         $domain = $domain_arr['host'] ?? $domain_arr['path'];
         //复制站点域名