Merge branch 'develop' into dc

@@ -4,6 +4,7 @@
 /storage
 /vendor
 /uploads
+composer.json
 .env
 .env.backup
 .phpunit.result.cache

@@ -45,12 +45,16 @@ class ShareUser extends Command
         $ayr_share_model = new AyrShareModel();
         $ayr_share_list = $ayr_share_model->list();
         foreach ($ayr_share_list as $k => $v){
+            $time = Carbon::now()->modify('-7 days')->toDateString();
+            //创建时间小于7天前的当前时间
+            if($v['created_at'] > $time){
+                continue;
+            }
             //查询当前用户是否有未推送的博文
             $ayr_release = new AyrReleaseModel();
             $release_info = $ayr_release->read(['schedule_date'=>['>',date('Y-m-d H:i:s',time())],'share_id'=>$v['id']]);
             //有推文时,直接跳出循环
             if($release_info !== false){
-                $this->error++;
                 continue;
             }
             //查看用户是否在一周内有发送博客
@@ -59,7 +63,6 @@ class ShareUser extends Command
             $release_info = $ayr_release->read(['created_at'=>['between',[$start_at,$end_at]]]);
             //有发送博文，则跳出循环
             if($release_info  !== false){
-                $this->error++;
                 continue;
             }
             //删除用户第三方配置

@@ -6,7 +6,6 @@ use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Models\CustomerVisit\CustomerVisitItem;
 use App\Models\Project\DeployBuild;
-use App\Models\Project\DeployOptimize;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -36,7 +35,7 @@ class Yesterday extends Command
      */
     public function handle()
     {
-        $deployModel = new DeployOptimize();
+        $deployModel = new DeployBuild();
         $list = $deployModel->list();
         $data = [];
         $yesterday = Carbon::yesterday()->toDateString();

@@ -14,7 +14,6 @@ class AiCommandController extends BaseController
     public $chat_url = 'v2/openai_chat';
     /**
      * @name :ai生成
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -38,8 +37,7 @@ class AiCommandController extends BaseController
     }
 
     /**
-     * @name ：写入日志
-     * @return void
+     * @name :写入日志
      * @author :liyuhang
      * @method
      */

@@ -13,7 +13,6 @@ class BlogCategoryController extends BaseController
 {
     /**
      * @name :博客分类列表
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -34,7 +33,6 @@ class BlogCategoryController extends BaseController
 
     /**
      * @name :获取当前分类详情
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -49,7 +47,6 @@ class BlogCategoryController extends BaseController
     }
     /**
      * @name :添加分类
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -62,7 +59,6 @@ class BlogCategoryController extends BaseController
 
     /**
      * @name :编辑分类
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -79,7 +75,6 @@ class BlogCategoryController extends BaseController
 
     /**
      * @name :编辑状态/与排序
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -95,7 +90,6 @@ class BlogCategoryController extends BaseController
 
     /**
      * @name :删除分类
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -16,7 +16,6 @@ class BlogController extends BaseController
     public $model = 'blog';
     /**
      * @name :博客列表
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -39,7 +38,6 @@ class BlogController extends BaseController
 
     /**
      * @name :获取分页列表
-     * @return void
      * @throws \App\Exceptions\BsideGlobalException
      * @author :liyuhang
      * @method
@@ -50,7 +48,6 @@ class BlogController extends BaseController
     }
     /**
      * @name :获取当前博客详情
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -65,7 +62,6 @@ class BlogController extends BaseController
     }
     /**
      * @name :添加博客
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -116,7 +112,6 @@ class BlogController extends BaseController
     }
     /**
      * @name :编辑博客状态/排序
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -134,7 +129,6 @@ class BlogController extends BaseController
 
     /**
      * @name :删除博客（批量逻辑删除）
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -13,7 +13,6 @@ class BlogLabelController extends BaseController
 {
     /**
      * @name :博客标签列表
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -38,7 +37,6 @@ class BlogLabelController extends BaseController
 
     /**
      * @name :编辑标签
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -55,7 +53,6 @@ class BlogLabelController extends BaseController
 
     /**
      * @name :编辑标签状态/排序
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -72,7 +69,6 @@ class BlogLabelController extends BaseController
 
     /**
      * @name :删除标签（批量删除）
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -28,7 +28,6 @@ class ComController extends BaseController
 {
     /**
      * @name :管理员登录
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -51,7 +50,6 @@ class ComController extends BaseController
 
     /**
      * @name :获取当前用户权限菜单列表
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -76,7 +74,6 @@ class ComController extends BaseController
 
     /**
      * @name :获取当前项目详情
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -90,7 +87,6 @@ class ComController extends BaseController
 
     /**
      * @name :登录用户编辑资料/修改密码
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -159,6 +155,21 @@ class ComController extends BaseController
     }
 
     public function ceshi(){
-        return $this->projectUrlNotify('news');
+        $data = [];
+        for ($i = 1;$i <= 30 ;$i++){
+            $start_time = Carbon::now()->modify('-'.$i.' days')->toDateString();
+            $data[] = [
+                'project_id'=>1,
+                'pv_num'=>$i*(rand(10,1000)),
+                'ip_num'=>$i*(rand(10,1000)),
+                'inquiry_num'=>$i*(rand(10,1000)),
+                'date'=>$start_time,
+                'compliance_day'=>2351,
+                'service_day'=>1233,
+                'created_at'=>$start_time.' 00:00:00',
+                'updated_at'=>$start_time.' 00:00:00',
+            ];
+        }
+        DB::table('gl_count')->insert($data);
     }
 }

@@ -14,7 +14,6 @@ class MailController extends BaseController
     const STATUS_ONE = 1; //状态为已读状态
     /**
      * @name :当前用户站内信列表
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -42,7 +41,6 @@ class MailController extends BaseController
 
     /**
      * @name :获取站内信详情
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -13,7 +13,6 @@ class NewsCategoryController extends BaseController
 {
     /**
      * @name :新闻分类列表
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -34,7 +33,6 @@ class NewsCategoryController extends BaseController
 
     /**
      * @name :获取当前分类详情
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -49,7 +47,6 @@ class NewsCategoryController extends BaseController
     }
     /**
      * @name :添加分类
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -62,7 +59,6 @@ class NewsCategoryController extends BaseController
 
     /**
      * @name :编辑分类
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -78,7 +74,6 @@ class NewsCategoryController extends BaseController
 
     /**
      * @name :编辑状态/排序
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -94,7 +89,6 @@ class NewsCategoryController extends BaseController
 
     /**
      * @name :删除分类
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -18,7 +18,6 @@ class NewsController extends BaseController
     public $model = 'news';
     /**
      * @name :获取新闻列表
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -37,7 +36,6 @@ class NewsController extends BaseController
 
     /**
      * @name :添加新闻时获取分类列表
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -47,7 +45,6 @@ class NewsController extends BaseController
     }
     /**
      * @name :获取详情
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -76,7 +73,6 @@ class NewsController extends BaseController
 
     /**
      * @name :编辑
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -94,7 +90,6 @@ class NewsController extends BaseController
 
     /**
      * @name :编辑新闻seo
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -116,7 +111,6 @@ class NewsController extends BaseController
 
     /**
      * @name :编辑状态/与排序
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -133,7 +127,6 @@ class NewsController extends BaseController
     }
     /**
      * @name :删除新闻（逻辑删除）
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -73,6 +73,8 @@ class ProductController extends BaseController
     public function save(ProductRequest $request, ProductLogic $logic)
     {
         $data = $logic->save($this->param);
+        //通知更新界面
+        $this->projectUrlNotify('product');
         return $this->success($data);
     }
 

@@ -11,7 +11,6 @@ class DeptUserController extends BaseController
 {
     /**
      * @name :name
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -14,7 +14,6 @@ class ProjectRoleController extends BaseController
 {
     /**
      * @name :用户角色列表()
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -30,7 +29,6 @@ class ProjectRoleController extends BaseController
 
     /**
      * @name :根据角色获取会员列表
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -41,7 +39,6 @@ class ProjectRoleController extends BaseController
     }
     /**
      * @name :详情
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -56,7 +53,6 @@ class ProjectRoleController extends BaseController
     }
     /**
      * @name :添加/编辑角色时获取菜单列表
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -66,7 +62,6 @@ class ProjectRoleController extends BaseController
     }
     /**
      * @name :添加角色
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -78,7 +73,6 @@ class ProjectRoleController extends BaseController
 
     /**
      * @name :编辑角色
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -94,7 +88,6 @@ class ProjectRoleController extends BaseController
 
     /**
      * @name :修改用户状态
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -110,7 +103,6 @@ class ProjectRoleController extends BaseController
 
     /**
      * @name :删除角色
-     * @return void
      * @author :liyuhang
      * @method
      */

@@ -17,7 +17,6 @@ class UserController extends BaseController
 {
     /**
      * @name :name
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -41,7 +40,6 @@ class UserController extends BaseController
 
     /**
      * @name :添加管理员
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -53,7 +51,6 @@ class UserController extends BaseController
 
     /**
      * @name : 编辑管理员
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -69,7 +66,6 @@ class UserController extends BaseController
 
     /**
      * @name :修改当前用户状态
-     * @return void
      * @author :liyuhang
      * @method
      */
@@ -85,7 +81,6 @@ class UserController extends BaseController
 
     /**
      * @name :详情
-     * @return json
      * @author :liyuhang
      * @method
      */
@@ -100,7 +95,6 @@ class UserController extends BaseController
     }
     /**
      * @name :删除管理员
-     * @return json
      * @author :liyuhang
      * @method
      */

@@ -131,7 +131,7 @@ class CountLogic extends BaseLogic
     public function inquiry_country_count(){
         $data = DB::table('gl_inquiry_record')
             ->select('ip_area', DB::raw('COUNT(ip_area) as count'))
-            ->groupBy('ip_area')->orderBy('count','desc')->limit(20)->get()->toArray();
+            ->groupBy('ip_area')->orderBy('count','desc')->limit(10)->get()->toArray();
         $data = object_to_array($data);
         $total = DB::table('gl_inquiry_record')->count();
         foreach ($data as $k=>$v){