From 3d34b7636a6b2fd7ec2a12b7ec8518c10439b204 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Tue, 26 Apr 2022 10:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/install/v57sp2_to_v6.txt            | 52 ++++++++++++-------------
 src/system/archive/listview.class.php   |  4 +-
 src/system/archive/sglistview.class.php | 14 -------
 3 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/install/v57sp2_to_v6.txt b/src/install/v57sp2_to_v6.txt
index 6960dfc8..66e5eb92 100644
--- a/src/install/v57sp2_to_v6.txt
+++ b/src/install/v57sp2_to_v6.txt
@@ -9,35 +9,35 @@ ALTER TABLE `#@__tagindex` DROP COLUMN `tag_pinyin`;
 -- 6.1.7
 DROP TABLE IF EXISTS `#@__statistics`;
 CREATE TABLE `#@__statistics` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `sdate` int DEFAULT NULL COMMENT '记录日期',
-  `pv` int DEFAULT NULL COMMENT 'PV',
-  `uv` int DEFAULT NULL COMMENT 'UV',
-  `ip` int DEFAULT NULL COMMENT 'IP',
-  `vv` int DEFAULT NULL COMMENT 'vv',
-  PRIMARY KEY (`id`)
+	`id` int NOT NULL AUTO_INCREMENT,
+	`sdate` int DEFAULT NULL COMMENT '记录日期',
+	`pv` int DEFAULT NULL COMMENT 'PV',
+	`uv` int DEFAULT NULL COMMENT 'UV',
+	`ip` int DEFAULT NULL COMMENT 'IP',
+	`vv` int DEFAULT NULL COMMENT 'vv',
+	PRIMARY KEY (`id`)
 ) TYPE=MyISAM;
 DROP TABLE IF EXISTS `#@__statistics_detail`;
 CREATE TABLE `#@__statistics_detail` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `t` int DEFAULT NULL COMMENT 'unixtime',
-  `created_date` int DEFAULT NULL COMMENT '日期，20220326',
-  `created_hour` int DEFAULT NULL COMMENT '时间，12',
-  `dduuid` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'uuid',
-  `ssid` varchar(32) DEFAULT NULL COMMENT 'session_id',
-  `ip` varchar(46) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'ip地址',
-  `browser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '浏览器',
-  `device` varchar(50) DEFAULT NULL COMMENT '设备',
-  `device_type` varchar(10) DEFAULT NULL COMMENT '设备类型',
-  `os` varchar(20) DEFAULT NULL COMMENT '操作系统',
-  `url_type` tinyint DEFAULT NULL COMMENT '访问地址类型：0:未知 1:列表 2:内容 3:搜索 4:TAG',
-  `typeid` int DEFAULT NULL COMMENT '栏目ID',
-  `aid` int DEFAULT NULL COMMENT '内容ID',
-  `value` varchar(50) DEFAULT NULL COMMENT '值',
-  PRIMARY KEY (`id`),
-  KEY `idx_created_date_dduuid` (`created_date`,`dduuid`),
-  KEY `idx_created_date_ip` (`created_date`,`ip`),
-  KEY `idx_created_date_ssid` (`created_date`,`ssid`)
+	`id` int NOT NULL AUTO_INCREMENT,
+	`t` int DEFAULT NULL COMMENT 'unixtime',
+	`created_date` int DEFAULT NULL COMMENT '日期，20220326',
+	`created_hour` int DEFAULT NULL COMMENT '时间，12',
+	`dduuid` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'uuid',
+	`ssid` varchar(32) DEFAULT NULL COMMENT 'session_id',
+	`ip` varchar(46) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'ip地址',
+	`browser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '浏览器',
+	`device` varchar(50) DEFAULT NULL COMMENT '设备',
+	`device_type` varchar(10) DEFAULT NULL COMMENT '设备类型',
+	`os` varchar(20) DEFAULT NULL COMMENT '操作系统',
+	`url_type` tinyint DEFAULT NULL COMMENT '访问地址类型：0:未知 1:列表 2:内容 3:搜索 4:TAG',
+	`typeid` int DEFAULT NULL COMMENT '栏目ID',
+	`aid` int DEFAULT NULL COMMENT '内容ID',
+	`value` varchar(50) DEFAULT NULL COMMENT '值',
+	PRIMARY KEY (`id`),
+	KEY `idx_created_date_dduuid` (`created_date`,`dduuid`),
+	KEY `idx_created_date_ip` (`created_date`,`ip`),
+	KEY `idx_created_date_ssid` (`created_date`,`ssid`)
 ) TYPE=MyISAM;
 ALTER TABLE `#@__addonarticle` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
 ALTER TABLE `#@__addonimages` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php
index d2b37890..5cfb21fa 100755
--- a/src/system/archive/listview.class.php
+++ b/src/system/archive/listview.class.php
@@ -245,12 +245,12 @@ class ListView
             $ctag = $this->dtp->GetTag("list");
         }
         if (!is_object($ctag)) {
-            $this->pagesize = 20;
+            $this->pagesize = 30;
         } else {
             if ($ctag->GetAtt("pagesize") != "") {
                 $this->pagesize = $ctag->GetAtt("pagesize");
             } else {
-                $this->pagesize = 20;
+                $this->pagesize = 30;
             }
         }
         $this->TotalPage = ceil($this->TotalResult / $this->pagesize);
diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php
index 1fd3a721..8f08af06 100755
--- a/src/system/archive/sglistview.class.php
+++ b/src/system/archive/sglistview.class.php
@@ -293,20 +293,6 @@ class SgListView
             return;
         }
         $this->CountRecord();
-        /*
-        if((empty($this->PageNo) || $this->PageNo==1) && $this->TypeLink->TypeInfos['ispart']==1)
-        {
-            $tmpdir = $GLOBALS['cfg_basedir'].$GLOBALS['cfg_templets_dir'];
-            $tempfile = str_replace("{tid}",$this->TypeID,$this->Fields['tempindex']);
-            $tempfile = str_replace("{cid}",$this->ChannelUnit->ChannelInfos['nid'],$tempfile);
-            $tempfile = $tmpdir."/".$tempfile;
-            if(!file_exists($tempfile))
-            {
-                $tempfile = $tmpdir."/".$GLOBALS['cfg_df_style']."/index_default_sg.htm";
-            }
-            $this->dtp->LoadTemplate($tempfile);
-        }
-        */
         $this->ParseTempletsFirst();
         $this->ParseDMFields($this->PageNo, 0);
         $this->dtp->Display();