正在显示
3 个修改的文件
包含
70 行增加
和
12 行删除
| @@ -18,6 +18,7 @@ use App\Models\Devops\ServerConfig; | @@ -18,6 +18,7 @@ use App\Models\Devops\ServerConfig; | ||
| 18 | use App\Models\Inquiry\InquirySet; | 18 | use App\Models\Inquiry\InquirySet; |
| 19 | use App\Models\Manage\Manage; | 19 | use App\Models\Manage\Manage; |
| 20 | use App\Models\News\News; | 20 | use App\Models\News\News; |
| 21 | +use App\Models\Project\After; | ||
| 21 | use App\Models\Project\DeployBuild; | 22 | use App\Models\Project\DeployBuild; |
| 22 | use App\Models\Project\DeployOptimize; | 23 | use App\Models\Project\DeployOptimize; |
| 23 | use App\Models\Project\Payment; | 24 | use App\Models\Project\Payment; |
| @@ -109,7 +110,8 @@ class ProjectLogic extends BaseLogic | @@ -109,7 +110,8 @@ class ProjectLogic extends BaseLogic | ||
| 109 | */ | 110 | */ |
| 110 | public function getProjectInfo($id){ | 111 | public function getProjectInfo($id){ |
| 111 | $info = $this->model->with('payment')->with('deploy_build') | 112 | $info = $this->model->with('payment')->with('deploy_build') |
| 112 | - ->with('deploy_optimize')->with('online_check')->where(['id'=>$id])->first(); | 113 | + ->with('deploy_optimize')->with('online_check') |
| 114 | + ->with('project_after')->where(['id'=>$id])->first(); | ||
| 113 | $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? ''; | 115 | $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? ''; |
| 114 | $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? ''; | 116 | $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? ''; |
| 115 | if($info['extend_type'] != 0){ | 117 | if($info['extend_type'] != 0){ |
| @@ -126,18 +128,8 @@ class ProjectLogic extends BaseLogic | @@ -126,18 +128,8 @@ class ProjectLogic extends BaseLogic | ||
| 126 | * @time :2023/8/17 14:19 | 128 | * @time :2023/8/17 14:19 |
| 127 | */ | 129 | */ |
| 128 | public function save($param){ | 130 | public function save($param){ |
| 129 | - if(!empty($param['deploy_optimize']['domain'])){ | ||
| 130 | - $param['deploy_optimize']['domain'] = checkDomain($param['deploy_optimize']['domain']); | ||
| 131 | - if(!$param['deploy_optimize']['domain']){ | ||
| 132 | - $this->fail('正式域名格式不正确'); | ||
| 133 | - } | ||
| 134 | - } | ||
| 135 | DB::beginTransaction(); | 131 | DB::beginTransaction(); |
| 136 | try { | 132 | try { |
| 137 | - if(!empty($param['payment']['amount'])) unset($param['payment']['amount']); | ||
| 138 | - if(!empty($param['deploy_build']['test_domain'])) unset($param['deploy_build']['test_domain']); | ||
| 139 | - if(!empty($param['deploy_build']['plan'])) unset($param['deploy_build']['plan']); | ||
| 140 | - if(!empty($param['deploy_optimize']['api_no'])) unset($param['deploy_optimize']['api_no']); | ||
| 141 | if($param['type'] == 5){ | 133 | if($param['type'] == 5){ |
| 142 | $param['extend_type'] == 5; | 134 | $param['extend_type'] == 5; |
| 143 | unset($param['type']); | 135 | unset($param['type']); |
| @@ -147,6 +139,7 @@ class ProjectLogic extends BaseLogic | @@ -147,6 +139,7 @@ class ProjectLogic extends BaseLogic | ||
| 147 | $this->savePayment($param); | 139 | $this->savePayment($param); |
| 148 | $this->saveDeployBuild($param); | 140 | $this->saveDeployBuild($param); |
| 149 | $this->saveDeployOptimize($param); | 141 | $this->saveDeployOptimize($param); |
| 142 | + $this->saveAfter($param); | ||
| 150 | DB::commit(); | 143 | DB::commit(); |
| 151 | }catch (\Exception $e){ | 144 | }catch (\Exception $e){ |
| 152 | DB::rollBack(); | 145 | DB::rollBack(); |
| @@ -157,6 +150,22 @@ class ProjectLogic extends BaseLogic | @@ -157,6 +150,22 @@ class ProjectLogic extends BaseLogic | ||
| 157 | } | 150 | } |
| 158 | 151 | ||
| 159 | /** | 152 | /** |
| 153 | + * @remark :验证域名 | ||
| 154 | + * @name :verifyDomain | ||
| 155 | + * @author :lyh | ||
| 156 | + * @method :post | ||
| 157 | + * @time :2023/8/17 16:22 | ||
| 158 | + */ | ||
| 159 | + public function verifyDomain($domain){ | ||
| 160 | + if(!empty($domain)){ | ||
| 161 | + $domain = checkDomain($domain); | ||
| 162 | + if(!$domain){ | ||
| 163 | + $this->fail('正式域名格式不正确'); | ||
| 164 | + } | ||
| 165 | + return $this->success(); | ||
| 166 | + } | ||
| 167 | + } | ||
| 168 | + /** | ||
| 160 | * 保存付款续费 | 169 | * 保存付款续费 |
| 161 | * @author zbj | 170 | * @author zbj |
| 162 | * @date 2023/4/26 | 171 | * @date 2023/4/26 |
| @@ -207,7 +216,27 @@ class ProjectLogic extends BaseLogic | @@ -207,7 +216,27 @@ class ProjectLogic extends BaseLogic | ||
| 207 | // Arr::forget($data, ['api_no']); | 216 | // Arr::forget($data, ['api_no']); |
| 208 | return (new DeployOptimizeLogic)->save($data); | 217 | return (new DeployOptimizeLogic)->save($data); |
| 209 | } | 218 | } |
| 210 | - | 219 | + /** |
| 220 | + * 保存优化部署 | ||
| 221 | + * @author zbj | ||
| 222 | + * @date 2023/4/26 | ||
| 223 | + */ | ||
| 224 | + protected function saveAfter($param){ | ||
| 225 | + if(empty($param['project_after'])){ | ||
| 226 | + return true; | ||
| 227 | + } | ||
| 228 | + $data = $param['project_after']; | ||
| 229 | + $data['project_id'] = $param['id']; | ||
| 230 | + //查询数据是否存在 | ||
| 231 | + $afterModel = new After(); | ||
| 232 | + $info = $afterModel->read(['project_id'=>$data['project_id']]); | ||
| 233 | + if($info === false){ | ||
| 234 | + $rs = $afterModel->add($data); | ||
| 235 | + }else{ | ||
| 236 | + $rs = $afterModel->edit($data,['id'=>$info['id']]); | ||
| 237 | + } | ||
| 238 | + return $rs; | ||
| 239 | + } | ||
| 211 | public function clearCache($id) | 240 | public function clearCache($id) |
| 212 | { | 241 | { |
| 213 | parent::clearCache($id); | 242 | parent::clearCache($id); |
app/Models/Project/After.php
0 → 100644
| @@ -164,6 +164,18 @@ class Project extends Base | @@ -164,6 +164,18 @@ class Project extends Base | ||
| 164 | return self::hasOne(DeployOptimize::class, 'project_id', 'id'); | 164 | return self::hasOne(DeployOptimize::class, 'project_id', 'id'); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | + /** | ||
| 168 | + * @remark :转售后 | ||
| 169 | + * @name :after | ||
| 170 | + * @author :lyh | ||
| 171 | + * @method :post | ||
| 172 | + * @time :2023/8/17 16:24 | ||
| 173 | + */ | ||
| 174 | + public function project_after() | ||
| 175 | + { | ||
| 176 | + return self::hasOne(After::class, 'project_id', 'id'); | ||
| 177 | + } | ||
| 178 | + | ||
| 167 | public function setLevelAttribute($value) | 179 | public function setLevelAttribute($value) |
| 168 | { | 180 | { |
| 169 | $this->attributes['level'] = Arr::arrToSet($value); | 181 | $this->attributes['level'] = Arr::arrToSet($value); |
-
请 注册 或 登录 后发表评论