gx

@@ -262,33 +262,47 @@ class Demo extends Command
 //
 //        print_r($include);
 //    }
-
     public function handle(){
-        $projectModel = new DeployOptimize();
-        $list = $projectModel->list(['project_id'=>['<',187]]);
-        foreach ($list as $v){
-            echo date('Y-m-d H:i:s') . 'end'.json_encode($v) . PHP_EOL;
-            $data = [];
-            if(!empty($v['minor_languages']) && is_array($v['minor_languages'])){
-                foreach ($v['minor_languages'] as $k1=> $v1){
-                    if(!empty($v1['tl']) && !empty($v1['type'])){
-                        $data[] = [
-                            'language'=>$v1['tl'],
-                            'type'=>$v1['type'],
-                            'keywords'=>$v1['keywords'],
-                            'service_day'=>$v1['service_day'],
-                            'project_id'=>$v['project_id'],
-                            'created_at'=>date('Y-m-d H:i:s'),
-                            'updated_at'=>date('Y-m-d H:i:s')
-                        ];
+        $projectModel = new Project();
+        $list = $projectModel->list(['type'=>['in',[2,3]]]);
+        foreach ($list as $k => $v){
+            $domainModel = new DomainInfo();
+            if(!empty($v['uptime'])){
+                //获取项目域名的时间
+                $domainInfo = $domainModel->read(['project_id'=>$v['id']]);
+                if($domainInfo !== false){
+                    $projectModel->edit(['uptime'=>$domainInfo['created_at']],['id'=>$v['id']]);
+                    echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
                 }
             }
         }
-            $languageModel = new MinorLanguages();
-            $languageModel->insert($data);
-        }
-
     }
+//    public function handle(){
+//        $projectModel = new DeployOptimize();
+//        $list = $projectModel->list(['project_id'=>['<',187]]);
+//        foreach ($list as $v){
+//            echo date('Y-m-d H:i:s') . 'end'.json_encode($v) . PHP_EOL;
+//            $data = [];
+//            if(!empty($v['minor_languages']) && is_array($v['minor_languages'])){
+//                foreach ($v['minor_languages'] as $k1=> $v1){
+//                    if(!empty($v1['tl']) && !empty($v1['type'])){
+//                        $data[] = [
+//                            'language'=>$v1['tl'],
+//                            'type'=>$v1['type'],
+//                            'keywords'=>$v1['keywords'],
+//                            'service_day'=>$v1['service_day'],
+//                            'project_id'=>$v['project_id'],
+//                            'created_at'=>date('Y-m-d H:i:s'),
+//                            'updated_at'=>date('Y-m-d H:i:s')
+//                        ];
+//                    }
+//                }
+//            }
+//            $languageModel = new MinorLanguages();
+//            $languageModel->insert($data);
+//        }
+//
+//    }
 
     public function printMessage()
     {

@@ -55,10 +55,11 @@ class RouteMap extends Base
     public static function generateRoute($title, $source, $source_id, $project_id){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
             $title = Translate::tran($title, 'en');
-        }
-        if (preg_match('/[а-яА-Я]/u', $title) || mb_ereg('[а-яА-Я]', $title)) {
+        }else{
+            if(!preg_match('/^[a-zA-Z\s]+$/', $title)){
                 $title = Translate::tran($title, 'en');
             }
+        }
         $i=1;
         $sign = generateRoute($title);
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();