周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 c0849eb63e9a80d7e8e40963819d209ddeedce49 2 个父辈 1be725d5 b7162529

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 22 行增加 和 2 行删除
@@ -311,6 +311,10 @@ class HtmlCollect extends Command @@ -311,6 +311,10 @@ class HtmlCollect extends Command
311 if (strpos($vcs, '.') === false) { 311 if (strpos($vcs, '.') === false) {
312 continue; 312 continue;
313 } 313 }
  314 + $path_arr = explode('.', $vcs);
  315 + if(end($path_arr) == 'html'){
  316 + continue;
  317 + }
314 318
315 $source_info = CollectSource::where('project_id', $project_id)->where('origin', $vcs)->first(); 319 $source_info = CollectSource::where('project_id', $project_id)->where('origin', $vcs)->first();
316 if ($source_info) { 320 if ($source_info) {
@@ -318,6 +318,10 @@ class HtmlLanguageCollect extends Command @@ -318,6 +318,10 @@ class HtmlLanguageCollect extends Command
318 if (strpos($vcs, '.') === false) { 318 if (strpos($vcs, '.') === false) {
319 continue; 319 continue;
320 } 320 }
  321 + $path_arr = explode('.', $vcs);
  322 + if(end($path_arr) == 'html'){
  323 + continue;
  324 + }
321 325
322 $source_info = CollectSource::where('project_id', $project_id)->where('origin', $vcs)->first(); 326 $source_info = CollectSource::where('project_id', $project_id)->where('origin', $vcs)->first();
323 if ($source_info) { 327 if ($source_info) {
@@ -33,9 +33,21 @@ class CNoticeController extends BaseController @@ -33,9 +33,21 @@ class CNoticeController extends BaseController
33 /** 33 /**
34 * 更新通知C端 34 * 更新通知C端
35 * @param Request $request 35 * @param Request $request
36 - * @param WebSettingLogic $webSettingLogic 36 + * @return \Illuminate\Http\JsonResponse
37 */ 37 */
38 - public function sendNotify(){ 38 + public function sendNotify(Request $request)
  39 + {
  40 + $url = $this->user['domain'].'api/update_page/';
  41 + $param = [
  42 + 'project_id' => $this->user['project_id'],
  43 + 'type' => intval($request->input('type', 1)),
  44 + 'route' => intval($request->input('page', 1)),
  45 + 'url' => $request->input('url', []),
  46 + 'language'=> $request->input('language', []),
  47 + ];
  48 + $result = http_post($url, json_encode($param));
  49 + return $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
  50 +
39 $updateProgressModel = new UpdateProgress(); 51 $updateProgressModel = new UpdateProgress();
40 $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first(); 52 $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first();
41 if((!empty($progressInfo))){ 53 if((!empty($progressInfo))){