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 @@
-