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

@@ -26,7 +26,7 @@ class UpgradeProjectCount extends Command
      *
      * @var string
      */
-    protected $signature = 'upgrade_month_count';
+    protected $signature = 'upgrade_month_count {project_id}';
 
     /**
      * The console command description.
@@ -36,13 +36,12 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
 
     public function handle(){
-        $project_id = 769;
+        $project_id = $this->argument('project_id');
         $oldModel = new UpdateOldInfo();
         $info = $oldModel->read(['project_id'=>$project_id]);
         $url = $info['old_domain_online'];
         ProjectServer::useProject($project_id);
         $this->count($project_id,$url);
-
         DB::disconnect('custom_mysql');
     }
 

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>645]);
+        $list = $projectModel->list(['id'=>264]);
         $data = [];
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -300,4 +300,28 @@ class ComController extends BaseController
         }
         $this->response('success',Code::SUCCESS,['url'=>$url_link]);
     }
+
+    /**
+     * @remark :根据手机号码，获取当前号码拥有的所有项目
+     * @name   :getMobileProject
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/22 9:32
+     */
+    public function getMobileProject(){
+        $data = [];
+        $userModel = new User();
+        $list = $userModel->list(['mobile'=>$this->user['mobile'],'project_id'=>['!=',$this->user['project_id']]],'id',['id','project_id']);
+        if(!empty($list)){
+            $projectModel = new Project();
+            foreach ($list as $k => $v){
+                $projectInfo = $projectModel->read(['id'=>$v['project_id']],['id','company']);
+                //获取当前项目详情
+                $data[] = ['project_id'=>$projectInfo['id'],'company'=>$projectInfo['company']];
+            }
+        }
+        //登录选择项目的有效时间
+        Cache::add('login-project-'.$this->user['mobile'],1,300);
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }

@@ -43,6 +43,10 @@ class DomainInfoLogic extends BaseLogic
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         }else{
+            //查看域名是否以WWW开头
+            if (strpos($this->param['domain'], 'www.') === 0) {
+                $this->param['other_domain'] = json_encode([str_replace('www', '*', $this->param['domain']),str_replace('www.', '', $this->param['domain'])]);
+            }
             $rs = $this->model->add($this->param);
         }
         if($rs === false){

@@ -386,4 +386,5 @@ class UserLoginLogic
         throw new AsideGlobalException($code, $message);
     }
 
+
 }

@@ -19,6 +19,7 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::any('/get_project', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_project'])->name('get_project');
     Route::any('/generateToken', [\App\Http\Controllers\Bside\BCom\ComController::class, 'generateToken'])->name('generateToken');
     Route::any('/getLink', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getLink'])->name('getLink');
+    Route::any('/getMobileProject', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getMobileProject'])->name('getMobileProject');
     //用户相关路由
     Route::prefix('user')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');