Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -9,13 +9,10 @@ use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\Manage\ManageLogic;
 use App\Models\City;
 use App\Models\InquirySet;
-use App\Models\Manage\Manage;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Payment;
 use App\Models\Project\Project;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -41,21 +38,21 @@ class ProjectLogic extends BaseLogic
             $item = [
                 'id' => $item['id'],
                 'title' => $item['title'],
-                'channel' => $item['channel']['channel'] . ' - ' . $item['channel']['saler'],
-                'key' => $item['deploy_build']['keyword_num'],
-                'day' => $item['deploy_build']['service_duration'],
-                'amount' => $item['payment']['amount'],
-                'build_leader' => ManageLogic::getCacheName($item['deploy_build']['leader_mid']), //组长
-                'build_manager' => ManageLogic::getCacheName($item['deploy_build']['manager_mid']), //项目经理
-                'build_designer' => ManageLogic::getCacheName($item['deploy_build']['designer_mid']), //设计师
-                'build_tech' => ManageLogic::getCacheName($item['deploy_build']['tech_mid']), //技术助理
-                'optimize_manager' => ManageLogic::getCacheName($item['deploy_optimize']['manager_mid']), //优化服务经理
-                'optimize_optimist' => ManageLogic::getCacheName($item['deploy_optimize']['optimist_mid']), //优化师
-                'optimize_assist' => ManageLogic::getCacheName($item['deploy_optimize']['assist_mid']), //优化助理
-                'optimize_tech' => ManageLogic::getCacheName($item['deploy_optimize']['tech_mid']), //售后技术
-                'type' => $this->model::typeMap()[$item['type']] ?: '',
-                'test_domain' => $item['deploy_build']['test_domain'],
-                'domain' => $item['deploy_optimize']['domain'],
+                'channel' => ($item['channel']['channel']??'') . ' - ' . ($item['channel']['saler']??''),
+                'key' => $item['deploy_build']['keyword_num'] ?? 0,
+                'day' => $item['deploy_build']['service_duration'] ?? 0,
+                'amount' => $item['payment']['amount'] ?? 0,
+                'build_leader' => ManageLogic::getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
+                'build_manager' => ManageLogic::getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
+                'build_designer' => ManageLogic::getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
+                'build_tech' => ManageLogic::getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
+                'optimize_manager' => ManageLogic::getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
+                'optimize_optimist' => ManageLogic::getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
+                'optimize_assist' => ManageLogic::getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
+                'optimize_tech' => ManageLogic::getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
+                'type' => $this->model::typeMap()[$item['type']] ?? '',
+                'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
+                'domain' => $item['deploy_optimize']['domain'] ?? 0,
                 'crated_at' => date('Y年m月d日', strtotime($item['created_at'])),
             ];
         }
@@ -69,12 +66,6 @@ class ProjectLogic extends BaseLogic
     }
 
     public function save($param){
-        if(!empty($param['deploy_build']['test_domain'])){
-            $param['deploy_build']['test_domain'] = checkDomain($param['deploy_build']['test_domain']);
-            if(!$param['deploy_build']['test_domain']){
-                $this->fail('测试域名格式不正确');
-            }
-        }
         if(!empty($param['deploy_optimize']['domain'])){
             $param['deploy_optimize']['domain'] = checkDomain($param['deploy_optimize']['domain']);
             if(!$param['deploy_optimize']['domain']){
@@ -84,6 +75,9 @@ class ProjectLogic extends BaseLogic
 
         DB::beginTransaction();
         try {
+            if(!empty($param['payment']['amount'])) unset($param['payment']['amount']);
+            if(!empty($param['deploy_build']['test_domain'])) unset($param['deploy_build']['test_domain']);
+            if(!empty($param['deploy_build']['plan'])) unset($param['deploy_build']['plan']);
             $res = parent::save($param);
             $param['id'] = $res['id'];
             $this->savePayment($param);

@@ -30,10 +30,10 @@ class LoginAuthMiddleware
             return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'当前用户未登录']);
         }
         // 设置数据信息
-        $project = ProjectServer::useProject($info['project_id']);
-        if(empty($project)){
-            return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'数据库未配置']);
-        }
+//        $project = ProjectServer::useProject($info['project_id']);
+//        if(empty($project)){
+//            return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'数据库未配置']);
+//        }
         //操作权限设置
         $projectRoleModel = new ProjectRoleModel();
         $role_info = $projectRoleModel->read(['id'=>$info['role_id']]);

@@ -18,7 +18,7 @@ class LoginLog extends Base
      * @author zbj
      * @date 2023/4/20
      */
-    public function addLog($manage_id){
+    public static function addLog($manage_id){
         $log = new self();
         $log->manage_id = $manage_id;
         $log->ip = request()->ip();

@@ -4,12 +4,14 @@ namespace App\Models\Project;
 
 use App\Helper\Arr;
 use App\Models\Base;
+use Hashids\Hashids;
 use Illuminate\Support\Facades\Cache;
 
 class DeployBuild extends Base
 {
     //设置关联表名
     protected $table = 'gl_project_deploy_build';
+    protected $appends = ['test_domain'];
 
 
     public function setPlanAttribute($value){
@@ -20,7 +22,13 @@ class DeployBuild extends Base
         return Arr::setToArr($value, 'trim');
     }
 
-    public static function clearCache($row){
+    public function getTestDomainAttribute(){
+        $hashids = new Hashids('test_domain', 4, 'abcdefghjkmnpqrstuvwxyz1234567890');
+        $code = $hashids->encode($this->project_id);
+        return $code . '.test.com';
+    }
+
+ 	public static function clearCache($row){
         $cache_key = 'project_' . $row->original['test_domain'];
         Cache::forget($cache_key);
     }

@@ -10,13 +10,14 @@
         "doctrine/dbal": "^3.6",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
+        "hashids/hashids": "^4.1",
         "intervention/image": "^2.7",
         "laravel/framework": "^8.75",
         "laravel/sanctum": "^2.11",
         "laravel/tinker": "^2.5",
         "mongodb/mongodb": "^1.6",
-        "phpoffice/phpspreadsheet": "^1.28",
-        "mrgoon/aliyun-sms": "^2.0"
+        "mrgoon/aliyun-sms": "^2.0",
+        "phpoffice/phpspreadsheet": "^1.28"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.13",