周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 ac6627621930ce406a6d058128cb937a236b25cf 2 个父辈 44d04ed2 e4a75f18

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !733
内嵌 并排对比
正在显示 2 个修改的文件 包含 58 行增加 和 128 行删除
@@ -855,51 +855,61 @@ class ProjectUpdate extends Command @@ -855,51 +855,61 @@ class ProjectUpdate extends Command
855 foreach ($items as $item) { 855 foreach ($items as $item) {
856 $route = $this->get_url_route($item['url'] ?? ''); 856 $route = $this->get_url_route($item['url'] ?? '');
857 if ($route) { 857 if ($route) {
858 - $parent = $model->read(['pid' => $pid, 'route' => $route], 'id');  
859 - if (!$parent) {  
860 - try {  
861 - $item['name'] = $this->special2str($item['name'] ?? '');  
862 - //图片  
863 - if (is_array($item['images'] ?? '')) {  
864 - $image = $item['images'][0] ?? '';  
865 - } else {  
866 - $image = $item['images'] ?? '';  
867 - }  
868 - $new_img = $this->source_download($image, $project_id, $domain, $web_url_domain, $home_url);  
869 - //描述  
870 - if (isset($item['description']) && $item['description']) {  
871 - //匹配描述资源  
872 - $source_list = $this->html_preg($item['description'], $project_id, $domain, $web_url_domain, $home_url);  
873 - if ($source_list) {  
874 - foreach ($source_list as $vs) {  
875 - if ($vs['download']) {  
876 - //需要下载资源  
877 - $down_url = $this->source_download($vs['url_complete'], $project_id, $domain, $web_url_domain, $home_url);  
878 - } else {  
879 - //已经下载过资源  
880 - $down_url = getImageUrl($vs['url_complete']);  
881 - }  
882 - $item['description'] = str_replace($vs['url'], $down_url, $item['description']);  
883 - } 858 + $item['name'] = $this->special2str($item['name'] ?? '');
  859 + //图片
  860 + if (is_array($item['images'] ?? '')) {
  861 + $image = $item['images'][0] ?? '';
  862 + } else {
  863 + $image = $item['images'] ?? '';
  864 + }
  865 + $new_img = $this->source_download($image, $project_id, $domain, $web_url_domain, $home_url);
  866 + //描述
  867 + $describe = '';
  868 + if (isset($item['description']) && $item['description']) {
  869 + $describe = $item['description'];
  870 + //匹配描述资源
  871 + $source_list = $this->html_preg($describe, $project_id, $domain, $web_url_domain, $home_url);
  872 + if ($source_list) {
  873 + foreach ($source_list as $vs) {
  874 + if ($vs['download']) {
  875 + //需要下载资源
  876 + $down_url = $this->source_download($vs['url_complete'], $project_id, $domain, $web_url_domain, $home_url);
  877 + } else {
  878 + //已经下载过资源
  879 + $down_url = getImageUrl($vs['url_complete']);
884 } 880 }
  881 + $describe = str_replace($vs['url'], $down_url, $describe);
885 } 882 }
  883 + }
  884 + }
  885 + try {
  886 + $parent = $model->read(['route' => $route], 'id');
  887 + if (!$parent) {
886 $parent_id = $model->addReturnId([ 888 $parent_id = $model->addReturnId([
887 'project_id' => $project_id, 889 'project_id' => $project_id,
888 'title' => $item['name'], 890 'title' => $item['name'],
889 'image' => $new_img, 891 'image' => $new_img,
890 'pid' => $pid, 892 'pid' => $pid,
891 'keywords' => $item['keywords'] ?? '', 893 'keywords' => $item['keywords'] ?? '',
892 - 'describe' => (isset($item['description']) && $item['description']) ? $item['description'] : '', 894 + 'describe' => $describe,
893 'original_id' => $item['id'], 895 'original_id' => $item['id'],
894 'route' => $route 896 'route' => $route
895 ]); 897 ]);
896 $this->set_map($route, RouteMap::SOURCE_PRODUCT_CATE, $parent_id, $project_id); 898 $this->set_map($route, RouteMap::SOURCE_PRODUCT_CATE, $parent_id, $project_id);
897 - } catch (\Exception $e) {  
898 - echo 'date:' . date('Y-m-d H:i:s') . ', category_insert error: ' . $e->getMessage() . PHP_EOL;  
899 - continue; 899 + } else {
  900 + $parent_id = $parent['id'];
  901 + $model->edit([
  902 + 'title' => $item['name'],
  903 + 'image' => $new_img,
  904 + 'pid' => $pid,
  905 + 'keywords' => $item['keywords'] ?? '',
  906 + 'describe' => $describe,
  907 + 'original_id' => $item['id']
  908 + ], ['id' => $parent_id]);
900 } 909 }
901 - } else {  
902 - $parent_id = $parent['id']; 910 + } catch (\Exception $e) {
  911 + echo 'date:' . date('Y-m-d H:i:s') . ', category_insert error: ' . $e->getMessage() . PHP_EOL;
  912 + continue;
903 } 913 }
904 914
905 if (!empty($item['children'] ?? [])) { 915 if (!empty($item['children'] ?? [])) {
@@ -916,10 +926,10 @@ class ProjectUpdate extends Command @@ -916,10 +926,10 @@ class ProjectUpdate extends Command
916 foreach ($items as $item) { 926 foreach ($items as $item) {
917 $route = $this->get_url_route($item['url'] ?? ''); 927 $route = $this->get_url_route($item['url'] ?? '');
918 if ($route) { 928 if ($route) {
919 - $parent = $model->read(['pid' => $pid, 'alias' => $route], 'id');  
920 - if (!$parent) {  
921 - try {  
922 - $item['name'] = $this->special2str($item['name'] ?? ''); 929 + $item['name'] = $this->special2str($item['name'] ?? '');
  930 + try {
  931 + $parent = $model->read(['alias' => $route], 'id');
  932 + if (!$parent) {
923 $parent_id = $model->addReturnId([ 933 $parent_id = $model->addReturnId([
924 'project_id' => $project_id, 934 'project_id' => $project_id,
925 'name' => $item['name'], 935 'name' => $item['name'],
@@ -928,12 +938,18 @@ class ProjectUpdate extends Command @@ -928,12 +938,18 @@ class ProjectUpdate extends Command
928 'alias' => $route 938 'alias' => $route
929 ]); 939 ]);
930 $this->set_map($route, RouteMap::SOURCE_NEWS_CATE, $parent_id, $project_id); 940 $this->set_map($route, RouteMap::SOURCE_NEWS_CATE, $parent_id, $project_id);
931 - } catch (\Exception $e) {  
932 - echo 'date:' . date('Y-m-d H:i:s') . ', category_news_insert error: ' . $e->getMessage() . PHP_EOL;  
933 - continue; 941 +
  942 + } else {
  943 + $parent_id = $parent['id'];
  944 + $model->edit([
  945 + 'name' => $item['name'],
  946 + 'pid' => $pid,
  947 + 'original_id' => $item['id'],
  948 + ], ['id' => $parent_id]);
934 } 949 }
935 - } else {  
936 - $parent_id = $parent['id']; 950 + } catch (\Exception $e) {
  951 + echo 'date:' . date('Y-m-d H:i:s') . ', category_news_insert error: ' . $e->getMessage() . PHP_EOL;
  952 + continue;
937 } 953 }
938 954
939 if (!empty($item['children'] ?? [])) { 955 if (!empty($item['children'] ?? [])) {
@@ -99,53 +99,6 @@ class UpdateController extends BaseController @@ -99,53 +99,6 @@ class UpdateController extends BaseController
99 $this->fail('已上线项目需填写采集的测试站域名'); 99 $this->fail('已上线项目需填写采集的测试站域名');
100 } 100 }
101 101
102 - $product_cate_type = 0;//产品分类是否重采  
103 - $news_cate_type = 0;//新闻分类是否重采  
104 -  
105 - if ($this->param['type'] == 1) {  
106 - $product_cate_type = 1;  
107 - $news_cate_type = 1;  
108 -  
109 - $bSettingModel = new Setting();  
110 - $template_info = $bSettingModel->read(['project_id' => $this->param['project_id']]);  
111 - $template_id = $template_info ? $template_info['template_id'] : 0;//获取模版id  
112 -  
113 - //产品分类重采之前，判断产品分类是否开启了可视化  
114 - $category_list = Category::where('project_id', $this->param['project_id'])->get();  
115 - if ($category_list->count() > 0) {  
116 - foreach ($category_list as $category) {  
117 - if ($this->getRenovation($this->param['project_id'], BTemplate::SOURCE_PRODUCT, BTemplate::IS_LIST, $template_id, $category['id']) == 1) {  
118 - //有分类开启了可视化  
119 - $product_cate_type = 0;  
120 - break;  
121 - }  
122 - }  
123 - }  
124 -  
125 - //如果自己创建了6.0产品关联了分类，也不能再重采分类  
126 - $product_v6_list = Product::where('project_id', $this->param['project_id'])->where('is_upgrade', 0)->get();  
127 - if ($product_v6_list->count() > 0) {  
128 - foreach ($product_v6_list as $product_v6) {  
129 - if ($product_v6->category_id) {  
130 - $product_cate_type = 0;  
131 - break;  
132 - }  
133 - }  
134 - }  
135 -  
136 - //新闻分类重采之前，判断新闻分类是否开启了可视化  
137 - $category_news_list = NewsCategory::where('project_id', $this->param['project_id'])->get();  
138 - if ($category_news_list->count() > 0) {  
139 - foreach ($category_news_list as $category_news) {  
140 - if ($this->getRenovation($this->param['project_id'], BTemplate::SOURCE_NEWS, BTemplate::IS_LIST, $template_id, $category_news['id']) == 1) {  
141 - //有分类开启了可视化  
142 - $news_cate_type = 0;  
143 - break;  
144 - }  
145 - }  
146 - }  
147 - }  
148 -  
149 try { 102 try {
150 if ($this->param['old_collect'] == 1) { 103 if ($this->param['old_collect'] == 1) {
151 //现有数据需要重新采集页面 104 //现有数据需要重新采集页面
@@ -175,21 +128,6 @@ class UpdateController extends BaseController @@ -175,21 +128,6 @@ class UpdateController extends BaseController
175 } 128 }
176 } 129 }
177 } 130 }
178 -  
179 - if ($product_cate_type == 1) {  
180 - //需要重新采集产品分类  
181 - DB::connection('custom_mysql')->statement("TRUNCATE `gl_product_category`");  
182 - DB::connection('custom_mysql')->statement("TRUNCATE `gl_product_category_related`");  
183 -  
184 - DB::connection('custom_mysql')->statement("DELETE FROM `gl_route_map` WHERE `source` = 'product_category'");  
185 - }  
186 -  
187 - if ($news_cate_type == 1) {  
188 - //需要重新采集新闻分类  
189 - DB::connection('custom_mysql')->statement("TRUNCATE `gl_news_category`");  
190 -  
191 - DB::connection('custom_mysql')->statement("DELETE FROM `gl_route_map` WHERE `source` = 'news_category'");  
192 - }  
193 } catch (\Exception $e) { 131 } catch (\Exception $e) {
194 errorLog('重新采集升级项目数据', $this->param, $e); 132 errorLog('重新采集升级项目数据', $this->param, $e);
195 133
@@ -211,15 +149,9 @@ class UpdateController extends BaseController @@ -211,15 +149,9 @@ class UpdateController extends BaseController
211 $old_info->save(); 149 $old_info->save();
212 } 150 }
213 151
214 - if ($product_cate_type == 1 && $news_cate_type == 1) { 152 + if ($this->param['type'] == 1) {
215 //需要重新采集产品分类和新闻分类 153 //需要重新采集产品分类和新闻分类
216 $logs = UpdateLog::where('project_id', $this->param['project_id'])->orderBy('sort', 'asc')->get(); 154 $logs = UpdateLog::where('project_id', $this->param['project_id'])->orderBy('sort', 'asc')->get();
217 - } elseif ($product_cate_type == 1 && $news_cate_type == 0) {  
218 - //只重采产品分类  
219 - $logs = UpdateLog::where('project_id', $this->param['project_id'])->where('api_type', '!=', 'category_news')->orderBy('sort', 'asc')->get();  
220 - } elseif ($product_cate_type == 0 && $news_cate_type == 1) {  
221 - //只重采新闻分类  
222 - $logs = UpdateLog::where('project_id', $this->param['project_id'])->where('api_type', '!=', 'category')->orderBy('sort', 'asc')->get();  
223 } else { 155 } else {
224 //分类都不重采 156 //分类都不重采
225 $logs = UpdateLog::where('project_id', $this->param['project_id'])->whereNotIn('api_type', ['category', 'category_news'])->orderBy('sort', 'asc')->get(); 157 $logs = UpdateLog::where('project_id', $this->param['project_id'])->whereNotIn('api_type', ['category', 'category_news'])->orderBy('sort', 'asc')->get();
@@ -256,22 +188,4 @@ class UpdateController extends BaseController @@ -256,22 +188,4 @@ class UpdateController extends BaseController
256 188
257 $this->response('采集任务添加成功'); 189 $this->response('采集任务添加成功');
258 } 190 }
259 -  
260 - public function getRenovation($project_id, $source, $is_list, $template_id, $id, $is_custom = 0)  
261 - {  
262 - $webTemplateModel = new BTemplate();  
263 - $param = [  
264 - 'source' => $source,  
265 - 'project_id' => $project_id,  
266 - 'source_id' => $id,  
267 - 'template_id' => $template_id,  
268 - 'is_list' => $is_list,  
269 - 'is_custom' => $is_custom  
270 - ];  
271 - $templateInfo = $webTemplateModel->read($param);  
272 - if ($templateInfo !== false) {  
273 - return 1;  
274 - }  
275 - return 0;  
276 - }  
277 } 191 }