v2.1.17-20240730

2025-08-10 08:51:49 +00:00 · 2024-07-30 17:28:39 +08:00
parent d104bf66ce
commit b9eaa4099d
18 changed files with 157 additions and 53 deletions
--- a/index.php
+++ b/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.13/layui.js';
+$layui['css'] = $libs.'/Layui/v2.9.13/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());
--- a/static/Layui/v2.9.10/css/layui.css
+++ b/static/Layui/v2.9.10/css/layui.css
--- a/static/Layui/v2.9.10/layui.js
+++ b/static/Layui/v2.9.10/layui.js
--- a/static/Layui/v2.9.13/css/layui.css
+++ b/static/Layui/v2.9.13/css/layui.css
--- a/static/Layui/v2.9.13/font/iconfont.eot
+++ b/static/Layui/v2.9.13/font/iconfont.eot
--- a/static/Layui/v2.9.13/font/iconfont.svg
+++ b/static/Layui/v2.9.13/font/iconfont.svg
--- a/static/Layui/v2.9.13/font/iconfont.ttf
+++ b/static/Layui/v2.9.13/font/iconfont.ttf
--- a/static/Layui/v2.9.13/font/iconfont.woff
+++ b/static/Layui/v2.9.13/font/iconfont.woff
--- a/static/Layui/v2.9.13/font/iconfont.woff2
+++ b/static/Layui/v2.9.13/font/iconfont.woff2
--- a/static/Layui/v2.9.13/layui.js
+++ b/static/Layui/v2.9.13/layui.js
--- a/system/ATool.php
+++ b/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){
--- a/system/MySQL/20240720.php
+++ b/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,'数据库更新失败');
+}
+
+
--- a/system/MySQL/install.sql
+++ b/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`;
--- a/system/SQLite/20240720.php
+++ b/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,'数据库更新失败');
+}
+
+
--- a/system/SQLite/install.sql
+++ b/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,
--- a/system/install.php
+++ b/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>
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.1.16-20240525
+v2.1.17-20240730
--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -2,6 +2,18 @@
 <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.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">