Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

+<?php
+
+namespace App\Http\Controllers\Bside\Ai;
+
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Ai\AiBlogLogic;
+use App\Http\Requests\Bside\Ai\AiBlogRequest;
+
+class AiBlogController extends BaseController
+{
+    /**
+     * @remark :Ai博客发布
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 14:33
+     */
+    public function save(AiBlogRequest $aiBlogRequest,AiBlogLogic $aiBlogLogic){
+        $aiBlogRequest->validated();
+        $aiBlogLogic->blogSave();
+        $this->response('success');
+    }
+}

+<?php
+
+namespace App\Http\Controllers\Bside\Ai;
+
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Ai\AiNewsLogic;
+use App\Http\Requests\Bside\Ai\AiNewsRequest;
+
+/**
+ * @remark :ai发布新闻
+ * @name   :AiNewsController
+ * @author :lyh
+ * @time   :2023/7/5 14:17
+ */
+class AiNewsController extends BaseController
+{
+    /**
+     * @remark :Ai新闻发布
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 14:33
+     */
+    public function save(AiNewsRequest $aiNewsRequest,AiNewsLogic $aiNewsLogic){
+        $aiNewsRequest->validated();
+        $aiNewsLogic->newsSave();
+        $this->response('success');
+    }
+}

+<?php
+
+namespace App\Http\Controllers\Bside\Ai;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Ai\AiProductLogic;
+use App\Http\Requests\Bside\Ai\AiProductRequest;
+
+class AiProductController extends BaseController
+{
+    /**
+     * @remark :Ai产品发布
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 14:34
+     */
+    public function save(AiProductRequest $aiProductRequest,AiProductLogic $aiProductLogic){
+        $aiProductRequest->validated();
+        $aiProductLogic->productSave();
+        $this->response('success');
+    }
+
+    /**
+     * @remark :获取产品列表
+     * @name   :productList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 17:03
+     */
+    public function productList(AiProductLogic $aiProductLogic){
+        $list = $aiProductLogic->productList($this->map);
+        $this->response('success',Code::SUCCESS,$list);
+    }
+
+    /**
+     * @remark :获取产品分类
+     * @name   :productCateList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 17:04
+     */
+    public function productCateList(AiProductLogic $aiProductLogic){
+        $list = $aiProductLogic->productCateList($this->map);
+        $this->response('success',Code::SUCCESS,$list);
+    }
+}

@@ -147,11 +147,7 @@ class ComController extends BaseController
     }
     }
 
 
     public function ceshi(){
     public function ceshi(){
-        $data = DB::table('gl_customer_visit')
-            ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
-            ->groupBy('country')->where(['domain'=>'http://lxl.petuu.shop/'])
-            ->orderBy('ip','desc')->limit(10)->get()->toArray();
-        return $data;
+
     }
     }
 
 
     /**
     /**

+<?php
+
+namespace App\Http\Logic\Bside\Ai;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Ai\AiBlog;
+
+class AiBlogLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new AiBlog();
+    }
+
+    /**
+     * @remark :ai发布博客
+     * @name   :blogSave
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 14:46
+     */
+    public function blogSave(){
+        $this->param['project_id'] = $this->user['project_id'];
+        $rs = $this->model->add($this->param);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+}

+<?php
+
+namespace App\Http\Logic\Bside\Ai;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Ai\AiNews;
+
+class AiNewsLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new AiNews();
+    }
+
+    /**
+     * @remark :AI发布新闻
+     * @name   :newsSave
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 14:44
+     */
+    public function newsSave(){
+        $this->param['project_id'] = $this->user['project_id'];
+        $rs = $this->model->add($this->param);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+}

+<?php
+
+namespace App\Http\Logic\Bside\Ai;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Ai\AiProduct;
+use App\Models\Product\Category;
+use App\Models\Product\Product;
+
+class AiProductLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new AiProduct();
+    }
+
+    /**
+     * @remark :ai发布产品
+     * @name   :productSave
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 14:47
+     */
+    public function productSave(){
+        $this->param['project_id'] = $this->user['project_id'];
+        $rs = $this->model->add($this->param);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @param $map
+     * @remark :获取产品列表
+     * @name   :productList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 15:08
+     */
+    public function productList($map){
+        $map['project_id'] = $this->user['project_id'];
+        $productModel = new Product();
+        $list = $productModel->list($map,'created_at',['id','title','attrs','describe','project_id']);
+        return $this->success($list);
+    }
+
+    /**
+     * @remark :获取产品分类
+     * @name   :productCateList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/5 15:09
+     */
+    public function productCateList($map){
+        $map['project_id'] = $this->user['project_id'];
+        $productCateModel = new Category();
+        $list = $productCateModel->list($map,'created_at',['id','project_id','title']);
+        return $this->success($list);
+    }
+}

@@ -48,7 +48,6 @@ class CountLogic extends BaseLogic
             'company'=>$this->project['company'],
             'company'=>$this->project['company'],
             'scheme'=>$this->project['deploy_build']['plan'],
             'scheme'=>$this->project['deploy_build']['plan'],
             'service_duration'=>$this->project['deploy_build']['service_duration'],
             'service_duration'=>$this->project['deploy_build']['service_duration'],
-            'domain'=>$this->project['deploy_build']['test_domain']
         ];
         ];
         return $this->success($data);
         return $this->success($data);
     }
     }

@@ -97,8 +97,7 @@ class MonthCountLogic extends BaseLogic
     public function flowCount(&$arr,&$startTime,&$endTime,$project_id){
     public function flowCount(&$arr,&$startTime,&$endTime,$project_id){
         $pv_ip = DB::table('gl_count')
         $pv_ip = DB::table('gl_count')
             ->where(['project_id'=>$project_id])
             ->where(['project_id'=>$project_id])
-            ->where('date','>=',$startTime.' 00:00:00')
-            ->where('date','<=',$endTime.' 23:59:59')
+            ->whereBetween('date', [$startTime.' 00:00:00',$endTime.' 23:59:59'])
             ->select(DB::raw('SUM(pv_num) as pv_num'), DB::raw('SUM(ip_num) as ip_num'))
             ->select(DB::raw('SUM(pv_num) as pv_num'), DB::raw('SUM(ip_num) as ip_num'))
             ->first();
             ->first();
         $arr['pv'] = $pv_ip->pv_num;
         $arr['pv'] = $pv_ip->pv_num;

@@ -28,7 +28,7 @@ class DeptUserLogic extends BaseLogic
             $rs = $this->dept_user_add();
             $rs = $this->dept_user_add();
         }
         }
         if ($rs === false) {
         if ($rs === false) {
-            $this->fail('部门添加成员失败');
+            $this->fail('error');
         }
         }
         return $this->success();
         return $this->success();
     }
     }

+<?php
+
+namespace App\Http\Requests\Bside\Ai;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AiBlogRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'keywords'=>'required',
+            'new_title'=>'required',
+            'text'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'keywords.required' => '关键字不能为空',
+            'new_title.required' => '新标题不能为空',
+            'text.required' => '内容不能为空',
+        ];
+    }
+}

+<?php
+
+namespace App\Http\Requests\Bside\Ai;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AiNewsRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'keywords'=>'required',
+            'new_title'=>'required',
+            'text'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'keywords.required' => '关键字不能为空',
+            'new_title.required' => '新标题不能为空',
+            'text.required' => '内容不能为空',
+        ];
+    }
+}

+<?php
+
+namespace App\Http\Requests\Bside\Ai;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AiProductRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'product_id'=>'required',
+            'category_id'=>'required',
+            'keywords'=>'required',
+            'new_title'=>'required',
+            'new_keywords'=>'required',
+            'text'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'product_id.required'=>'所属产品不能为空',
+            'category_id.required'=>'分类不能为空',
+            'keywords.required'=>'核心关键字不能为空',
+            'new_title.required'=>'新标题不能为空',
+            'new_keywords.required'=>'新关键字不能为空',
+            'text.required'=>'内容不能为空',
+        ];
+    }
+}

+<?php
+
+namespace App\Models\Ai;
+
+use App\Models\Base;
+
+class AiBlog extends Base
+{
+    protected $table = 'gl_ai_blog';
+}

+<?php
+
+namespace App\Models\Ai;
+
+use App\Models\Base;
+
+class AiNews extends Base
+{
+    protected $table = 'gl_ai_news';
+}

+<?php
+
+namespace App\Models\Ai;
+
+use App\Models\Base;
+
+class AiProduct extends Base
+{
+    protected $table = 'gl_ai_product';
+}

@@ -98,6 +98,17 @@ Route::middleware(['bloginauth'])->group(function () {
         //公用ai自动生成
         //公用ai自动生成
         Route::any('/ai_http_post', [\App\Http\Controllers\Bside\Ai\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');
         Route::any('/ai_http_post', [\App\Http\Controllers\Bside\Ai\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');
     });
     });
+
+    //ai生成相关接口
+    Route::prefix('ai')->group(function () {
+        //ai
+        Route::any('/news/', [\App\Http\Controllers\Bside\Ai\AiNewsController::class, 'save'])->name('ai_news_save');
+        Route::any('/blog/', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'save'])->name('ai_blog_save');
+        Route::any('/product/', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'save'])->name('ai_product_save');
+        Route::any('/product/productList', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'productList'])->name('ai_product_productList');
+        Route::any('/product/productCateList', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'productCateList'])->name('ai_product_productCateList');
+    });
+
     //网站设置
     //网站设置
     Route::prefix('setting')->group(function () {
     Route::prefix('setting')->group(function () {
         //首页设置
         //首页设置