Merge branch 'develop' of zhengxifeng/tyqngp into master

apps/admin/controller/content/ContentController.php

@@ -372,6 +372,10 @@ class ContentController extends Controller
                     $api = "http://data.zz.baidu.com/urls?site=$domain&token=$token&type=daily";
                     foreach ($list as $key => $value) {
                         $url = $domain . $urls[$value];
+
+                        //替换 .html 后缀
+                        $url = str_replace(".html","",$url);
+
                         $this->log('百度快速收录推送：' . $url);
                         $post_urls[] = $url;
                     }

apps/admin/controller/content/SingleController.php

@@ -94,10 +94,15 @@ class SingleController extends Controller
                 alert_back('链接类型不允许推送！');
             }
             if ($data->filename) {
-                $urls[] = $domain . homeurl('/home/Index/' . $data->filename, $url_rule_sort_suffix);
+                $url = $domain . homeurl('/home/Index/' . $data->filename, $url_rule_sort_suffix);
+                $url = str_replace(".html","",$url);
+                $urls[] = $url;
             } else {
-                $urls[] = $domain . homeurl('/home/Index/' . $data->urlname . $url_break_char . $data->scode, $url_rule_sort_suffix);
+                $url = $domain . homeurl('/home/Index/' . $data->urlname . $url_break_char . $data->scode, $url_rule_sort_suffix);
+                $url = str_replace(".html","",$url);
+                $urls[] = $url;
             }
+
             $result = post_baidu($api, $urls);
             if (isset($result->error)) {
                 $this->log('百度普通收录推送失败：' . $urls[0]);

apps/admin/view/default/content/content.html

@@ -104,7 +104,9 @@
 			                        	{/php}
 	
 			                        	<input type="hidden" name="urls[[value->id]]" value="{php}echo $link{/php}">
-			                        	<a href="{php}echo $link{/php}" class="layui-btn layui-btn-xs layui-btn-primary"  target="_blank">查看</a>
+			                        	<a href='{php}
+			                        	$link = str_replace(".html","",$link);
+			                        	echo $link;{/php}' class="layui-btn layui-btn-xs layui-btn-primary"  target="_blank">查看</a>
 		                        	{/if}
 		                            {fun=get_btn_del($value->id)}
 		                            {if(check_level('mod'))}