周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 1ca05eecd1c5461383f864321d754f69671a0853 2 个父辈 52f65014 36178680

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

内嵌 并排对比
正在显示 5 个修改的文件 包含 80 行增加 和 49 行删除
@@ -42,15 +42,14 @@ class lyhDemo extends Command @@ -42,15 +42,14 @@ class lyhDemo extends Command
42 $projectModel = new Project(); 42 $projectModel = new Project();
43 $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'type'=>['in',[1,2,3,4]]], 'id', ['id']); 43 $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'type'=>['in',[1,2,3,4]]], 'id', ['id']);
44 foreach ($lists as $val) { 44 foreach ($lists as $val) {
45 -// echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL; 45 + echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL;
46 ProjectServer::useProject($val['id']); 46 ProjectServer::useProject($val['id']);
47 try { 47 try {
48 $settingModel = new WebSetting(); 48 $settingModel = new WebSetting();
49 - $settingModel->edit(['']); 49 + $settingModel->edit(['anchor_num'=>10],['id'=>1,'anchor_num'=>3]);
50 }catch (\Exception $e){ 50 }catch (\Exception $e){
51 - 51 + DB::disconnect('custom_mysql');
52 } 52 }
53 -  
54 DB::disconnect('custom_mysql'); 53 DB::disconnect('custom_mysql');
55 } 54 }
56 return true; 55 return true;
@@ -36,28 +36,39 @@ class CreateProject extends Command @@ -36,28 +36,39 @@ class CreateProject extends Command
36 return $this->sync(); 36 return $this->sync();
37 } 37 }
38 38
  39 + /**
  40 + * 创建项目
  41 + * @param int $is_update
  42 + * @throws \Exception
  43 + */
39 public function sync($is_update = 0){ 44 public function sync($is_update = 0){
40 - $title = date('Ymd') . '-杭州露娜贸易有限公司'; 45 + $company = '济南市莱芜凤城铝合金有限公司';
  46 + $mobile = '13806340552';
  47 + $plan = '标准版';
  48 + $cooperate_date = '2019-11-19';
  49 + $channel = '{"user_id": "1989", "zone_id": "4", "channel_id": "13"}';
  50 +
  51 + $title = date('Ymd') . '-' . $company;
41 $data = [ 52 $data = [
42 'project'=>[ 53 'project'=>[
43 'title' => $title, 54 'title' => $title,
44 - 'company' => '杭州露娜贸易有限公司',  
45 - 'lead_name' => '13008931688',  
46 - 'mobile' => '13008931688', 55 + 'company' => $company,
  56 + 'lead_name' => $mobile,
  57 + 'mobile' => $mobile,
47 'mysql_id'=>Project::MYSQL_ID, 58 'mysql_id'=>Project::MYSQL_ID,
48 'serve_id'=>9, 59 'serve_id'=>9,
49 'qq' => '', 60 'qq' => '',
50 - 'channel' => '{"user_id": "381", "zone_id": "4", "channel_id": "46"}', 61 + 'channel' => $channel,
51 'requirement' => '', 62 'requirement' => '',
52 - 'cooperate_date' => '2019-11-13', 63 + 'cooperate_date' => $cooperate_date,
53 'from_order_id' => '', 64 'from_order_id' => '',
54 'type' => $is_update, 65 'type' => $is_update,
55 'is_upgrade'=>$is_update, 66 'is_upgrade'=>$is_update,
56 ], 67 ],
57 'deploy_build' => [ 68 'deploy_build' => [
58 'service_duration' => 0, 69 'service_duration' => 0,
59 - 'plan' => $this->versionData('标准版'),  
60 - 'login_mobile'=>'13008931688' 70 + 'plan' => $this->versionData($plan),
  71 + 'login_mobile' => $mobile
61 ], 72 ],
62 'deploy_optimize' => [ 73 'deploy_optimize' => [
63 // 'api_no' => 0 74 // 'api_no' => 0
@@ -96,11 +107,9 @@ class CreateProject extends Command @@ -96,11 +107,9 @@ class CreateProject extends Command
96 } 107 }
97 108
98 /** 109 /**
99 - * @remark :获取版本  
100 - * @name :versionData  
101 - * @author :lyh  
102 - * @method :post  
103 - * @time :2023/8/9 14:46 110 + * 获取版本
  111 + * @param $param
  112 + * @return int
104 */ 113 */
105 public function versionData($param){ 114 public function versionData($param){
106 $data = Project::planMap(); 115 $data = Project::planMap();
@@ -113,11 +122,9 @@ class CreateProject extends Command @@ -113,11 +122,9 @@ class CreateProject extends Command
113 } 122 }
114 123
115 /** 124 /**
116 - * @remark :保存项目  
117 - * @name :saveProject  
118 - * @author :lyh  
119 - * @method :post  
120 - * @time :2023/8/30 15:53 125 + * 保存项目
  126 + * @param $param
  127 + * @return mixed
121 */ 128 */
122 public function saveProject($param){ 129 public function saveProject($param){
123 $projectModel = new Project(); 130 $projectModel = new Project();
@@ -125,11 +132,10 @@ class CreateProject extends Command @@ -125,11 +132,10 @@ class CreateProject extends Command
125 } 132 }
126 133
127 /** 134 /**
128 - * @remark :设置post_id  
129 - * @name :setPostId  
130 - * @author :lyh  
131 - * @method :post  
132 - * @time :2023/8/9 14:47 135 + * 设置post_id
  136 + * @param $plan
  137 + * @param $id
  138 + * @return bool
133 */ 139 */
134 public function setPostId($plan,$id){ 140 public function setPostId($plan,$id){
135 $length = strlen((string)$id); // 获取变量的位数 141 $length = strlen((string)$id); // 获取变量的位数
@@ -143,8 +149,8 @@ class CreateProject extends Command @@ -143,8 +149,8 @@ class CreateProject extends Command
143 149
144 /** 150 /**
145 * 保存优化部署 151 * 保存优化部署
146 - * @author zbj  
147 - * @date 2023/4/26 152 + * @param $param
  153 + * @param $id
148 */ 154 */
149 protected function saveAfter($param,$id){ 155 protected function saveAfter($param,$id){
150 $param['project_id'] = $id; 156 $param['project_id'] = $id;
@@ -159,11 +165,9 @@ class CreateProject extends Command @@ -159,11 +165,9 @@ class CreateProject extends Command
159 } 165 }
160 166
161 /** 167 /**
162 - * @remark :保存付款续费  
163 - * @name :savePayment  
164 - * @author :lyh  
165 - * @method :post  
166 - * @time :2023/8/29 16:19 168 + * 保存付款续费
  169 + * @param $param
  170 + * @param $id
167 */ 171 */
168 protected function savePayment($param,$id){ 172 protected function savePayment($param,$id){
169 $param['project_id'] = $id; 173 $param['project_id'] = $id;
@@ -182,11 +186,9 @@ class CreateProject extends Command @@ -182,11 +186,9 @@ class CreateProject extends Command
182 } 186 }
183 187
184 /** 188 /**
185 - * @remark :保存建站部署  
186 - * @name :saveDeployBuild  
187 - * @author :lyh  
188 - * @method :post  
189 - * @time :2023/8/29 16:19 189 + * 保存建站部署
  190 + * @param $param
  191 + * @param $id
190 */ 192 */
191 protected function saveDeployBuild($param,$id){ 193 protected function saveDeployBuild($param,$id){
192 $param['project_id'] = $id; 194 $param['project_id'] = $id;
@@ -203,11 +205,9 @@ class CreateProject extends Command @@ -203,11 +205,9 @@ class CreateProject extends Command
203 } 205 }
204 206
205 /** 207 /**
206 - * @remark :保存优化信息  
207 - * @name :saveDeployOptimize  
208 - * @author :lyh  
209 - * @method :post  
210 - * @time :2023/8/30 16:11 208 + * 保存优化信息
  209 + * @param $param
  210 + * @param $id
211 */ 211 */
212 protected function saveDeployOptimize($param,$id){ 212 protected function saveDeployOptimize($param,$id){
213 $param['project_id'] = $id; 213 $param['project_id'] = $id;
@@ -220,11 +220,10 @@ class CreateProject extends Command @@ -220,11 +220,10 @@ class CreateProject extends Command
220 $deployOptimizeModel->add($param); 220 $deployOptimizeModel->add($param);
221 } 221 }
222 } 222 }
  223 +
223 /** 224 /**
224 * 初始化数据库 225 * 初始化数据库
225 * @param $project_id 226 * @param $project_id
226 - * @author Akun  
227 - * @date 2023/09/19 15:12  
228 */ 227 */
229 public function initializationMysql($project_id){ 228 public function initializationMysql($project_id){
230 //切换数据库配置 229 //切换数据库配置
@@ -242,8 +241,7 @@ class CreateProject extends Command @@ -242,8 +241,7 @@ class CreateProject extends Command
242 * @param $mobile 241 * @param $mobile
243 * @param $project_id 242 * @param $project_id
244 * @param $lead_name 243 * @param $lead_name
245 - * @author Akun  
246 - * @date 2023/09/19 15:12 244 + * @return bool
247 */ 245 */
248 public function createUser($mobile,$project_id,$lead_name){ 246 public function createUser($mobile,$project_id,$lead_name){
249 $userModel = new UserModel(); 247 $userModel = new UserModel();
@@ -507,7 +507,8 @@ class UpdateSeoTdk extends Command @@ -507,7 +507,8 @@ class UpdateSeoTdk extends Command
507 } 507 }
508 508
509 $project = Project::find($project_id); 509 $project = Project::find($project_id);
510 - if (!in_array(8, explode(',', $project->deploy_optimize->special)) && $field == 'seo_title') { 510 + #TODO 2025-05-16 发现{qz_x}{hz_x} 已经应用到其他指令里面，去掉限制
  511 + if (!in_array(8, explode(',', $project->deploy_optimize->special))) {
511 // 前缀关键词 512 // 前缀关键词
512 if (preg_match_all("/\{qz_(\d+)\}/", $prompt, $matches)) { 513 if (preg_match_all("/\{qz_(\d+)\}/", $prompt, $matches)) {
513 foreach ($matches[0] as $key => $val) { 514 foreach ($matches[0] as $key => $val) {
@@ -53,6 +53,8 @@ class Kernel extends HttpKernel @@ -53,6 +53,8 @@ class Kernel extends HttpKernel
53 // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, 53 // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
54 'throttle:api', 54 'throttle:api',
55 \Illuminate\Routing\Middleware\SubstituteBindings::class, 55 \Illuminate\Routing\Middleware\SubstituteBindings::class,
  56 + //允许跨域请求
  57 + \App\Http\Middleware\EnableCrossRequestMiddleware::class,
56 ], 58 ],
57 //A端中间件组 59 //A端中间件组
58 'aside'=>[ 60 'aside'=>[
  1 +<?php
  2 +
  3 +namespace App\Http\Middleware;
  4 +
  5 +use Closure;
  6 +
  7 +class EnableCrossRequestMiddleware
  8 +{
  9 + /**
  10 + * Handle an incoming request.
  11 + *
  12 + * @param \Illuminate\Http\Request $request
  13 + * @param \Closure $next
  14 + * @return mixed
  15 + */
  16 + public function handle($request, Closure $next)
  17 + {
  18 + $response = $next($request);
  19 + $http_origin = "*";
  20 + if(isset($_SERVER['HTTP_ORIGIN'])){
  21 + $http_origin = $_SERVER['HTTP_ORIGIN'];
  22 + }
  23 + $response->header('Access-Control-Allow-Origin', $http_origin);
  24 + $response->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
  25 + $response->header('Access-Control-Allow-Headers', 'Origin, Content-Type, Authorization');
  26 + if (strtolower($_SERVER['REQUEST_METHOD']) == 'options') {
  27 + exit;
  28 + }
  29 + return $response;
  30 + }
  31 +}