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

@@ -28,6 +28,7 @@ class ServersController extends BaseController
         if(isset($this->map['server_name']) && !empty($this->map['server_name'])){
         if(isset($this->map['server_name']) && !empty($this->map['server_name'])){
             $this->map['server_name'] = ['like','%'.$this->map['server_name'].'%'];
             $this->map['server_name'] = ['like','%'.$this->map['server_name'].'%'];
         }
         }
+        $this->map['status'] = 0;
         $serversModel = new ServersModel();
         $serversModel = new ServersModel();
         $lists = $serversModel->list($this->map);
         $lists = $serversModel->list($this->map);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);

@@ -121,4 +121,21 @@ class ATemplateModuleController extends BaseController
         $list = $project->list($this->map,'id',['id','title']);
         $list = $project->list($this->map,'id',['id','title']);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
+
+    /**
+     * @remark :修改审核状态
+     * @name   :auditingStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/23 16:42
+     */
+    public function auditingStatus(ATemplateModuleLogic $ATemplateModuleLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $data = $ATemplateModuleLogic->auditingStatus();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -100,4 +100,19 @@ class ATemplateModuleLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+    /**
+     * @remark :修改状态
+     * @name   :auditingStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/23 16:44
+     */
+    public function auditingStatus(){
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('修改失败，请联系管理员');
+        }
+        return $this->success(['id'=>$this->param['id']]);
+    }
+
 }
 }

@@ -203,7 +203,7 @@ class BlogLogic extends BaseLogic
     public function getCategory($category){
     public function getCategory($category){
         $str = '';
         $str = '';
         foreach ($category as $v){
         foreach ($category as $v){
-                $str .= $v.',';
+            $str .= $v.',';
         }
         }
         return !empty(trim($str,',')) ? ','.$str.',' : '';
         return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
     }

@@ -59,32 +59,23 @@ class NewsLogic extends BaseLogic
      */
      */
     public function newsSave()
     public function newsSave()
     {
     {
-        //拼接参数
-//        DB::beginTransaction();
-//        try {
-            $this->param = $this->paramProcessing($this->param);
-            if (isset($this->param['id']) && !empty($this->param['id'])) {
-                $id = $this->param['id'];
-                $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
-                $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
-                if($is_upgrade == 0 || $six_read == 1) {
-                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
-                }
-                //是否更新路由
-                $route = $this->param['url'];
-                $this->edit($this->param, ['id' => $id]);
-            } else {
-                $this->param['sort'] = $this->setNewsSort();
-                $id = $this->model->addReturnId($this->param);
-                $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
-                $this->edit(['url' => $route], ['id' => $id]);
+        $this->param = $this->paramProcessing($this->param);
+        if (isset($this->param['id']) && !empty($this->param['id'])) {
+            $id = $this->param['id'];
+            $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
+            $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
+            if($is_upgrade == 0 || $six_read == 1) {
+                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
             }
             }
-//            //更新路由
-//            DB::commit();
-//        } catch (\Exception $e) {
-//            DB::rollBack();
-//            $this->fail('系统错误，请联系管理员');
-//        }
+            //是否更新路由
+            $route = $this->param['url'];
+            $this->edit($this->param, ['id' => $id]);
+        } else {
+            $this->param['sort'] = $this->setNewsSort();
+            $id = $this->model->addReturnId($this->param);
+            $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
+            $this->edit(['url' => $route], ['id' => $id]);
+        }
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
@@ -223,10 +214,10 @@ class NewsLogic extends BaseLogic
      */
      */
     public function getCategory($category){
     public function getCategory($category){
         $str = '';
         $str = '';
-        if(is_array($category) && $category){
-            $str = ','.implode(',',$category).',';
+        foreach ($category as $v){
+            $str .= $v.',';
         }
         }
-        return $str;
+        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
     }
 
 
     /**
     /**

@@ -373,6 +373,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
             Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
             Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
             Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
             Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
             Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
+            Route::any('/auditingStatus', [Aside\Template\ATemplateModuleController::class, 'auditingStatus'])->name('admin.ATemplateModule_auditingStatus');
             Route::any('/getProjectList', [Aside\Template\ATemplateModuleController::class, 'getProjectList'])->name('admin.ATemplateModule_getProjectList');
             Route::any('/getProjectList', [Aside\Template\ATemplateModuleController::class, 'getProjectList'])->name('admin.ATemplateModule_getProjectList');
         });
         });
         //设置类型
         //设置类型