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

@@ -47,7 +47,7 @@ class ShareUser extends Command
         foreach ($ayr_share_list as $k => $v){
             //查询当前用户是否有未推送的博文
             $ayr_release = new AyrReleaseModel();
-            $release_info = $ayr_release->read(['idempotency_key'=>['>',date('Y-m-d H:i:s',time())],'share_id'=>$v['id']]);
+            $release_info = $ayr_release->read(['schedule_date'=>['>',date('Y-m-d H:i:s',time())],'share_id'=>$v['id']]);
             //有推文时,直接跳出循环
             if($release_info !== false){
                 continue;

@@ -114,8 +114,6 @@ zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
      */
     public function post_send_msg($param,$api_key){
         //平台参数处理
-//        $this->headers['Accept-Encoding'] = 'gzip';
-//        $this->headers['Authorization'] = $this->headers['Authorization'].$api_key;
         $param['idempotencyKey'] = uniqid().time();
         $url = $this->path.'/api/post';
         return $this->http_post_ayr($url,$param,$api_key);

@@ -3,12 +3,16 @@
 namespace App\Http\Controllers\Bside;
 
 use App\Enums\Common\Code;
+use App\Helper\AyrShare as AyrShareHelper;
 use App\Helper\Country;
+use App\Models\AyrShare\AyrRelease as AyrReleaseModel;
+use App\Models\AyrShare\AyrShare as AyrShareModel;
 use App\Models\Project\Project;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User as UserModel;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
@@ -116,8 +120,60 @@ class ComController extends BaseController
         $this->response('success');
     }
 
-    public function get_country(){
-        $country = new Country();
-        return $country->set_country();
-    }
+
+    /**
+     * @name   : (测试定时任务)检测用户是否无操作记录
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/12 14:55
+     */
+//    protected function ceShi(){
+//        $this->error = 0;
+//        //获取所有ayr_share用户
+//        $ayr_share_model = new AyrShareModel();
+//        $ayr_share_list = $ayr_share_model->list($this->map);
+//        if(!empty($ayr_share_list)){
+//            foreach ($ayr_share_list as $k => $v){
+//                //查询当前用户是否有未推送的博文
+//                $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){
+//                    continue;
+//                }
+//                //查看用户是否在一周内有发送博客
+//                $start_at = Carbon::now()->modify('-7 days')->toDateString();
+//                $end_at = Carbon::now()->toDateString();
+//                $release_info = $ayr_release->read(['created_at'=>['between',[$start_at,$end_at]]]);
+//                //有发送博文，则跳出循环
+//                if($release_info  == false){
+//                    continue;
+//                }
+//                //删除用户第三方配置
+//                $ayr_share_helper = new AyrShareHelper();
+//                $data_profiles = [
+//                    'title'=>$v['title'],
+//                    'profileKey'=>$v['profile_key']
+//                ];
+//                $res = $ayr_share_helper->deleted_profiles($data_profiles);
+//                if($res['status'] == 'fail'){
+//                    $this->error++;
+//                    continue;
+//                }
+//                //更新数据库
+//                $data = [
+//                    'title'=>null,
+//                    'bind_plat_from'=>null,
+//                    'profile_key'=>null,
+//                    'ref_id'=>null,
+//                ];
+//                $res = $ayr_share_model->edit($data,['id'=>$v['id']]);
+//                if($res == false){
+//                    $this->error++;
+//                }
+//            }
+//        }
+//        return $this->error;
+//    }
+
 }

@@ -5,13 +5,21 @@ namespace App\Http\Controllers\Bside\User;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\DeptUserLogic;
-use App\Http\Logic\Bside\User\UserLogic;
-use App\Models\User\DeptUser;
 use App\Models\User\ViewDeptUser;
 
 class DeptUserController extends BaseController
 {
-
+    /**
+     * @name :name
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function lists(ViewDeptUser $viewDeptUser){
+        $this->map['project_id'] = $this->user['project_id'];
+        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
+        $this->response('success',Code::SUCCESS,$lists);
+    }
     /**
      * @param ViewDeptUser $viewDeptUser
      * @name   :（详情）info

@@ -21,9 +21,13 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists(ViewDeptUser $viewDeptUser){
+    public function lists(UserModel $userModel){
+        //TODO::搜索参数统一处理
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
+        $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']);
+        if(empty($lists)){
+            $this->response('error',Code::USER_ERROR,[]);
+        }
         $this->response('success',Code::SUCCESS,$lists);
     }
 

@@ -84,7 +84,7 @@ class Base extends Model
      * @author :liyuhang
      * @method
      */
-    public function list($map,$order = 'sort',$fields = ['*']): array
+    public function list($map = [],$order = 'id',$fields = ['*']): array
     {
         $query = $this->formatQuery($map);
         $lists = $query->select($fields)->orderBy($order)->get();

@@ -176,6 +176,7 @@ Route::middleware(['bloginauth'])->group(function () {
         //成员管理
         //组织架构
         Route::prefix('user')->group(function () {
+            Route::any('/', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'lists'])->name('dept_user');
             Route::any('/save', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'save'])->name('dept_user_add');
             Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info');
             Route::any('/set_admin', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'set_admin'])->name('dept_user_set_admin');
@@ -266,7 +267,7 @@ Route::middleware(['bloginauth'])->group(function () {
 //无需登录验证的路由组
 Route::group([], function () {
     Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
-//    Route::any('/', [\App\Http\Controllers\Bside\ComController::class, 'get_country'])->name('get_country');
+    Route::any('/', [\App\Http\Controllers\Bside\ComController::class, 'ceShi'])->name('ce_shi');
     Route::get('/file/download', [\App\Http\Controllers\Bside\FileController::class, 'download'])->name('file_download');
     Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class,'index'])->name('image_show');
     Route::any('/file_hash/{hash}', [\App\Http\Controllers\File\FileController::class,'index'])->name('file_show');