合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2020

@@ -25,6 +25,7 @@ use App\Models\Project\ProjectAiSetting;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
+use App\Models\Template\TemplateTypeMain;
 use App\Models\Visit\Visit;
 use App\Models\Visit\Visit;
 use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebSetting;
 use App\Models\WebSetting\WebSetting;
@@ -53,6 +54,10 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
+        return true;
+    }
+
+    public function _actionTemplateMain(){
         $data = [];
         $data = [];
         $projectModel = new Project();
         $projectModel = new Project();
         $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
         $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
@@ -64,6 +69,12 @@ class lyhDemo extends Command
             $categoryModel = new Category();
             $categoryModel = new Category();
             $count = $categoryModel->counts(['id'=>['>',0]]);
             $count = $categoryModel->counts(['id'=>['>',0]]);
             if(($info === false) && ($count > 0)){
             if(($info === false) && ($count > 0)){
+                $mainModel = new TemplateTypeMain();
+                $mainInfo = $mainModel->read(['type'=>2,'is_list'=>1,'is_custom'=>0]);
+                $main_html = $mainInfo['main_html'];
+                $main_css = "<style id='globalsojs-styles'></style>";
+                //写入一条初始数据
+                $bTemplateMainModel->addReturnId(['type'=>2,'is_list'=>1,'is_custom'=>0,'project_id'=>$val['id'],'main_html'=>$main_html,'main_css'=>$main_css]);
                 $data[] = $val['id'];
                 $data[] = $val['id'];
             }
             }
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');

@@ -16,6 +16,7 @@ use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
+use App\Models\Manage\ManageHr;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
 use App\Models\Task\Task;
 use App\Models\Task\Task;
@@ -122,7 +123,7 @@ class RenewProjectController extends BaseController
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();
-            $manageModel = new Manage();
+            $manageModel = new ManageHr();
             $domainModel = new DomainInfo();
             $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k=>$item){
             foreach ($lists['list'] as $k=>$item){
                 $item = $this->handleParam($item,$manageModel,$domainModel);
                 $item = $this->handleParam($item,$manageModel,$domainModel);