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

@@ -311,6 +311,10 @@ class HtmlCollect extends Command
                             if (strpos($vcs, '.') === false) {
                                 continue;
                             }
+                            $path_arr = explode('.', $vcs);
+                            if(end($path_arr) == 'html'){
+                                continue;
+                            }
 
                             $source_info = CollectSource::where('project_id', $project_id)->where('origin', $vcs)->first();
                             if ($source_info) {

@@ -318,6 +318,10 @@ class HtmlLanguageCollect extends Command
                             if (strpos($vcs, '.') === false) {
                                 continue;
                             }
+                            $path_arr = explode('.', $vcs);
+                            if(end($path_arr) == 'html'){
+                                continue;
+                            }
 
                             $source_info = CollectSource::where('project_id', $project_id)->where('origin', $vcs)->first();
                             if ($source_info) {

@@ -33,9 +33,21 @@ class CNoticeController extends BaseController
     /**
      * 更新通知C端
      * @param Request $request
-     * @param WebSettingLogic $webSettingLogic
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function sendNotify(){
+    public function sendNotify(Request $request)
+    {
+        $url = $this->user['domain'].'api/update_page/';
+        $param = [
+            'project_id' => $this->user['project_id'],
+            'type' => intval($request->input('type', 1)),
+            'route' => intval($request->input('page', 1)),
+            'url' => $request->input('url', []),
+            'language'=> $request->input('language', []),
+        ];
+        $result = http_post($url, json_encode($param));
+        return $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
+
         $updateProgressModel = new UpdateProgress();
         $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first();
         if((!empty($progressInfo))){