Merge remote-tracking branch 'origin/master' into akun

@@ -53,7 +53,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>688]);
+        $list = $projectModel->list(['id'=>783]);
         $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;
@@ -119,14 +119,80 @@ class UpdateRoute extends Command
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
 //                    }
 //                    }
                 }else{
                 }else{
+                    echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
                     $route = Translate::tran($v['title'], 'en');
                     $route = Translate::tran($v['title'], 'en');
-                    echo date('Y-m-d H:i:s') . 'route :'.$route . PHP_EOL;
-                    $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    if(!empty($route)){
+                        echo date('Y-m-d H:i:s') . $route . PHP_EOL;
+                        $route = $this->setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }
                 }
                 }
-//                echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
+                echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
+            }
+        }
+    }
+
+    /**
+     * @param $title
+     * @param $source
+     * @param $source_id
+     * @param int $project_id
+     * @return bool
+     * @throws \Exception
+     * @author zbj
+     * @date 2023/4/17
+     */
+    public static function setRoute($title, $source, $source_id, $project_id = 0){
+        $route = self::generateRoute($title, $source, $source_id, $project_id);
+        if(!$route){
+            throw new \Exception('路由生成失败');
+        }
+        try {
+            $route_map = RouteMap::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
+            if(!$route_map){
+                $route_map = new RouteMap();
+                $route_map->source = $source;
+                $route_map->source_id = $source_id;
+                $route_map->project_id = $project_id;
             }
             }
+            $route_map->route = $route;
+            $route_map->save();
+        }catch (\Exception $e){
+            throw new \Exception('路由映射失败');
+        }
+        return $route;
+    }
+
+    /**
+     * 生成路由标识
+     * @param $title
+     * @param $source
+     * @param $source_id
+     * @param $project_id
+     * @return string
+     * @author zbj
+     * @date 2023/4/17
+     */
+    public static function generateRoute($title, $source, $source_id, $project_id){
+        $i=1;
+        $sign = generateRoute($title);
+        $length = strlen($sign);
+        if($length > 100){
+            $sign = trim(mb_substr($sign, 0, 100, 'UTF-8'),'-');
+        }
+        $info = RouteMap::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
+        $suffix = '';
+        if(empty($info)){
+            if($source == 'product'){
+                $suffix = '-product';
+            }
+        }
+        $route = $sign.$suffix;
+        while(RouteMap::isExist($route, $source_id, $project_id)){
+            $route = $sign .'-'.$i.$suffix;
+            $i++;
         }
         }
+        return $route;
     }
     }
 
 
     /**
     /**

@@ -60,7 +60,7 @@ class UserLogic extends BaseLogic
             }
             }
             $this->param = $this->editPassword($this->param);
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
-            DB::table('gl_user_edit_log')->insert(['message'=>json_encode($this->param),'user_id'=>$this->manager['id'],'project_id'=>$this->user['project_id'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]);
+            DB::table('gl_user_edit_log')->insert(['message'=>json_encode($this->param),'user_id'=>$this->manager['id'],'project_id'=>$info['project_id'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]);
         } else {
         } else {
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $rs = $this->model->add($this->param);
             $rs = $this->model->add($this->param);

@@ -58,6 +58,7 @@ class RouteMap extends Base
         }elseif(preg_match('/^[\x{0400}-\x{04FF}]+$/u', $title)){
         }elseif(preg_match('/^[\x{0400}-\x{04FF}]+$/u', $title)){
             $title = Translate::tran($title, 'en');
             $title = Translate::tran($title, 'en');
         }
         }
+
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
         $length = strlen($sign);
         $length = strlen($sign);