周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 2c7936b7af55e0272d49b4eebd04cce9fa3becdc 2 个父辈 52c4dfd8 a697365c

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 37 行增加 和 33 行删除
@@ -77,9 +77,13 @@ class ProjectVisit extends Command @@ -77,9 +77,13 @@ class ProjectVisit extends Command
77 if (isset($data['count']) && $data['count'] > 0) { 77 if (isset($data['count']) && $data['count'] > 0) {
78 $count = $data['count']; 78 $count = $data['count'];
79 $max_id = $data['data'][0]['id'] ?? 0; 79 $max_id = $data['data'][0]['id'] ?? 0;
  80 + $is_stop = 0;
80 81
81 $total_page = ceil($count / $page_size); 82 $total_page = ceil($count / $page_size);
82 for ($page = 1; $page <= $total_page; $page++) { 83 for ($page = 1; $page <= $total_page; $page++) {
  84 + if ($is_stop) {
  85 + break;
  86 + }
83 $url_page = $api_url . '?' . http_build_query(['w' => 'visit_list', 'page' => $page, 'pagesize' => $page_size]); 87 $url_page = $api_url . '?' . http_build_query(['w' => 'visit_list', 'page' => $page, 'pagesize' => $page_size]);
84 $data_page = curl_c($url_page); 88 $data_page = curl_c($url_page);
85 if (isset($data_page['data']) && $data_page['data']) { 89 if (isset($data_page['data']) && $data_page['data']) {
@@ -104,20 +108,24 @@ class ProjectVisit extends Command @@ -104,20 +108,24 @@ class ProjectVisit extends Command
104 'updated_date' => date('Y-m-d', isset($item['c_time']) && $item['c_time'] ? strtotime($item['c_time']) : time()), 108 'updated_date' => date('Y-m-d', isset($item['c_time']) && $item['c_time'] ? strtotime($item['c_time']) : time()),
105 'original_id' => $item['id'], 109 'original_id' => $item['id'],
106 ]; 110 ];
  111 + } else {
  112 + $is_stop = 1;
  113 + break;
107 } 114 }
108 } 115 }
109 } 116 }
110 - try {  
111 - $model->insert($insert);  
112 - } catch (\Exception $e) {  
113 - echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL;  
114 - continue; 117 + if ($insert) {
  118 + try {
  119 + $model->insert($insert);
  120 + } catch (\Exception $e) {
  121 + echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL;
  122 + continue;
  123 + }
115 } 124 }
116 } 125 }
117 } 126 }
118 if ($max_id) { 127 if ($max_id) {
119 $task->max_id = $max_id; 128 $task->max_id = $max_id;
120 - $task->save();  
121 } 129 }
122 } else { 130 } else {
123 return true; 131 return true;
@@ -129,9 +137,13 @@ class ProjectVisit extends Command @@ -129,9 +137,13 @@ class ProjectVisit extends Command
129 if (isset($data['count']) && $data['count'] > 0) { 137 if (isset($data['count']) && $data['count'] > 0) {
130 $count = $data['count']; 138 $count = $data['count'];
131 $max_id = $data['data'][0]['id'] ?? 0; 139 $max_id = $data['data'][0]['id'] ?? 0;
  140 + $is_stop = 0;
132 141
133 $total_page = ceil($count / $page_size); 142 $total_page = ceil($count / $page_size);
134 for ($page = 1; $page <= $total_page; $page++) { 143 for ($page = 1; $page <= $total_page; $page++) {
  144 + if ($is_stop) {
  145 + break;
  146 + }
135 $url_page = $api_url . '?' . http_build_query(['w' => 'visit_detail_list', 'page' => $page, 'pagesize' => $page_size]); 147 $url_page = $api_url . '?' . http_build_query(['w' => 'visit_detail_list', 'page' => $page, 'pagesize' => $page_size]);
136 $data_page = curl_c($url_page); 148 $data_page = curl_c($url_page);
137 if (isset($data_page['data']) && $data_page['data']) { 149 if (isset($data_page['data']) && $data_page['data']) {
@@ -158,20 +170,24 @@ class ProjectVisit extends Command @@ -158,20 +170,24 @@ class ProjectVisit extends Command
158 'original_id' => $item['id'], 170 'original_id' => $item['id'],
159 ]; 171 ];
160 } 172 }
  173 + } else {
  174 + $is_stop = 1;
  175 + break;
161 } 176 }
162 } 177 }
163 } 178 }
164 - try {  
165 - $model->insert($insert);  
166 - } catch (\Exception $e) {  
167 - echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL;  
168 - continue; 179 + if ($insert) {
  180 + try {
  181 + $model->insert($insert);
  182 + } catch (\Exception $e) {
  183 + echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL;
  184 + continue;
  185 + }
169 } 186 }
170 } 187 }
171 } 188 }
172 if ($max_id) { 189 if ($max_id) {
173 $task->max_id = $max_id; 190 $task->max_id = $max_id;
174 - $task->save();  
175 } 191 }
176 } else { 192 } else {
177 return true; 193 return true;
@@ -53,19 +53,13 @@ class UpdateRoute extends Command @@ -53,19 +53,13 @@ class UpdateRoute extends Command
53 * @time :2023/11/20 15:13 53 * @time :2023/11/20 15:13
54 */ 54 */
55 public function handle(){ 55 public function handle(){
56 -<<<<<<< HEAD  
57 - ProjectServer::useProject(91);  
58 - $this->getProductKeyword();  
59 - DB::disconnect('custom_mysql');  
60 -=======  
61 $projectModel = new Project(); 56 $projectModel = new Project();
62 $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]); 57 $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]);
63 foreach ($list as $v){ 58 foreach ($list as $v){
64 ProjectServer::useProject($v['id']); 59 ProjectServer::useProject($v['id']);
65 - $this->getProductKeyword($v['id']); 60 + $this->getProductKeyword();
66 DB::disconnect('custom_mysql'); 61 DB::disconnect('custom_mysql');
67 } 62 }
68 ->>>>>>> 66efe5cd4b835d715f00e164b101185541dd9f83  
69 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 63 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
70 } 64 }
71 65
@@ -76,22 +70,11 @@ class UpdateRoute extends Command @@ -76,22 +70,11 @@ class UpdateRoute extends Command
76 * @method :post 70 * @method :post
77 * @time :2023/12/8 11:13 71 * @time :2023/12/8 11:13
78 */ 72 */
79 - public function getProductKeyword($project_id){ 73 + public function getProductKeyword(){
80 $keywordModel = new Keyword(); 74 $keywordModel = new Keyword();
81 $lists = $keywordModel->list(['status'=>1]); 75 $lists = $keywordModel->list(['status'=>1]);
82 if(!empty($lists)){ 76 if(!empty($lists)){
83 foreach ($lists as $v){ 77 foreach ($lists as $v){
84 -<<<<<<< HEAD  
85 - $tag = "-tag";  
86 - if (!substr($v['route'], -strlen($tag)) === $tag) {  
87 - $route = $v['route'].$tag;  
88 - // 如果不是以 '-tag' 结尾，则拼接上 '-tag'  
89 - $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $this->user['project_id']);  
90 - $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
91 - }  
92 - echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;  
93 -=======  
94 - echo date('Y-m-d H:i:s') . '关键字id:'.$v['id'] . PHP_EOL;  
95 $tag = "-tag"; 78 $tag = "-tag";
96 if (!(substr($v['route'], -strlen($tag)) === $tag)) { 79 if (!(substr($v['route'], -strlen($tag)) === $tag)) {
97 echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL; 80 echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
@@ -101,7 +84,6 @@ class UpdateRoute extends Command @@ -101,7 +84,6 @@ class UpdateRoute extends Command
101 $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]); 84 $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
102 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]); 85 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
103 } 86 }
104 ->>>>>>> 66efe5cd4b835d715f00e164b101185541dd9f83  
105 } 87 }
106 } 88 }
107 } 89 }
@@ -667,6 +667,13 @@ class BTemplateLogic extends BaseLogic @@ -667,6 +667,13 @@ class BTemplateLogic extends BaseLogic
667 * @method :any 667 * @method :any
668 * @time :2023/7/17 16:03 668 * @time :2023/7/17 16:03
669 */ 669 */
  670 + /**
  671 + * @remark :获取类型
  672 + * @name :getModuleType
  673 + * @author :lyh
  674 + * @method :any
  675 + * @time :2023/7/17 16:03
  676 + */
670 public function getModuleType(): array 677 public function getModuleType(): array
671 { 678 {
672 //定义数据结构 679 //定义数据结构
@@ -707,7 +714,6 @@ class BTemplateLogic extends BaseLogic @@ -707,7 +714,6 @@ class BTemplateLogic extends BaseLogic
707 return $this->success($data); 714 return $this->success($data);
708 } 715 }
709 716
710 -  
711 /** 717 /**
712 * @remark :保存html 718 * @remark :保存html
713 * @name :savePublicTemplateHtml 719 * @name :savePublicTemplateHtml