wesmiler 5 tahun lalu
induk
melakukan
114fa9a5a7

+ 12 - 8
app/index/controller/IndexController.php

@@ -19,7 +19,7 @@ class IndexController extends HomeBaseController
         $cacheKey = 'cache:index_pages:index_'.intval(cmf_is_mobile());
         $pageHtml = RedisService::get($cacheKey);
         if($pageHtml){
-            return $pageHtml;
+            //return $pageHtml;
         }
 
         // 热门分类
@@ -46,6 +46,8 @@ class IndexController extends HomeBaseController
         // 加盟动态下方广告
         $banner4 = isset($banners[5])? $banners[5] : [];
 
+
+
         /* 品牌栏位列表数据 */
         // 今日之星
         $brand1 = JiamengService::getListByLevel(1,3);
@@ -59,6 +61,7 @@ class IndexController extends HomeBaseController
         // 专题品牌
         $brand6 = JiamengService::getListByLevel(6, 10);
 
+
         // 品牌聚焦
         $brand7 = JiamengService::getListByLevel(7, 56);
         $brand7 = $brand7? array_chunk($brand7, 28, true) : [];
@@ -67,7 +70,6 @@ class IndexController extends HomeBaseController
         $brand8 = JiamengService::getNewList(12);
 
         /*  人气排行榜1  */
-
         $phb1 = JiamengService::getTopList('touzi_level <= 2');
         $phb2 = JiamengService::getTopList('touzi_level = 3');
         $phb3 = JiamengService::getTopList('touzi_level >= 4');
@@ -179,9 +181,11 @@ class IndexController extends HomeBaseController
         // end
 
         $pageHtml = $this->fetch();
-
+        //var_dump($pageHtml);
         // 页面缓存
-        RedisService::set($cacheKey, $pageHtml , 24*3600);
+        $pageHtml = filterHtmlUrl($pageHtml);
+        RedisService::set($cacheKey, $pageHtml , 7*24*3600);
+
         return $pageHtml;
     }
 
@@ -231,8 +235,8 @@ class IndexController extends HomeBaseController
         $cacheKey = 'cache:sitemap:list_';
         $datas = RedisService::get($cacheKey.$page);
 
-        if(empty($datas)){
-            $dataList = CategoryService::getCates(1000, -1, "enname as id, catname as title, '1' as 'type'");
+        if(empty($datas) ){
+            $dataList = CategoryService::getCates(1000, -1, "enname as id, catname as title, '1' as 'type'", 'create_time desc,list_order');
             $brands = JiamengService::getList(['status'=> 1], "j.id,j.title, '2' as 'type'", 3000);
             $brands = $brands? $brands->toArray() : [];
             $news = NewsService::getList(['status'=> 1], 3000,"id,title, '3' as 'type'");
@@ -263,10 +267,10 @@ class IndexController extends HomeBaseController
             }
 
 
-            $result = $dataList? array_chunk($dataList, 500) : [];
+            $result = $dataList? array_chunk(array_values($dataList), 500) : [];
             if($result){
                 foreach ($result as $k => $list){
-                    RedisService::set($cacheKey.($k+1), $dataList, 30*3600);
+                    RedisService::set($cacheKey.($k+1), $list, 30*3600);
                 }
                 $datas = isset($result[$page-1])? $result[$page-1] : [];
             }

+ 2 - 3
app/index/controller/NewsController.php

@@ -23,7 +23,7 @@ class NewsController extends HomeBaseController
         // 最新入驻
         $brand_jx = JiamengService::getNewList(12);
         
-        $news1 = NewsService::getList(['level'=> 1], 10);
+        $news1 = NewsService::getList(['level'=> 1,'status'=> 1], 10);
 
         $newsHot = NewsService::getHotList();
 
@@ -61,7 +61,7 @@ class NewsController extends HomeBaseController
         Db::name('jiameng')->where('id', $param['id'])->setInc('hits', 1);
 
         if ($pageHtml) {
-          //  return $pageHtml;
+            return $pageHtml;
         }
 
         $info = Db::name('news')->where('id',$param['id'])->where('status',1)->find();
@@ -163,7 +163,6 @@ class NewsController extends HomeBaseController
     public function lists(){
         $catinfo = [];
         $param = $this->request->param();
-
         $cacheKey = 'cache:news_pages:list:' . md5(json_encode($param)).'_'.intval(cmf_is_mobile());
         $pageHtml = RedisService::get($cacheKey);
         if ($pageHtml) {

+ 2 - 2
app/index/service/CategoryService.php

@@ -110,7 +110,7 @@ class CategoryService
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getCates($num=30, $pid=0, $field=''){
+    public static function getCates($num=30, $pid=0, $field='', $orderBy = 'list_order'){
         $cacheKey = "cache:cates:list_byparent_".$pid.'_n'.$num.($field? ':'.md5($field) : '');
         $dataList = RedisService::get($cacheKey);
         if ($dataList) {
@@ -125,7 +125,7 @@ class CategoryService
                 }
             })
             ->field($field)
-            ->order('list_order')
+            ->order($orderBy)
             ->limit($num)
             ->select();
         $dataList = $dataList ? $dataList->toArray() : [];

+ 1 - 1
app/index/service/NewsService.php

@@ -19,7 +19,7 @@ class NewsService
     public static function getList($params, $pageSize=10, $field=''){
         $field = $field? $field : 'id,title,thumb,keywords,hits,guanggaowei,description,create_time';
         $page = request()->get('page', 1);
-        $cacheKey = "cache:news:list:p".$page.'_'.md5(json_encode($params.$field.$pageSize));
+        $cacheKey = "cache:news:list:p".$page.'_'.md5(json_encode($params).$field.$pageSize);
         $dataList = RedisService::get($cacheKey);
         if($dataList){
             return $dataList;

+ 1 - 1
public/themes/mjmls/index/index/floor/banner.html

@@ -72,7 +72,7 @@
     <if condition="!$is_mobile">
     <div class="fr slide-right mob_none">
         <div class="br-top">
-            <img data-src="__TMPL__/static/images/noLogin.png" width="54" height="54" alt="" >
+            <img class="lazyload" data-src="__TMPL__/static/images/noLogin.png" width="54" height="54" alt="" >
             <p>HI,你好!<br> <span class="nowrap">创业开好店,如此简单!</span></p>
         </div>
         <div class="zsxx-box">

+ 13 - 0
vendor/thinkcmf/cmf/src/common.php

@@ -2363,4 +2363,17 @@ function strFilter($str){
     $str = str_replace('?', '', $str);
     $str = str_replace('?', '', $str);
     return trim($str);
+}
+
+/**
+ * 格式化页面 内容
+ * @param $html
+ * @return mixed|null|string|string[]
+ */
+function filterHtmlUrl($html){
+    $ip = request()->domain();
+    $html = str_replace("http://{$ip}:443", '', $html);
+    $html = str_replace("http://{$ip}", '', $html);
+    $html = str_replace(["http://","https://"],["//","//"], $html);
+    return $html;
 }