v2.1.18-20241105

index.php

@@ -35,8 +35,8 @@ if($db_config['type'] == 'sqlite'){
 $global_config = unserialize( get_db("global_config", "v", ["k" => "o_config"]) ); //全局配置
 $c = Get('c');
 $libs = $global_config['Libs'];
-$layui['js']  = $libs.'/Layui/v2.9.10/layui.js';
-$layui['css'] = $libs.'/Layui/v2.9.10/css/layui.css';
+$layui['js']  = $libs.'/Layui/v2.9.18/layui.js';
+$layui['css'] = $libs.'/Layui/v2.9.18/css/layui.css';
 $global_config['static_link'] = isset($global_config['static_link']) ? $global_config['static_link'] : 0;
 define('libs',$global_config['Libs']);
 define('SysVer',Get_Version());

system/ATool.php

@@ -91,7 +91,7 @@ if(!empty($_GET['type'])){
            $user_group['root'] = '站长';
            $user_group['default'] = '默认';
            foreach ($datas as $key => $data){
-               $datas[$key]['UserGroupName'] = $user_group[$data['UserGroup']]??'Null';
+               $datas[$key]['UserGroupName'] = $user_group[$data['UserGroup']]??$data['UserGroup'];
            }
         }
         msgA(['code'=>1,'msg'=>'获取成功','count'=>$count,'data'=>$datas]);
@@ -116,6 +116,10 @@ if(!empty($_GET['type'])){
     }elseif($_GET['type'] == 'set_close_Maintenance'){
         $global_config['Maintenance'] = 0;
         update_db("global_config", ["v" => $global_config], ["k" => "o_config"],[1,'设置成功']);
+    //开启调试模式
+    }elseif($_GET['type'] == 'set_open_debug'){
+        $global_config['Debug'] = 1;
+        update_db("global_config", ["v" => $global_config], ["k" => "o_config"],[1,'设置成功']);
     //重置静态路径
     }elseif($_GET['type'] == 'Set_Libs'){
         $global_config['Libs'] = "./static";
@@ -127,6 +131,10 @@ if(!empty($_GET['type'])){
             opcache_reset(); //清理PHP缓存
         }
         msgA(['code'=>1,'msg'=>'操作成功']);
+    //清空统计
+    }elseif($_GET['type'] == 'del_tongji'){
+        delete_db('user_count',[]);
+        msgA(['code'=>1,'msg'=>'操作成功']);
     //改账号
     }elseif($_GET['type'] == 'set_user_name'){
         //新用户名是否合规
@@ -181,6 +189,14 @@ if(!empty($_GET['type'])){
         }
         $LoginConfig['totp_key'] = '';
         update_db("global_user", ["LoginConfig" => $LoginConfig], ["ID" => $_POST['ID']],[1,'操作成功']);
+    }elseif($_GET['type'] == 'get_pwd2'){
+        $user_data = get_db('global_user','*',['ID'=>$_POST['ID']]);
+        $LoginConfig = unserialize($user_data['LoginConfig']);
+        if(empty($LoginConfig['Password2'])){
+            msgA(['code'=>-1,'msg'=>'当前账号未设置二级密码']);
+        }else{
+            msgA(['code'=>1,'msg'=> "当前账号: {$user_data['User']}<br />二级密码: {$LoginConfig['Password2']}"]);
+        }
     }
     
     msgA(['code'=>-1,'msg'=>'请求类型错误']);
@@ -252,9 +268,11 @@ function echo_Atool(){
         <a class="layui-btn layui-btn-sm layui-btn-primary" href="../index.php?c=<?php echo $global_config['Register'];?>" target="_blank"><i class="layui-icon layui-icon-add-1"></i>打开注册页</a>
         <button type="set_allow_register" class="set layui-btn layui-btn-sm layui-btn-primary"><i class="layui-icon layui-icon-set-sm"></i>允许注册</button>
         <button type="set_close_Maintenance" class="set layui-btn layui-btn-sm layui-btn-primary"><i class="layui-icon layui-icon-set-sm"></i>关闭维护模式</button>
+        <button type="set_open_debug" class="set layui-btn layui-btn-sm layui-btn-primary"><i class="layui-icon layui-icon-set-sm"></i>打开调试模式</button>
         <button type="Set_Libs" class="set layui-btn layui-btn-sm layui-btn-primary"><i class="layui-icon layui-icon-set-sm"></i>重置静态路径</button>
         <button type="Set_clear_cache" class="set layui-btn layui-btn-sm layui-btn-primary"><i class="layui-icon layui-icon-set-sm"></i>清除缓存</button>
-        <a class="layui-btn layui-btn-sm layui-btn-primary" href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7993451&doc_id=3767990" target="_blank"><i class="layui-icon layui-icon-align-left"></i>帮助</a>
+        <button type="del_tongji" class="del_tongji layui-btn layui-btn-sm layui-btn-primary"><i class="layui-icon layui-icon-set-sm"></i>清空统计</button>
+        <a class="layui-btn layui-btn-sm layui-btn-primary" href="https://docs.twonav.cn/#/books/start-07" target="_blank"><i class="layui-icon layui-icon-align-left"></i>帮助</a>
     </div>
     <hr>
     <div class="layui-inline layui-form" style="padding-bottom: 5px;">
@@ -281,10 +299,7 @@ function echo_Atool(){
 <!-- 表格操作列 -->
 <script type="text/html" id="tablebar">
     <div class="layui-btn-group">
-        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_pwd">改密码</a>
-        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_root">设站长</a>
-        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_user_name">改账号</a>
-        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="del_otp" title="移除OTP登录验证">删OTP</a>
+        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="more">操作 <i class="layui-icon layui-icon-down"></i></a>
     </div>
 </script>
 <script src="<?php echo $GLOBALS['layui']['js']; ?>"></script>
@@ -292,13 +307,14 @@ function echo_Atool(){
 <script src="../static/jquery/jquery.md5.js"></script>
 <script src="../templates/admin/js/public.js?v=<?php echo time();?>"></script>
 <script>
-    layui.use(['layer','table'], function () {
+    layui.use(function () {
         var $ = layui.jquery;
         var layer = layui.layer;
         var table = layui.table;
+        var dropdown = layui.dropdown;
         var cols = [[
             {field:'ID',title:'ID',width:60,sort:true}
-            ,{title:'操作',toolbar:'#tablebar',width:220}
+            ,{title:'操作',toolbar:'#tablebar',width:90}
             ,{field:'User',title:'账号',minWidth:120,templet:function(d){
                 return '<a style="color:#3c78d8" title="打开用户主页" target="_blank" href="../?u='+d.User+'">'+d.User+'</a>'
             }}
@@ -310,6 +326,7 @@ function echo_Atool(){
             ,{field:'RegTime',title: '注册时间',minWidth:100,templet:function(d){
                 return d.RegTime == null ? '' : timestampToTime(d.RegTime,true);
             }}
+            
             ]]
         //用户表渲染
         table.render({
@@ -345,47 +362,67 @@ function echo_Atool(){
         table.on('tool(table)', function (obj) {
             console.log(obj.data);
             var data = obj.data;
-            if (obj.event == 'set_pwd') {
-                layer.prompt({formType: 3,value: '',title: '请输入新密码'}, function(value, index, elem){
-                    $.post('./ATool.php?type=set_pwd',{ID:data.ID,new_pwd:$.md5(value)},function(data,status){
-                        if(data.code == 1) {
-                            layer.close(index);
-                            layer.msg(data.msg, {icon: 1});
-                        }else{
-                            layer.msg(data.msg, {icon: 5});
+            if(obj.event == 'more'){
+                dropdown.render({
+                    elem: this,
+                    show: true, 
+                    data: [{
+                            title: '修改密码',
+                            id: 'set_pwd'
+                        },{
+                            title: '设为站长',
+                            id: 'set_root'
+                        },{
+                            title: '修改账号',
+                            id: 'set_user_name'
+                        },{
+                            title: '取消双重验证',
+                            id: 'del_otp'
+                        },{
+                            title: '查看二级密码',
+                            id: 'get_pwd2'
                         }
-                    });
-                });
-            }else if(obj.event == 'set_root'){
-                $.post('./ATool.php?type=set_root',{ID:data.ID},function(data,status){
-                    if(data.code == 1) {
-                        table.reload('table');
-                        layer.msg(data.msg, {icon: 1});
-                    }else{
-                        layer.msg(data.msg, {icon: 5});
-                    }
-                });
-            }else if(obj.event == 'set_user_name'){
-                layer.prompt({formType: 3,value: '',title:'请输入新账号 (原账号:'+data.User+')'}, function(value, index, elem){
-                    $.post('./ATool.php?type=set_user_name',{ID:data.ID,new_user_name:value},function(data,status){
-                        if(data.code == 1) {
-                            layer.close(index);
-                            table.reload('table');
-                            layer.msg(data.msg, {icon: 1});
+                    ],
+                    click: function(menu, othis){
+                        if(menu.id == 'set_pwd'){
+                            layer.prompt({formType: 3,value: '',title: '请输入新密码'}, function(value, index, elem){
+                                $.post('./ATool.php?type=set_pwd',{ID:data.ID,new_pwd:$.md5(value)},function(data,status){
+                                    if(data.code == 1) {
+                                        layer.close(index);
+                                        layer.msg(data.msg, {icon: 1});
+                                    }else{
+                                        layer.msg(data.msg, {icon: 5});
+                                    }
+                                });
+                            });
+                        }else if(menu.id == 'set_user_name'){
+                            layer.prompt({formType: 3,value: '',title:'请输入新账号 (原账号:'+data.User+')'}, function(value, index, elem){
+                                $.post('./ATool.php?type=set_user_name',{ID:data.ID,new_user_name:value},function(data,status){
+                                    if(data.code == 1) {
+                                        layer.close(index);
+                                        table.reload('table');
+                                        layer.msg(data.msg, {icon: 1});
+                                    }else{
+                                        layer.msg(data.msg, {icon: 5});
+                                    }
+                                });
+                            });
+                        }else if(menu.id == 'set_root' || menu.id == 'del_otp' || menu.id == 'get_pwd2'){
+                            $.post('./ATool.php?type=' + menu.id,{ID:data.ID},function(data,status){
+                                if(data.code == 1) {
+                                    table.reload('table');
+                                    layer.msg(data.msg, {icon: 1});
+                                }else{
+                                    layer.msg(data.msg, {icon: 5});
+                                }
+                            });
                         }else{
-                            layer.msg(data.msg, {icon: 5});
+                            layer.msg('无效操作', {icon: 5});
                         }
-                    });
-                });
-            }else if(obj.event == 'del_otp'){
-                $.post('./ATool.php?type=del_otp',{ID:data.ID},function(data,status){
-                    if(data.code == 1) {
-                        layer.msg(data.msg, {icon: 1});
-                    }else{
-                        layer.msg(data.msg, {icon: 5});
                     }
-                });
+                })
             }
+            return false;
         });
         $('.set').click(function () {
             let type = $(this).attr("type");
@@ -398,6 +435,22 @@ function echo_Atool(){
             });
             return false;
         });
+        //清空统计
+        $('.del_tongji').on('click', function(){
+            layer.confirm('确认后将删除所有账号的统计数据(访问统计/点击统计/报表统计),是否继续?',{icon: 3, title:'此操作不可逆'}, function(index){
+                $.post('./ATool.php?type=del_tongji',function(data,status){
+                    layer.closeLast('loading');
+                     if(data.code == 1){
+                        layer.msg(data.msg,{icon: 1})
+                    } else{
+                        layer.msg(data.msg,{icon: 5});
+                    }
+                }).fail(function(xhr, textStatus, errorThrown) {  
+                    layer.closeLast('loading');
+                    layer.alert('请求失败');
+                });
+            });
+        });
         $('#logout').click(function () {
             layer.confirm('退出后ATool将被关闭并重置Key',{icon: 3, title:'为了您的站点安全:'}, function(index){
                 $.post('./ATool.php?type=logout',function(re,status){

system/MySQL/20240720.php

@@ -0,0 +1,16 @@
+<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
+$sql ='
+CREATE INDEX category_idx_1
+ON user_categorys (fid, uid, status, property, pid, weight);
+
+CREATE INDEX link_idx_1
+ON user_links (uid, fid, status, property, pid, add_time, click);
+';
+//创建索引用于优化效率
+if(exe_sql($sql)){
+    insert_db('updatadb_logs',['file_name'=>$file_name,'update_time'=>time(),'status'=>'TRUE','extra'=>'']);
+}else{
+    msg(-1,'数据库更新失败');
+}
+
+

system/MySQL/install.sql

@@ -51,6 +51,7 @@ INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALU
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20230723.php', '1690119053', 'TRUE', '');
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20231218.php', '1702828800', 'TRUE', '');
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20240328.php', '1711296000', 'TRUE', '');
+INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20240720.php', '1721404800', 'TRUE', '');
 
 -- 创建用户表
 DROP TABLE IF EXISTS `global_user`;
@@ -102,7 +103,7 @@ CREATE TABLE IF NOT EXISTS `user_categorys` (
 
 INSERT INTO `user_categorys` (`id`, `cid`, `fid`, `uid`, `pid`, `status`, `property`, `name`, `add_time`, `up_time`, `weight`, `description`, `font_icon`, `icon`, `extend`) VALUES
 (1, 1, 0, 0, 0, 1, 0, '默认分类', 1672502400, 1672502400, 0, 'TwoNav默认分类', 'fa fa-book', '', '');
-
+CREATE INDEX category_idx_1 ON user_categorys (fid, uid, status, property, pid, weight);
 
 -- 用户链接表
 DROP TABLE IF EXISTS `user_links`;
@@ -133,7 +134,7 @@ INSERT INTO `user_links` (`id`, `lid`, `uid`, `fid`, `pid`, `status`, `property`
 (1, 1, 0, 1, 0, 1, 0, 'TwoNav 源码', 'https://gitee.com/tznb/TwoNav', '', 0, '项目开源地址', '', 0, 1672502400, 1672502400, ''),
 (2, 2, 0, 1, 0, 1, 0, '使用说明', 'https://gitee.com/tznb/TwoNav/wikis', '', 0, '使用说明', '', 0, 1672502400, 1672502400, '');
 
-
+CREATE INDEX link_idx_1 ON user_links (uid, fid, status, property, pid, add_time, click);
 
 -- 登录信息表
 DROP TABLE IF EXISTS `user_login_info`;

system/SQLite/20240720.php

@@ -0,0 +1,16 @@
+<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
+$sql ='
+CREATE INDEX "category_idx_1"
+ON "user_categorys" ("fid","uid","status","property","pid","weight");
+
+CREATE INDEX "link_idx_1"
+ON "user_links" ("uid","fid","status","property","pid","add_time","click");
+';
+//创建索引用于优化效率
+if(exe_sql($sql)){
+    insert_db('updatadb_logs',['file_name'=>$file_name,'update_time'=>time(),'status'=>'TRUE','extra'=>'']);
+}else{
+    msg(-1,'数据库更新失败');
+}
+
+

system/SQLite/install.sql

@@ -43,6 +43,7 @@ INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALU
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20230723.php', '1690119053', 'TRUE', '');
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20231218.php', '1702828800', 'TRUE', '');
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20240328.php', '1711296000', 'TRUE', '');
+INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20240720.php', '1721404800', 'TRUE', '');
 
 -- 创建用户表
 CREATE TABLE IF NOT EXISTS "global_user" (
@@ -88,6 +89,7 @@ CREATE TABLE IF NOT EXISTS "user_categorys" (
 );
 
 INSERT INTO "user_categorys"("id", "cid", "fid", "uid", "pid", "status", "property", "name", "add_time", "up_time", "weight", "description", "font_icon", "icon", "extend") VALUES (1, 1, 0, 0, 0, 1, 0, '默认分类', 1672502400, 1672502400, 0, 'TwoNav默认分类', 'fa fa-book', '', '');
+CREATE INDEX "category_idx_1" ON "user_categorys" ("fid","uid","status","property","pid","weight");
 
 -- 用户链接表
 CREATE TABLE IF NOT EXISTS "user_links" (
@@ -112,7 +114,8 @@ CREATE TABLE IF NOT EXISTS "user_links" (
 );
 INSERT INTO "user_links"("id", "lid", "uid", "fid", "pid", "status", "property", "title", "url", "url_standby", "weight", "description", "icon", "click", "add_time", "up_time", "extend") VALUES (1, 1, 0, 1, 0, 1, 0, 'TwoNav 源码', 'https://gitee.com/tznb/TwoNav', '', 0, '项目开源地址', '', 0, 1672502400, 1672502400, '');
 INSERT INTO "user_links"("id", "lid", "uid", "fid", "pid", "status", "property", "title", "url", "url_standby", "weight", "description", "icon", "click", "add_time", "up_time", "extend") VALUES (2, 2, 0, 1, 0, 1, 0, '使用说明', 'https://gitee.com/tznb/TwoNav/wikis', '', 0, '使用说明', '', 0, 1672502400, 1672502400, '');
- 
+CREATE INDEX "link_idx_1" ON "user_links" ("uid","fid","status","property","pid","add_time","click");
+
 -- 登录信息表
 CREATE TABLE IF NOT EXISTS "user_login_info" (
   "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,

system/api_root.php

@@ -453,7 +453,7 @@ function other_services(){
         'method'   => $_GET['type'],
         'sys'      => $_POST['sys']
     ];
-    $overtime = !isset($global_config['Update_Overtime']) ? 3 : ($global_config['Update_Overtime'] < 3 || $global_config['Update_Overtime'] > 60 ? 3 : $global_config['Update_Overtime']);
+    $overtime = 30;
     // 判断操作类型
     if($_GET['type'] == 'query_key' || $_GET['type'] == 'save_key'){
         $Res = ccurl("http://service.twonav.cn/service.php",$overtime,true,$post);

system/firewall.php

@@ -21,7 +21,7 @@ foreach($_POST as $key =>$value){
         }
     }
     //拦截SQL注入
-    if($global_config['SQL_WAF'] == 1 ){
+    if(!isset($code) && $global_config['SQL_WAF'] == 1 ){
         if(preg_match("/\s+(or|xor|and)\s+(=|<|>|'|".'")/i',$value)){
             $code = 2101;
         }elseif(preg_match("/select.+(from|limit)/i",$value)){
@@ -43,5 +43,10 @@ foreach($_POST as $key =>$value){
         }
     }
     
-    if(!empty($code)){msgA(['code'=>$code,'msg'=>$code.':已拦截不合法参数！','key'=>$key,'Value'=>$value,'method'=>$method ]);}
+    if(!empty($code)){
+        $tips = $code <= 2100 ? 
+            '<br />如果您是站长,请前往系统设置关闭防XSS脚本<br />如果您是用户,请联系站长处理': 
+            '<br />如果您是站长,请前往系统设置关闭防SQL注入<br />如果您是用户,请联系站长处理';
+        msgA(['code'=>$code,'msg'=>$code.':已拦截不合法参数！'.$tips,'key'=>$key,'Value'=>$value,'method'=>$method ]);
+    }
 }

system/install.php

@@ -388,6 +388,9 @@ function Write_Config(){
 <div class="login-logo"><h1>TwoNav 安装引导</h1></div>
 <div class="layui-col-lg6 layui-col-md-offset3" style ="margin-top:4em;">
 <form class="layui-form layui-form-pane" action="">
+     <div class="layui-form-mid layui-word-aux" style="width: 99%;">
+     <span>禁止用于违法用途、使用者造成的一切法律后果由使用者自行承担、安装视为同意。</span>
+ </div>
   <div class="layui-form-item">
     <label class="layui-form-label">管理员账号</i></label>
     <div class="layui-input-block">
@@ -411,7 +414,7 @@ function Write_Config(){
     <label class="layui-form-label">数据库类型</label>
     <div class="layui-input-block">
       <select id="db_type" name="db_type" lay-filter="db_type" >
-        <option value="sqlite" selected="">SQLite ( 推荐 )</option>
+        <option value="sqlite" selected="">SQLite</option>
         <option value="mysql" >MySQL ≥ 5.6.0 </option>
         <option value="mariadb" >MariaDB ≥ 10.1 </option>
       </select>

system/templates.php

@@ -121,7 +121,11 @@ if($config_type == 'user'){
     if(!check_purview('header',1)){$site['custom_header'] = '';}
     if(!check_purview('footer',1)){$site['custom_footer'] = '';}
     
-    //主页标题( 主标题 - 副标题 )
+    //主页标题(分类页面显示分类名-描述)
+    if(isset($_GET['cid']) && intval($_GET['cid']) > 0){
+        $teml_cd = get_db('user_categorys',['name','description'],['uid'=>UID,'cid'=>intval($_GET['cid'])]);
+        $site['title'] = $teml_cd['name']; $site['subtitle'] = $teml_cd['description']; 
+    }
     $site['Title']  =  $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
     
     //站点图标
@@ -167,22 +171,14 @@ function geticourl($icon,$link){
     }
     if ($site['link_icon'] == 'default'){
         return($GLOBALS['libs'].'/Other/default.ico');
-    }elseif ($icon ==20){
+    }elseif ($icon == 20){
         return('./index.php?c=icon&url='.base64_encode($link['real_url']));
-    }elseif ($icon ==21){
+    }elseif ($icon == 21){
         return('./ico/'.base64_encode($link['real_url']));
-    }elseif($icon ==2){ 
+    }elseif($icon == 2){ 
         return('https://favicon.png.pub/v1/'.base64_encode(get_url_host($link['real_url'],true,true)));
-    }elseif($icon ==4){
-        return('https://api.15777.cn/get.php?url='.$link['real_url']);
-    }elseif($icon ==5){
-        return('https://favicon.cccyun.cc/'.$link['real_url']);
-    }elseif($icon ==6){
-        return('https://api.iowen.cn/favicon/'.parse_url($link['real_url'])['host'].'.png');
-    }elseif($icon ==7){
-        return('https://toolb.cn/favicon/'.parse_url($link['real_url'])['host']);
-    }elseif($icon ==8){
-        return('https://apis.jxcxin.cn/api/Favicon?url='.$link['real_url']);
+    }elseif($icon == 6){
+        return('https://t3.gstatic.cn/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&size=128&url='.$link['real_url']);
     }else{
         return('./system/ico.php?text='.mb_strtoupper(mb_substr($link['title'], 0, 1)));
     }

system/version.txt

@@ -1 +1 @@
-v2.1.16-20240525
+v2.1.18-20241105

templates/admin/page/SiteSetting.php

@@ -72,11 +72,11 @@
                         <option value="0" selected>离线图标(首字图标)</option>
                         <option value="20" >本地服务</option>
                         <option value="21" >本地服务(伪静态)</option>
-                        <option value="2" >favicon.png.pub (小图标)</option>
-                        <option value="6" >api.iowen.cn</option>
+                        <option value="2" >第三方:favicon.png.pub (小图标)</option>
+                        <option value="6" >第三方:gstatic.cn (大图标)</option>
                     </select>
                 </div>
-                <div class="layui-form-mid layui-word-aux">所有API接口均由其他大佬提供!若有异常请尝试更换接口!</div>
+                <div class="layui-form-mid layui-word-aux">三方接口由其他站长提供!若有异常请尝试更换接口!建议使用本地服务!</div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">重复链接</label>

templates/admin/page/root/vip.php

@@ -15,7 +15,7 @@ if(!empty($Notice)){
         <h4 style = "margin-bottom:1em;"><font color="red">不要使用盗版/破解版,盗版无法升级却存在诸多问题,所造成的损失与本程序无关</font></h4>
         <blockquote class="layui-elem-quote layui-text" style="color:red" >
             <li> 如何激活授权: </li>
-            <li>1. 购买授权后将授权号(卡密)和邮箱填入下方并点击保存</li>
+            <li>1. 购买授权后将授权卡密和邮箱填入下方并点击保存</li>
             <li>2. 返回概要页面 > 刷新 > 更新系统 ( 不更新还是免费版 )</li>
             <li>3. 更新成功后就是授权版的系统了,可使用全部功能</li>
             <li>4. 禁止传播/破解授权版源代码,违者封授权并追责</li>
@@ -66,21 +66,11 @@ if(!empty($Notice)){
                 <input type="text" name="type_name" id ="type_name" value="<?php echo $subscribe['type_name'] ?? ''; ?>" autocomplete="off" placeholder="若未正确显示请点击保存设置" class="layui-input">
             </div>
         </div>
-<?php if(get_db('global_config','v',["k" => "sys_switch"]) == 'show' && $subscribe['type'] == '3'){ ?>
-        <div class="layui-form-item">
-            <label class="layui-form-label">版本切换</label>
-            <div class="layui-input-inline" >
-                <select name="sys" id="sys">
-                    <option value="biaozhun" selected>标准版</option>
-                    <option value="gaoji" >高级版</option>
-                </select>
-            </div>
-            <div class="layui-form-mid layui-word-aux">希望使用的系统版本 ( 下次更新时 )</div>
-        </div>
-<?php } ?>
+
         <div class="layui-btn-group">
             <button class="layui-btn layui-btn-normal" lay-submit lay-filter="save_key">保存</button>
             <button class="layui-btn layui-btn-danger" lay-submit lay-filter="buy_vip" data-url="<?php echo empty($data['pay_rul']) ?'':$data['pay_rul']?>" >购买授权</button>
+            <button class="layui-btn layui-btn-danger" lay-submit lay-filter="Modify_Domain" data-url="https://docs.twonav.cn/#/books/root-02?id=%e4%bf%ae%e6%94%b9%e5%9f%9f%e5%90%8d" >修改域名</button>
             <button class="layui-btn layui-bg-purple" type="button" id="validate" style="<?php echo empty($subscribe['order_id']) ? 'display:none;':''; ?>">正版验证</button>
         </div>
 
@@ -153,7 +143,12 @@ layui.use(['jquery','form'], function () {
             layer.msg('请求失败', {icon: 5});
         });
     });
-    
+    //修改域名
+    form.on('submit(Modify_Domain)', function(data){
+        let url = $(this).attr('data-url');
+        window.open($(this).attr('data-url'));
+        return false;
+    });
     //购买授权
     form.on('submit(buy_vip)', function(data){
         let url = $(this).attr('data-url');

templates/admin/page/updatelog.php

@@ -2,6 +2,35 @@
 <body>
 <div class="layuimini-container">
  <div class="layuimini-main" style=" margin-left: 20px;">
+    <li class="layui-timeline-item">
+        <i class="layui-icon layui-timeline-axis"></i>
+        <div class="layui-timeline-content layui-text">
+            <h4 class="layui-timeline-title">v2.1.18-20241105</h4>
+            <ul>
+                <li>[升级] Layui组件由2.9.14升级到2.9.18</li>
+                <li>[升级] Medoo组件由2.1.8升级到2.1.12</li>
+                <li>[新增] 授权管理页面增加修改域名入口</li>
+                <li>[变更] 分类页面标题显示分类名称-分类描述</li>
+                <li>[修复] 默认登录模板输入密码处点击小眼睛未显示密码</li>
+                <li>[优化] 调高超时参数以兼顾网络较慢的环境</li>
+                <li>[优化] 默认登录模板检测到使用IE浏览器时弹出提示</li>
+                <li>[优化] 内置防火墙拦截时提示如何解决</li>
+                <li>[修复] 替换已失效的第三方图标接口</li>
+            </ul>
+        </div>
+    </li>
+    <li class="layui-timeline-item">
+        <i class="layui-icon layui-timeline-axis"></i>
+        <div class="layui-timeline-content layui-text">
+            <h4 class="layui-timeline-title">v2.1.17-20240730</h4>
+            <ul>
+                <li>[升级] Layui组件由2.9.10升级到v2.9.13</li>
+                <li>[增加] Atool工具箱增加查看二级密码功能</li>
+                <li>[增加] Atool工具箱增加清空统计数据 ( 指全部账号概要页面的报表统计/访问统计/点击统计 )</li>
+                <li>[优化] 性能优化 ( 存在数据库更新,建议先备份在升级 )</li>
+            </ul>
+        </div>
+    </li>
     <li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis"></i>
         <div class="layui-timeline-content layui-text">

templates/login/default/index.php

@@ -13,10 +13,6 @@
     <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
     <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css?v=<?php echo SysVer; ?>">
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
-    <!--[if lt IE 9]>
-    <script src="<?php echo $libs?>/Other/html5.min.js"></script>
-    <script src="<?php echo $libs?>/Other/respond.min.js"></script>
-    <![endif]-->
 </head>
 <body>
 <div class="main-body">
@@ -59,6 +55,11 @@
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
 <script src = "<?php echo $layui['js']; ?>"></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
+<script>
+    if (/Trident/.test(navigator.userAgent) || /MSIE/.test(navigator.userAgent)) {
+        alert("当前浏览器版本过低，请使用Chrome浏览器或火狐浏览器等现代浏览器");
+    }
+</script>
 <script>
     layui.use(['form','jquery'], function () {
         var $ = layui.jquery,
@@ -68,10 +69,10 @@
         $('.bind-password').on('click', function () {
             if ($(this).hasClass('icon-5')) {
                 $(this).removeClass('icon-5');
-                $("input[name='Password']").attr('type', 'password');
+                $("input[name='password']").attr('type', 'password');
             } else {
                 $(this).addClass('icon-5');
-                $("input[name='Password']").attr('type', 'text');
+                $("input[name='password']").attr('type', 'text');
             }
         });
 

templates/login/default/info.json

@@ -2,7 +2,7 @@
 	"name":	"默认模板",
 	"description":	"默认",
 	"homepage":	"https://gitee.com/tznb/TwoNav",
-	"version":	"2.1.1",
-	"update":	"2023/12/20",
+	"version":	"2.1.2",
+	"update":	"2024/10/18",
 	"author":	"TwoNav"
 }