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

Lyh server



查看合并请求 !2191

@@ -41,21 +41,16 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>1,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
         //获取
         //获取
         $keywordPrefixModel = new KeywordPrefix();
         $keywordPrefixModel = new KeywordPrefix();
-        $keywordPrefixArr = $keywordPrefixModel->selectField(['project_id'=>0,'type'=>1],'keyword');
-        $prefixStr = explode("\n",$keywordPrefixArr);
-        $keywordSuffixArr = $keywordPrefixModel->selectField(['project_id'=>0,'type'=>2],'keyword');
-        $suffixStr = explode("\n",$keywordSuffixArr);
+        $lists = $keywordPrefixModel->list(['project_id'=>0,'id'=>['<',29]]);
         $whiteModel = new ProjectWhiteHatAffix();
         $whiteModel = new ProjectWhiteHatAffix();
         foreach ($lists as $val) {
         foreach ($lists as $val) {
             echo date('Y-m-d H:i:s') . '开始--项目的id:' . $val['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . '开始--项目的id:' . $val['id'] . PHP_EOL;
             $data = [
             $data = [
-                'project_id'=>$val['id'],
-                'prefix'=>$prefixStr,
-                'suffix'=>$suffixStr,
+                'project_id'=>0,
+                'name'=>$val['keyword'],
+                'type'=>$val['type'],
             ];
             ];
             $whiteModel->add($data);
             $whiteModel->add($data);
         }
         }