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

@@ -55,14 +55,14 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1462]]]);
+        $list = $projectModel->list(['id'=>['in',[802]]]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
 //            $this->getProduct();
 //            $this->getProduct();
-//            $this->setProductKeyword();
-            $this->getBlog();
+            $this->setProductKeyword();
+//            $this->getBlog();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;

@@ -32,8 +32,7 @@ class CustomModuleExtentController extends BaseController
             'module_id.required' => 'module_id不能为空',
             'module_id.required' => 'module_id不能为空',
         ]);
         ]);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $filed = ['id','title','status','type','operator_id','project_id','module_id','created_at','updated_at'];
-        $lists = $customModuleExtend->list($this->map,$this->order,$filed);
+        $lists = $customModuleExtend->list($this->map,$this->order,['id','title','key','status','type','operator_id','project_id','module_id','created_at','updated_at']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -109,4 +109,17 @@ class UserController extends BaseController
         $userLogic->user_del();
         $userLogic->user_del();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :获取当前项目的所有管理员
+     * @name   :getUserLists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/6 9:40
+     */
+    public function getUserLists(){
+        $userModel = new UserModel();
+        $list = $userModel->list(['project_id'=>$this->user['project_id']]);
+        $this->response('success',Code::SUCCESS,$list);
+    }
 }
 }

@@ -372,8 +372,8 @@ class InitHtmlLogic extends BaseLogic
         if(!empty($commonInfo['head_html']) && !empty($commonInfo['footer_html'])){
         if(!empty($commonInfo['head_html']) && !empty($commonInfo['footer_html'])){
             $html = preg_replace('/<header\b[^>]*>(.*?)<\/header>/s', $commonInfo['head_html'], $html);
             $html = preg_replace('/<header\b[^>]*>(.*?)<\/header>/s', $commonInfo['head_html'], $html);
             $html = preg_replace('/<footer\b[^>]*>(.*?)<\/footer>/s', $commonInfo['footer_html'], $html);
             $html = preg_replace('/<footer\b[^>]*>(.*?)<\/footer>/s', $commonInfo['footer_html'], $html);
-            $html = preg_replace('/<style id="globalsojs-header">(.*?)<\/style>/s', $commonInfo['head_css'], $html);
-            $html = preg_replace('/<style id="globalsojs-footer">(.*?)<\/style>/s', $commonInfo['footer_css'], $html);
+            $html = preg_replace('/<style id="globalsojs-header">(.*?)<\/style>/s', $commonInfo['head_style'] ?? '', $html);
+            $html = preg_replace('/<style id="globalsojs-footer">(.*?)<\/style>/s', $commonInfo['footer_style'] ?? '', $html);
         }
         }
         return $html;
         return $html;
     }
     }

@@ -44,7 +44,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/info', [\App\Http\Controllers\Bside\User\UserController::class, 'info'])->name('user_info');
         Route::any('/info', [\App\Http\Controllers\Bside\User\UserController::class, 'info'])->name('user_info');
         Route::any('/role_list', [\App\Http\Controllers\Bside\User\UserController::class, 'role_list'])->name('user_role_list');
         Route::any('/role_list', [\App\Http\Controllers\Bside\User\UserController::class, 'role_list'])->name('user_role_list');
         Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
         Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
-
+        Route::any('/getUserLists', [\App\Http\Controllers\Bside\User\UserController::class, 'getUserLists'])->name('user_getUserLists');
     });
     });
     //项目独立头部和底部设置
     //项目独立头部和底部设置
     Route::prefix('pageSetting')->group(function () {
     Route::prefix('pageSetting')->group(function () {