diff --git a/src/install/config.cache.inc.php b/src/install/config.cache.inc.php index cb304a28..fdf145c4 100755 --- a/src/install/config.cache.inc.php +++ b/src/install/config.cache.inc.php @@ -4,7 +4,7 @@ $cfg_cookie_encode = '~cookieEncode~'; $cfg_indexurl = '~indexurl~'; $cfg_backup_dir = 'backupdata'; $cfg_indexname = '网站首页'; -$cfg_indexseotitle = 'DedeBIZ-'; +$cfg_indexseotitle = 'DedeBIZ'; $cfg_webname = '~webname~'; $cfg_adminemail = '~adminmail~'; $cfg_html_editor = 'ckeditor'; diff --git a/src/install/install.html b/src/install/install.html index 2f5b8619..20c1fcfd 100644 --- a/src/install/install.html +++ b/src/install/install.html @@ -12,7 +12,7 @@ -
+
@@ -27,72 +27,67 @@
-
-
-
- 0) {foreach($arrMsg as $msg){?> -
- -
-
-

安装Dedev

-
-
-
- - - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
- -
-
-
-
- - -
-
- - - 请使用数字0-9小写a-z大写A-Z符号_@!.- -
-
- - - 请使用数字0-9小写a-z大写A-Z符号_@!.- -
-
-
-
+
+ 0) {foreach($arrMsg as $msg){?> +
+ +
安装前请先阅读《站点授权协议》
+
+
+
+

安装Dedev

-
- © 2024 穆云智能科技 版权所有 - 授权协议 +
+
+ + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+ + +
+
+ + + 请使用数字0-9小写a-z大写A-Z符号_@!.- +
+
+ + + 请使用数字0-9小写a-z大写A-Z符号_@!.- +
+
+
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 18655ccf..c9cf840d 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -3932,32 +3932,32 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('3','cfg_indexurl','首页链接','1','string','/'), ('4','cfg_backup_dir','数据备份目录,存data文件夹里','2','string','backupdata'), ('5','cfg_indexname','首页链接名','1','string','网站首页'), -('6','cfg_indexseotitle','首页SEO标题','1','string','DedeBIZ-'), +('6','cfg_indexseotitle','首页SEO标题','1','string','DedeBIZ'), ('7','cfg_webname','网站名称','1','string','我的网站'), ('8','cfg_adminemail','网站发信邮箱','2','string','support@dedebiz.com'), -('9','cfg_html_editor','富文本,默认CKEditor可自行更换其它富文本','2','string','ckeditor'), -('10','cfg_arcdir','默认文档生成文件路径','1','string','/a'), +('9','cfg_html_editor','默认CKEditor富文本,支持其它富文本','2','string','ckeditor'), +('10','cfg_arcdir','默认文档更新文件路径','1','string','/a'), ('11','cfg_medias_dir','默认图片上传文件路径','1','string','/static'), ('12','cfg_ddimg_width','缩略图默认宽度','3','number','400'), ('13','cfg_ddimg_height','缩略图默认高度','3','number','300'), ('14','cfg_album_width','图集默认显示图片的大小','3','number','800'), -('15','cfg_imgtype','图片浏览器文件类型','3','string','jpeg|jpg|gif|png|webp|bmp'), -('16','cfg_softtype','允许上传的软件类型','3','bstring','zip|gz|rar|iso|doc|xsl|ppt|wps'), -('17','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'), -('18','cfg_specnote','专题的最大节点数','2','number','10'), -('19','cfg_list_symbol','栏目位置的间隔符号','2','string',''), +('15','cfg_imgtype','允许图片浏览文件类型','3','string','jpeg|jpg|gif|png|webp|bmp'), +('16','cfg_softtype','允许软件上传文件类型','3','bstring','zip|gz|rar|iso|doc|xsl|ppt|wps'), +('17','cfg_mediatype','允许多媒体上传文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'), +('18','cfg_specnote','专题最大节点数','2','number','10'), +('19','cfg_list_symbol','当前位置间隔符号','2','string',''), ('20','cfg_notallowstr','禁用关键词,用|分开,但不要在结尾加|','5','bstring','渣男|直男'), ('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'), -('22','cfg_keyword_replace','是否使用关键词替换功能,开启影响文档生成速度','2','bool','Y'), -('23','cfg_rewrite','是否启用伪静态,参考栏目修改提示里默认规则','1','bool','N'), +('22','cfg_keyword_replace','是否使用关键词替换功能,开启影响文档更新速度','2','bool','Y'), +('23','cfg_rewrite','是否启用伪静态,开启需要添加伪静态规则','1','bool','N'), ('24','cfg_df_style','默认主题模板风格','1','string','dedebiz'), -('25','cfg_multi_site','是否支持多站点,开启此项后附件栏目连接arclist文档启用绝对网址','2','bool','N'), +('25','cfg_multi_site','是否支持多站点,开启后附件栏目连接文档启用绝对网址','2','bool','N'), ('26','cfg_rm_remote','下载远程图片和资源','7','bool','Y'), ('27','cfg_dede_log','是否开启管理日志','2','bool','N'), ('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2024 DedeBIZ 版权所有'), ('29','cfg_jump_once','跳转网址是否直接跳转否则显示中转页','7','bool','Y'), -('30','cfg_task_pwd','系统计划任务客户端许可密码,需要客户端,通常不会太重要','7','string',''), -('31','cfg_arcsptitle','是否开启分页标题,开启影响文档生成速度','6','bool','N'), +('30','cfg_task_pwd','系统计划任务客户端密码','7','string',''), +('31','cfg_arcsptitle','是否开启分页标题,开启影响文档更新速度','6','bool','N'), ('32','cfg_arcautosp','是否开启长文档自动分页','6','bool','N'), ('33','cfg_arcautosp_size','文档自动分页大小','6','number','5'), ('34','cfg_auot_description','自动摘要长度(0-255,0表示不启用)','7','number','255'), @@ -3967,30 +3967,30 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('38','cfg_mb_upload','是否允许会员上传非图片附件','4','bool','Y'), ('39','cfg_mb_upload_size','会员上传文件大小(KB)','4','number','5024'), ('40','cfg_mb_sendall','是否开放会员对自定义模型投稿','4','bool','Y'), -('41','cfg_mb_rmdown','是否会员指定远程文档下载到本地','4','bool','Y'), +('41','cfg_mb_rmdown','是否会员指定远程资源下载到本地','4','bool','Y'), ('42','cfg_cli_time','服务器时区设置','2','number','8'), -('43','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'), +('43','cfg_mb_addontype','会员附件许可文件类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'), ('44','cfg_mb_max','会员附件总大小限制(MB)','4','number','500'), ('45','cfg_replacestr','禁用关键词替换成*,用|分开,但不要在结尾加|','5','bstring','渣男|直男'), ('46','cfg_keyword_like','使用关键词关连文档','6','bool','Y'), -('47','cfg_index_max','首页调用函数最大索引文档数,不适用于经常单栏目采集过多文档网站,不启用本项此值设置为0即可','6','number','10000'), -('48','cfg_index_cache','arclist标签调用缓存(0不启用,大于0值为多少秒)','6','number','86400'), +('47','cfg_index_max','首页调用函数最大索引文档数,不适用于经常单栏目采集网站,不启用设置为0','6','number','10000'), +('48','cfg_index_cache','文档标签调用缓存(0不启用,大于0值为多少秒)','6','number','86400'), ('49','cfg_tplcache','是否启用模板缓存','6','bool','Y'), ('50','cfg_tplcache_dir','模板缓存目录','6','string','/data/tplcache'), -('51','cfg_makesign_cache','是否修改发布单个文档调用缓存','6','bool','N'), +('51','cfg_makesign_cache','是否修改发布单文档调用缓存','6','bool','N'), ('52','cfg_arc_dellink','删除非站内链接','7','bool','Y'), ('53','cfg_arc_autopic','提取第一个图片为缩略图','7','bool','Y'), ('54','cfg_arc_autokeyword','自动提取关键词','7','bool','N'), -('55','cfg_title_maxlen','文档标题最大长度,变量后需要手工修改数据表','7','number','255'), +('55','cfg_title_maxlen','文档标题最大长度,修改后需要手工修改数据表','7','number','255'), ('56','cfg_album_row','图集多行多列样式默认行数','3','number','3'), ('57','cfg_album_col','图集多行多列样式默认列数','3','number','4'), ('58','cfg_album_pagesize','图集多页多图每页显示最大数','3','number','12'), ('59','cfg_album_style','图集默认样式(1为多页多图、2为多页单图、3为缩略图列表)','3','number','2'), ('60','cfg_album_ddwidth','图集默认缩略图大小','3','number','200'), -('61','cfg_mb_notallow','不允许注册的会员ID','4','bstring','user,users,admin,administrator'), +('61','cfg_mb_notallow','不允许会员注册ID','4','bstring','user,users,admin,administrator'), ('62','cfg_mb_idmin','会员ID最小长度','4','number','6'), ('63','cfg_mb_pwdmin','会员密码最小长度','4','number','6'), -('64','cfg_md_idurl','是否严格限定会员登录ID,允许会员使用二级域名必须设置此项','4','bool','N'), +('64','cfg_md_idurl','是否严格限定会员登录ID,会员使用二级域名必须设置此项','4','bool','N'), ('65','cfg_mb_rank','注册会员默认级别,会员权限管理中查看级别代表的数字','4','number','10'), ('66','cfg_feedback_time','两次评论至少间隔时间(秒)','5','number','30'), ('67','cfg_feedback_numip','每个IP一小时内最大评论数','5','number','30'), @@ -4023,34 +4023,34 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('94','cfg_description','首页描述','1','bstring','DedeBIZ系统基于PHP7版本开发,具有很强的可扩展性,并且采用GPLv2协议完全开放源代码。DedeBIZ支持采用现流行的Go语言设计开发,拥有简单易用、灵活扩展特性之外更安全、高效。模板设计制作简单,一直是系统一大特点,延续之前标签,同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎,让搭建跨终端和移动端全媒体站点更简单。'), ('95','cfg_beian','网站备案号','1','string',''), ('96','cfg_need_typeid2','是否启用副栏目','6','bool','Y'), -('97','cfg_mb_pwdtype','前台密码验证类型32-32位md5,可选l16-前16位、r16-后16位、m16-中间16位','4','string','32'), -('98','cfg_cache_type','文档ID,content标签最终文档,修改此变量后必须更新缓存','6','string','id'), +('97','cfg_mb_pwdtype','前台密码验证类型32位md5(16位l16、后16位r16、中间16位m16)','4','string','32'), +('98','cfg_cache_type','文档ID,content标签最终文档,修改后需要更新缓存','6','string','id'), ('99','cfg_max_face','会员上传头像大小限制(KB)','3','number','2024'), -('100','cfg_typedir_df','栏目网址使用目录名(不显示默认页,则是/a/b/c形式)','2','bool','Y'), +('100','cfg_typedir_df','栏目文件保存目录形式(不显示默认页,则是/a/b/c)','2','bool','Y'), ('101','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'), ('105','cfg_make_prenext','发布文档后马上更新上下篇','6','bool','N'), ('103','cfg_make_andcat','发布文档后马上更新相关栏目','6','bool','N'), ('104','cfg_feedback_forbid','是否禁止所有评论,包括禁止顶踩等','5','bool','N'), -('105','cfg_addon_domainbind','是否绑定附件目录为指定的二级域名','7','bool','N'), -('106','cfg_addon_domain','附件目录的二级域名','7','string',''), +('105','cfg_addon_domainbind','是否绑定附件目录为指定二级域名','7','bool','N'), +('106','cfg_addon_domain','附件目录二级域名','7','string',''), ('107','cfg_df_dutyadmin','默认作者名称','7','string','网站管理员'), ('108','cfg_face_adds','上传头像增加积分','5','number','10'), ('109','cfg_moreinfo_adds','填写详细资料增加积分','5','number','20'), ('110','cfg_money_scores','多少积分可以兑换一个金币','5','number','50'), ('111','cfg_mb_wnameone','是否允许会员昵称重复','4','bool','N'), -('112','cfg_arc_dirname','是否允许用目录作为文档文件名,文档命名规则:{typedir}/{aid}/index.html','7','bool','Y'), +('112','cfg_arc_dirname','是否允许栏目文件保存目录为文档文件名,文档命名规则{typedir}/{aid}/index.html','7','bool','Y'), ('113','cfg_puccache_time','需缓存文档全局缓存时间(秒)','6','number','36000'), -('114','cfg_arc_click','文档默认浏览数(-1表示随机1000到6000之间)','7','number','-1'), +('114','cfg_arc_click','文档默认浏览数(-1表示随机)','7','number','-1'), ('115','cfg_addon_savetype','附件保存形式,按data函数日期参数(y年m月d日)','3','string','ymd'), ('116','cfg_qk_uploadlit','异步上传缩略图,空间太不稳定会员关闭此项','3','bool','Y'), ('117','cfg_login_adds','登录会员中心获积分','5','number','2'), ('118','cfg_userad_adds','会员推广获积分','5','number','10'), ('119','cfg_replace_num','文档关键词替换次数(0为全部替换)','7','number','1'), -('120','cfg_uplitpic_cut','是否上传缩略图后马上弹出裁剪框','3','bool','Y'), +('120','cfg_uplitpic_cut','是否上传缩略图后弹出裁剪框','3','bool','Y'), ('121','cfg_album_mark','是否使用图集水印,小图也会受影响','3','bool','N'), ('122','cfg_mb_feedcheck','是否需要会员动态审核','4','bool','N'), ('123','cfg_mb_msgischeck','是否需要会员状态审核','4','bool','N'), -('124','cfg_title_site','是否发布和修改文档时远程发布,启用远程站点的前提下','2','bool','N'), +('124','cfg_title_site','是否发布和修改文档时远程发布,启用远程站点前提下','2','bool','N'), ('125', 'cfg_domain_cookie', '跨域共享Cookie的域名', 2, 'string', ''), ('126', 'cfg_cross_sectypeid', '支持交叉栏目显示副栏目文档', '7', 'bool', 'Y'), ('127', 'cfg_digg_update', '顶踩缓存异步更新间隔(0为不缓存)', '6', 'number', '0'), @@ -4061,7 +4061,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('132', 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'), ('133', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''), ('134', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''), -('135', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'), +('135', 'cfg_tags_dir', '标签更新目录', 7, 'string', '{cmspath}/a/tags'), ('136', 'cfg_bizcore_api', 'DedeBIZ Core接口服务器', 1, 'string', 'http://localhost:8087'); INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文件管理器', '', '', 0, ''), diff --git a/src/install/update.txt b/src/install/update.txt index 18e36a0f..3f3cb29a 100644 --- a/src/install/update.txt +++ b/src/install/update.txt @@ -80,7 +80,7 @@ ALTER TABLE `#@__dl_log` MODIFY COLUMN `ip` char(46) NOT NULL AFTER `id`; ALTER TABLE `#@__addoninfos` MODIFY COLUMN `nativeplace` char(20) NOT NULL DEFAULT 0 AFTER `badpost`; -- 6.1.8 -INSERT INTO `#@__sysconfig` VALUES ('151', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'); +INSERT INTO `#@__sysconfig` VALUES ('151', 'cfg_tags_dir', '标签更新目录', 7, 'string', '{cmspath}/a/tags'); ALTER TABLE `#@__tagindex` DROP COLUMN `tag_pinyin`; -- 6.1.9 diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index b3da6074..5aa950f1 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -27,7 +27,7 @@ input:focus,select:focus,textarea:focus{color:var(--gray);background:var(--white .install-head{padding:1rem 0;background:var(--white)} .install-head .logo{font-size:18px;font-weight:600;color:var(--gray-dark)} .install-head .logo img,.login-box .logo img{margin-right:0.5rem;height:36px} -.install-box{margin:0 auto;width:750px} +.install-box{margin:0 auto;padding:0 1rem;width:750px} .install-box .card-header,.install-box .card-body{padding:1.25rem} .install-box h1{margin:0;line-height:1.2;font-size:18px;font-weight:600;color:var(--gray-dark)} .install-box label{margin-bottom:0.25rem} @@ -179,15 +179,6 @@ table,input,select,textarea,.web-info,.upload-box,.colordlg,.pubdlg,.quickselite .btn-sm{padding:0.375rem 0.6rem;height:30px;font-size:12px} .btn-xs{padding:0.22rem;height:20px;line-height:1;font-size:12px;border-radius:var(--b-radius-300)!important} .btn+.btn{margin-left:10px} -@media (min-width:1199px){ -.modal-dialog{max-width:500px} -} -@media screen and (max-width:1199px) and (min-width:992px){ -.login-box{padding:30px} -} -@media (max-width:768px){ -td{white-space:nowrap} -.install-box,.tips-box,.w-60,.w-40{width:100%} -.tips{padding:0 1rem} -.login-box{padding:30px} -} \ No newline at end of file +.shadow-sm{box-shadow:0 .125rem 0.25rem rgba(0,0,0,.025)!important} +@media (min-width:1199px){.modal-dialog{max-width:500px}}@media screen and (max-width:1199px) and (min-width:992px){.login-box{padding:30px}} +@media (max-width:768px){td{white-space:nowrap}.install-box,.tips-box,.w-60,.w-40{width:100%}.tips{padding:0 1rem}.login-box{padding:30px}} \ No newline at end of file diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 3f7d2970..a38f4fe4 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -109,10 +109,4 @@ input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkb #validateimg,.btn-send{border-radius:0 var(--b-radius) var(--b-radius) 0;cursor:pointer} #returntop{display:none;position:fixed;padding:10px 15px;right:1rem;bottom:1rem;color:var(--white);cursor:pointer;background:var(--orange);border-radius:var(--b-radius);border:0;z-index:9998} #returntop:hover{background:var(--orange)} -@media (max-width:768px){ -.pb-m-3{padding-bottom:1rem} -.login-from{width:100%} -.bannr-img,.item-theme-img img,.list-article-img img{height:250px} -.item-news-img img{height:210px} -.feedbacks .feedback-action{float:none} -} \ No newline at end of file +@media (max-width:768px){.pb-m-3{padding-bottom:1rem}.login-from{width:100%}.bannr-img,.item-theme-img img,.list-article-img img{height:250px}.item-news-img img{height:210px}.feedbacks .feedback-action{float:none}} \ No newline at end of file diff --git a/src/theme/dedebiz/index.htm b/src/theme/dedebiz/index.htm index 4b433998..e57a6814 100644 --- a/src/theme/dedebiz/index.htm +++ b/src/theme/dedebiz/index.htm @@ -3,7 +3,7 @@ - {dede:global.cfg_indexseotitle/}{dede:global.cfg_webname/} + {dede:global.cfg_indexseotitle/}-{dede:global.cfg_webname/}