Merge branch 'develop' of zhengxifeng/tyqngp into master

.idea/php.xml

@@ -10,6 +10,13 @@
     <option name="highlightLevel" value="WARNING" />
     <option name="transferred" value="true" />
   </component>
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/baidu-smartapp/openapi" />
+      <path value="$PROJECT_DIR$/vendor/overtrue/pinyin" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+    </include_path>
+  </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>

.idea/www.tyqngp.cn.iml

@@ -3,6 +3,9 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/apps" isTestSource="false" packagePrefix="app" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/baidu-smartapp/openapi" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/overtrue/pinyin" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

apps/admin/controller/system/CityController.php

@@ -427,4 +427,37 @@ class CityController extends Controller
             }
         }
     }
+
+    /*
+     * https://www.ledaxinli.com/admin.php?p=/City/updateData
+     */
+    public function updateData(){
+
+        //384 市 383 区
+        //$this->model->getList($pid);
+        //$this->model->editRow($insert_data);
+
+        /*
+         * 替换字符串
+         * UPDATE ay_city SET title = REPLACE(BINARY title, '区', '') where pid=383;
+         * UPDATE ay_city SET stitle = REPLACE(BINARY stitle, '区', '') where pid=383;
+         * UPDATE ay_city SET title = REPLACE(BINARY title, '市', '') where pid=384;
+         * UPDATE ay_city SET stitle = REPLACE(BINARY stitle, '市', '') where pid=384;
+         */
+
+        /*
+         * 判断数据库字段是否含有重复数据
+         * select etitle from ay_city group by etitle having count(*)>1
+         * select title from ay_city where pid=386 group by title having count(*)>1
+         *
+         * SELECT etitle, COUNT(*) as count FROM ay_city GROUP BY etitle HAVING COUNT(*) > 1;
+         * SELECT title, COUNT(*) as count FROM ay_city GROUP BY title HAVING COUNT(*) > 1;
+         * SELECT stitle, COUNT(*) as count FROM ay_city GROUP BY stitle HAVING COUNT(*) > 1;
+         *
+         *
+
+         */
+
+    }
+
 }

apps/home/controller/SitemapController.php

@@ -35,11 +35,16 @@ class SitemapController extends Controller{
         $wildcard = $this->config('wildcard');  //泛域名支持状态
         $city_suffix = $this->config('city_suffix');  //城市后缀
         $city_suffix = $city_suffix ? '.html' : '/';
+
         $model = model('admin.system.City');
         $city = $model->getAllList();
         $domain = get_http_host();  //当前域名
         $cur_city = array_filter($city, function($t) use ($domain) { return $t['isurl'] == $domain; });    //当前城市绑定了域名
+
+
         if( $wildcard || !empty($cur_city) ){
+            //开启泛域名
+            //var_dump("fdfdf");die;
             foreach ($sorts as $value) {
                 if ($value->outlink) {
                     continue;
@@ -55,12 +60,16 @@ class SitemapController extends Controller{
                             continue;
                         } else {
                             $link = $Parser->parserLink(2, $value2->urlname, 'content', $value2->scode, $value2->sortfilename, $value2->id, $value2->filename);
+                            //echo $link;die;
+                            //去除.html
+                            $link = str_replace(".html", "", $link);
                         }
                         $str .= $this->makeNode($link, date('Y-m-d', strtotime($value2->date)), '0.60', 'daily');
                     }
                 }
             }
         }else{
+            //var_dump("fdfdf");die;
             cookie('city',''); //防止生成的链接叠加当前城市
             foreach ($city as $c) {
                 $str .= $this->makeNode( '/'.$c['etitle'] . $city_suffix, date('Y-m-d'), '1.00', 'always'); // 根目录
@@ -94,6 +103,9 @@ class SitemapController extends Controller{
                                 continue;
                             } else {
                                 $link = $Parser->parserLink(2, $value2->urlname, 'content', $value2->scode, $value2->sortfilename, $value2->id, $value2->filename);
+                                //echo $link;die;
+                                //去除.html
+                                $link = str_replace(".html", "", $link);
                             }
                             $str .= $this->makeNode( $url . $link, date('Y-m-d', strtotime($value2->date)), '0.60', 'daily');
                         }
@@ -133,6 +145,8 @@ class SitemapController extends Controller{
         $domain = get_http_host();  //当前域名
         $cur_city = array_filter($city, function($t) use ($domain) { return $t['isurl'] == $domain; });    //当前城市绑定了域名
         if( $wildcard || !empty($cur_city) ){
+            //开启二级域名
+            //var_dump("55dfd5");die;
             foreach ($sorts as $value) {
                 if ($value->outlink) {
                     continue;
@@ -148,6 +162,9 @@ class SitemapController extends Controller{
                             continue;
                         } else {
                             $link = $Parser->parserLink(2, $value2->urlname, 'content', $value2->scode, $value2->sortfilename, $value2->id, $value2->filename);
+                            //echo $link;die;
+                            //去除.html
+                            $link = str_replace(".html", "", $link);
                         }
                         $str .= get_http_url() . $link . "\n";
                     }
@@ -184,6 +201,9 @@ class SitemapController extends Controller{
                                 continue;
                             } else {
                                 $link = $Parser->parserLink(2, $value2->urlname, 'content', $value2->scode, $value2->sortfilename, $value2->id, $value2->filename);
+                                //echo $link;die;
+                                //去除.html
+                                $link = str_replace(".html", "", $link);
                             }
                             $str .= get_http_url() . $url . $link . "\n";
                         }

template/dafeult/foot.html

@@ -73,7 +73,12 @@
     {/pboot:if}
     {/pboot:sql}
 
-    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
+    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a>
+
+
+    <a href="{pboot:httpurl}/sitemap.xml" target="_blank">网站地图</a>
+
+    {pboot:sitestatistical}</p>
   <p style="display:none;"></p>
 </div>
 <!--/页脚--> 

template/dafeult/foot_city.html

@@ -31,7 +31,8 @@
 
     <a href="{label:city_url}">心理咨询预约</a> Copyright © 2019-2024 “<a href="{label:city_url}">心理咨询预约</a> ”就上“<a href="{pboot:sitedomain}">乐达心理</a>”全国高端连锁
 
-    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
+    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a>
+    <!--<a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a>--> {pboot:sitestatistical}</p>
   <p style="display:none;"></p>
 </div>
 <!--/页脚-->