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

@@ -791,3 +791,14 @@ function check_remote_url_down($url,$project_id,$domain,$is_complete=0){
         return false;
         return false;
     }
     }
 }
 }
+
+/**
+ * 文本框转内容数组
+ * @author zbj
+ * @date 2024/3/29
+ */
+function textareaToArr($content, $separator = ','){
+    return array_values(array_filter(array_unique(array_map(function ($v){
+        return trim($v);
+    },explode($separator, $content)))));
+}

@@ -16,6 +16,7 @@ use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 use App\Models\User\User;
+use App\Models\WebSetting\WebLanguage;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
@@ -154,7 +155,12 @@ class PrivateController extends BaseController
      * @time   :2024/3/29 16:19
      * @time   :2024/3/29 16:19
      */
      */
     public function getAutoToken(){
     public function getAutoToken(){
-        //获取当前用户的草鸡管理员
+        $this->request->validate([
+            'project_id' => 'required',
+        ], [
+            'project_id.required' => '项目id不能为空',
+        ]);
+        //获取当前用户的管理员
         $userModel = new User();
         $userModel = new User();
         $userInfo = $userModel->read(['project_id'=>$this->param['project_id'],'role_id'=>0]);
         $userInfo = $userModel->read(['project_id'=>$this->param['project_id'],'role_id'=>0]);
         $userLoginLogicModel = new UserLoginLogic();
         $userLoginLogicModel = new UserLoginLogic();
@@ -164,7 +170,9 @@ class PrivateController extends BaseController
         //存储缓存
         //存储缓存
         $info['token'] = $token;
         $info['token'] = $token;
         Cache::add($token,$info,3600);
         Cache::add($token,$info,3600);
-        $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id']];
+        $languageModel = new WebLanguage();
+        $languageInfo = $languageModel->read(['id'=>$info['main_lang_id']],['short','english','chinese']);
+        $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id'],'language_info'=>$languageInfo];
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -952,4 +952,21 @@ class ProjectController extends BaseController
         $logic->saveInquiryFilterConfig($this->param);
         $logic->saveInquiryFilterConfig($this->param);
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * 保存引流设置
+     * @author zbj
+     * @date 2024/3/29
+     */
+    public function saveWebTrafficConfig(ProjectLogic $logic){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => '项目id不能为空',
+        ]);
+        $logic->saveWebTrafficConfig($this->param);
+        $this->response('success');
+    }
+
+
 }
 }

@@ -11,9 +11,11 @@ use App\Jobs\CopyProjectJob;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Inquiry\InquiryIP;
 use App\Models\Project\InquiryFilterConfig;
 use App\Models\Project\InquiryFilterConfig;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
+use App\Models\Project\WebTrafficConfig;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectRole;
 use App\Models\User\ProjectRole;
@@ -69,7 +71,7 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/7/28 17:11
      * @time   :2023/7/28 17:11
      */
      */
     public function getProjectInfo($id){
     public function getProjectInfo($id){
-        $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check', 'project_after','inquiry_filter_config'])->where(['id'=>$id])->first()->toArray();
+        $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check', 'project_after','inquiry_filter_config','web_traffic_config'])->where(['id'=>$id])->first()->toArray();
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['deploy_optimize']['minor_keywords'] = !empty($info['deploy_optimize']['minor_keywords']) ? json_decode($info['deploy_optimize']['minor_keywords']) : [];
         $info['deploy_optimize']['minor_keywords'] = !empty($info['deploy_optimize']['minor_keywords']) ? json_decode($info['deploy_optimize']['minor_keywords']) : [];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
@@ -785,4 +787,46 @@ class ProjectLogic extends BaseLogic
         return true;
         return true;
     }
     }
 
 
+
+    /**
+     * 保存引流配置
+     * @param $config
+     * @return array
+     * @author zbj
+     * @date 2024/3/29
+     */
+    public function saveWebTrafficConfig($config){
+        $config['main_countries'] = textareaToArr($config['main_countries']);
+        $config['filter_countries'] = textareaToArr($config['filter_countries']);
+
+        $ip_area = InquiryIP::getIpAreas();
+
+        foreach ($config['main_countries'] as $v) {
+            if (!in_array($v, $ip_area)) {
+                throw new AsideGlobalException(Code::SYSTEM_ERROR, '[' . $v . ']不存在，请检查后再次提交');
+            }
+        }
+        foreach ($config['filter_countries'] as $v) {
+            if (!in_array($v, $ip_area)) {
+                throw new AsideGlobalException(Code::SYSTEM_ERROR, '[' . $v . ']不存在，请检查后再次提交');
+            }
+        }
+
+
+        $config['main_countries'] = json_encode($config['main_countries']);
+        $config['filter_countries'] = json_encode($config['filter_countries']);
+
+        $model = WebTrafficConfig::where('project_id', $config['project_id'])->first();
+        if (!$model) {
+            $model = new WebTrafficConfig();
+            $model->add($config);
+        } else {
+            $model->edit($config, ['project_id' => $config['project_id']]);
+        }
+
+        Cache::forget(WebTrafficConfig::cacheKey($config['project_id']));
+
+        return $this->success();
+    }
+
 }
 }

@@ -647,7 +647,7 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/8/23 11:16
      * @time   :2023/8/23 11:16
      */
      */
     public function setOperationRecords($html,$source,$source_id,$template_id,$is_custom,$type = 0){
     public function setOperationRecords($html,$source,$source_id,$template_id,$is_custom,$type = 0){
-        if($source != BTemplate::SOURCE_HOME){
+        if($is_custom != BTemplate::IS_NO_CUSTOM){
             return true;
             return true;
         }
         }
         $data = [
         $data = [

@@ -13,4 +13,14 @@ use App\Models\Base;
 class InquiryIP extends Base
 class InquiryIP extends Base
 {
 {
     protected $table = 'gl_xunpan_ipdata';
     protected $table = 'gl_xunpan_ipdata';
+
+
+    /**
+     * @return mixed
+     * @author zbj
+     * @date 2024/3/29
+     */
+    public static function getIpAreas(){
+        return self::groupBy('ip_area')->pluck('ip_area')->toArray();
+    }
 }
 }

@@ -239,6 +239,17 @@ class Project extends Base
     }
     }
 
 
     /**
     /**
+     * 引流配置
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @author zbj
+     * @date 2024/3/29
+     */
+    public function web_traffic_config()
+    {
+        return self::hasOne(WebTrafficConfig::class, 'project_id', 'id');
+    }
+
+    /**
      * 域名
      * 域名
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      * @author zbj
      * @author zbj

+<?php
+
+namespace App\Models\Project;
+
+use App\Models\Base;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * 引流配置
+ * Class InquiryFilterConfig
+ * @package App\Models\Project
+ * @author zbj
+ * @date 2024/3/29
+ */
+class WebTrafficConfig extends Base
+{
+    //设置关联表名
+    protected $table = 'gl_project_web_traffic_config';
+
+    /**
+     * @param $project_id
+     * @return string
+     * @author zbj
+     * @date 2024/1/20
+     */
+    public static function cacheKey($project_id): string
+    {
+        return 'project_web_traffic_config_info' . $project_id;
+    }
+
+    /**
+     * @param $project_id
+     * @return mixed
+     * @author zbj
+     * @date 2024/1/20
+     */
+    public static function getCacheInfoByProjectId($project_id){
+        $info = Cache::get(self::cacheKey($project_id));
+        if (!$info) {
+            $info = self::where('project_id', $project_id)->first();
+            Cache::put(self::cacheKey($project_id), $info, 2 * 3600);
+        }
+        return $info;
+    }
+
+    public function getMainCountriesAttribute($value)
+    {
+        return $value ? implode(',', json_decode($value, true)) : '';
+    }
+
+    public function getFilterCountriesAttribute($value)
+    {
+        return $value ? implode(',', json_decode($value, true)) : '';
+    }
+}

@@ -186,6 +186,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/languageLists', [Aside\Project\ProjectController::class, 'languageLists'])->name('admin.project_languageLists');//其他项目设置
         Route::any('/languageLists', [Aside\Project\ProjectController::class, 'languageLists'])->name('admin.project_languageLists');//其他项目设置
         Route::any('/countryLists', [Aside\Project\ProjectController::class, 'countryLists'])->name('admin.project_countryLists');//国家地区列表
         Route::any('/countryLists', [Aside\Project\ProjectController::class, 'countryLists'])->name('admin.project_countryLists');//国家地区列表
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
+        Route::any('/saveWebTrafficConfig', [Aside\Project\ProjectController::class, 'saveWebTrafficConfig'])->name('admin.project_web_traffic_config_save');//保存引流配置
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');