From 3f59f54f5cb60997e7a4bbbbcaeda33391654d88 Mon Sep 17 00:00:00 2001
From: llgoer <yanghuxiao@vip.qq.com>
Date: Sun, 13 Nov 2022 10:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4=E8=A1=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=AE=89=E8=A3=85=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    |  6 +++---
 dedebiz                      | 31 +++++++++++++++++++------------
 src/install/index.php        |  2 +-
 src/install/install.html     |  2 +-
 src/install/sql-dftables.txt |  8 ++++----
 src/system/common.inc.php    |  4 ++--
 6 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 7454e046..7ac86232 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-## DedeCMSV6
+## DedeV6
 
-国内流行的内容管理系统（CMS）多端全媒体解决方案，DedeCMSV6系统基于PHP7.X开发，同时兼容PHP8，具有很强的可扩展性，并且完全开放源代码DedeBIZ商业支持采用现流行的Go语言设计开发，让系统拥有简单易用、灵活扩展特性之外更安全、高效，模板设计制作简单一直是系统的一大特点，全新的版本延续了之前标签引擎，同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎，让搭建跨终端（移动、PC）全媒体站点更简单。
+国内流行的内容管理系统（CMS）多端全媒体解决方案，DedeV6系统基于PHP7.X开发，同时兼容PHP8，具有很强的可扩展性，并且完全开放源代码DedeBIZ商业支持采用现流行的Go语言设计开发，让系统拥有简单易用、灵活扩展特性之外更安全、高效，模板设计制作简单一直是系统的一大特点，全新的版本延续了之前标签引擎，同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎，让搭建跨终端（移动、PC）全媒体站点更简单。
 
 ## 版本说明
 
-DedeCMSV6.x是一个LTS版本，支持将到2025年10月截止，目前DedeCMSV6已经发布，可以[点击下载](https://www.dedebiz.com/download)获取
+DedeV6.x是一个LTS版本，支持将到2025年10月截止，目前DedeV6已经发布，可以[点击下载](https://www.dedebiz.com/download)获取
 
 ## 参与开源
 
diff --git a/dedebiz b/dedebiz
index 09d46566..11596023 100755
--- a/dedebiz
+++ b/dedebiz
@@ -308,7 +308,9 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
     $dbpwd = "";
     $dbprefix = "dede_";
     $dblang = "utf8";
-	mkdir($workDir.'/data/tplcache', 0777);
+	if (!is_dir($workDir.'/data/tplcache')) {
+		mkdir($workDir.'/data/tplcache', 0777);
+	}
     //common.inc.php
     $configStr1 = str_replace("~dbtype~",$dbtype,$configStr1);
     $configStr1 = str_replace("~dbhost~",$dbhost,$configStr1);
@@ -415,23 +417,28 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
     $adminuser = "admin";
     $adminpwd = "admin";
     //增加管理员帐号
-    $adminquery = "INSERT INTO `{$dbprefix}admin` VALUES (1, 10, '$adminuser', '".substr(md5($adminpwd),5,20)."', 'admin', '', '', 0, '".time()."', '127.0.0.1');";
+    $pfd = "pwd";
+    $apwd = substr(md5($adminpwd),5,20);
+    $upwd = md5($adminpwd);
+    if (function_exists('password_hash')) {
+        $pfd = "pwd_new";
+        $apwd = password_hash($adminpwd, PASSWORD_BCRYPT);
+        $upwd = password_hash($adminpwd, PASSWORD_BCRYPT);
+    }
+    //增加管理员帐号
+    $adminquery = "INSERT INTO `{$dbprefix}admin` (`id`,`usertype`,`userid`,`$pfd`,`uname`,`tname`,`email`,`typeid`,`logintime`,`loginip`) VALUES (1,10,'$adminuser','".$apwd."','admin','','',0,'".time()."','127.0.0.1');";
     $db->exec($adminquery);
-    DedeCli::write("admin user:admin");
-    DedeCli::write("admin password:admin");
     //关连前台会员帐号
-    $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`,`scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` )
-        VALUES ('1','个人','$adminuser','".md5($adminpwd)."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); ";
+    $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`{$pfd}`,`uname`,`sex`,`rank`,`money`,`email`,`scores`,`matt`,`face`,`safequestion`,`safeanswer`,`jointime`,`joinip`,`logintime`,`loginip`) VALUES ('1','个人','$adminuser','".$upwd."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); ";
     $db->exec($adminquery);
-    $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house` ,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`)
-        VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); ";
+    $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house`,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`) VALUES ('1','1','男','{$adminuser}','','','','','0','0','1980-01-01','1','0','0','160','0','0','0','0','0','0','0','0','','','','','0'); ";
     $db->exec($adminquery);
-    $adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`)
-        VALUES ('1','0','0','0','0','0','0','0','0'); ";
+    $adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) VALUES ('1','0','0','0','0','0','0','0','0'); ";
     $db->exec($adminquery);
-    $adminquery = "Insert Into `{$dbprefix}member_space`(`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`)
-        Values('1','10','0','{$adminuser}的空间','','person','',''); ";
+    $adminquery = "INSERT INTO `{$dbprefix}member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('1','10','0','{$adminuser}的空间','','person','',''); ";
     $db->exec($adminquery);
+    DedeCli::write("admin user:admin");
+    DedeCli::write("admin password:admin");
 	if (phpversion() < "5.4") {
 		die("DedeBIZ:command web server not support\n\n");
 	}
diff --git a/src/install/index.php b/src/install/index.php
index 07cae783..58680869 100644
--- a/src/install/index.php
+++ b/src/install/index.php
@@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE);
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.1.10beta'; //详细版本号
+$cfg_version_detail = '6.2.0'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);
diff --git a/src/install/install.html b/src/install/install.html
index 7eaec6c4..3a6fa529 100644
--- a/src/install/install.html
+++ b/src/install/install.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-	<title>安装DedeCMSV6程序</title>
+	<title>安装DedeV6程序</title>
 	<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 	<link rel="shortcut icon" href="../static/web/img/favicon.ico">
diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt
index fdd0fb4e..58526863 100755
--- a/src/install/sql-dftables.txt
+++ b/src/install/sql-dftables.txt
@@ -194,7 +194,7 @@ CREATE TABLE `#@__archives` (
   `scores` mediumint(8) NOT NULL default '0',
   `goodpost` mediumint(8) unsigned NOT NULL default '0',
   `badpost` mediumint(8) unsigned NOT NULL default '0',
-  `voteid` mediumint(8) NOT NULL,
+  `voteid` mediumint(8) NOT NULL default '0',
   `notpost` tinyint(1) unsigned NOT NULL default '0',
   `description` varchar(255) NOT NULL default '',
   `filename` varchar(40) NOT NULL default '',
@@ -896,10 +896,10 @@ CREATE TABLE `#@__statistics_detail` (
   `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',
+  `dduuid` varchar(32) 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 '浏览器',
+  `ip` varchar(46) DEFAULT NULL COMMENT 'ip地址',
+  `browser` varchar(50) DEFAULT NULL COMMENT '浏览器',
   `device` varchar(50) DEFAULT NULL COMMENT '设备',
   `device_type` varchar(10) DEFAULT NULL COMMENT '设备类型',
   `os` varchar(20) DEFAULT NULL COMMENT '操作系统',
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index dc5aa343..ba897cea 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -186,11 +186,11 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.1.10beta'; //详细版本号
+$cfg_version_detail = '6.2.0'; //详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '织梦内容管理系统';
-$cfg_soft_enname = 'DedeCMSV6';
+$cfg_soft_enname = 'DedeV6';
 $cfg_soft_devteam = 'DedeBIZ';
 //文档的默认命名规则
 $art_shortname = $cfg_df_ext = '.html';