v2.1.14-20240414

2025-08-10 08:51:49 +00:00 · 2024-04-14 15:42:25 +08:00
parent fe1244b099
commit 1aa4bb0634
26 changed files with 106 additions and 262 deletions
--- a/system/ATool.php
+++ b/system/ATool.php
@@ -228,7 +228,7 @@ function echo_Atool(){
 <head>
    <meta charset="UTF-8">
    <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.9.7/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.9.8/css/layui.css">
    <style>
        html, body {min-width: 1200px;background-color: #fff;position: relative;}
        .page-wrapper {width: 1200px;margin: 0 auto;padding: 0 15px;}
@@ -280,7 +280,7 @@ function echo_Atool(){
        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="del_otp" title="移除OTP登录验证">删OTP</a>
    </div>
 </script>
-<script src="../static/Layui/v2.9.7/layui.js"></script>
+<script src="../static/Layui/v2.9.8/layui.js"></script>
 <script src="../static/jquery/jquery-3.6.0.min.js"></script>
 <script src="../static/jquery/jquery.md5.js"></script>
 <script src="../templates/admin/js/public.js?v=<?php echo time();?>"></script>
@@ -417,7 +417,7 @@ function echo_verify(){ ?>
 <head>
    <meta charset="UTF-8">
    <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.9.7/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.9.8/css/layui.css">
    <link rel="stylesheet" href="../static/Other/login.css">
 </head>
 <body>
@@ -442,7 +442,7 @@ function echo_verify(){ ?>
    </div>
 </div>
 <script src = "../static/jquery/jquery-3.6.0.min.js"></script>
-<script src = "../static/Layui/v2.9.7/layui.js"></script>
+<script src = "../static/Layui/v2.9.8/layui.js"></script>
 <script src = '../static/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/system/MySQL/20230917.php
+++ b/system/MySQL/20230917.php
@@ -1,18 +0,0 @@
-<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
-// 检测是否已授权
-if(is_subscribe('bool')){
-    //读取授权信息,判断是否存在秘钥
-    $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
-    if(!isset($subscribe['public']) || empty($subscribe['public'])){
-        //尝试从服务器下载秘钥
-        $Res = ccurl("https://service.twonav.cn/api.php?fn=get_subscribe&order_id={$subscribe['order_id']}&email={$subscribe['email']}&domain={$subscribe['domain']}&mark=20230917",30,true);
-        $data = json_decode($Res["content"], true);
-        // 获取成功
-        if($data["code"] == 200){
-            $subscribe['public'] = $data['data']['public'];
-            $subscribe['type'] = $data['data']['type'];
-            $subscribe['type_name'] = $data['data']['type_name'];
-            write_global_config('s_subscribe',$subscribe,'订阅信息');
-        }
-    }
-}
--- a/system/MySQL/install.sql
+++ b/system/MySQL/install.sql
@@ -49,6 +49,8 @@ INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALU
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20230522.php', '1684762253', 'TRUE', '');
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20230715.php', '1689427853', 'TRUE', '');
 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', '');

 -- 创建用户表
 DROP TABLE IF EXISTS `global_user`;
@@ -90,6 +92,8 @@ CREATE TABLE IF NOT EXISTS `user_categorys` (
  `description` text NOT NULL DEFAULT '' COMMENT '描述',
  `font_icon` text NOT NULL COMMENT '字体图标',
  `icon` text NOT NULL DEFAULT '' COMMENT '个性图标',
+  `category_type` VARCHAR(255) NOT NULL DEFAULT 'link' COMMENT '分类类型',
+  `max` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '显示数量',
  `extend` text NOT NULL COMMENT '扩展',
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='用户分类';
@@ -300,3 +304,21 @@ CREATE TABLE IF NOT EXISTS `user_article_list` (
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;

+-- 第三方用户表
+CREATE TABLE IF NOT EXISTS `third_party_user` (
+  `id` int UNSIGNED NOT NULL AUTO_INCREMENT,  
+  `uid` int UNSIGNED NOT NULL COMMENT '用户id',  
+  `inlet` text NOT NULL COMMENT '入口',  
+  `provider` text NOT NULL COMMENT '提供商',  
+  `nickname` text NOT NULL COMMENT '昵称',  
+  `openid` text NOT NULL COMMENT '第三方用户标识',  
+  `access_token` text NOT NULL COMMENT '访问令牌',  
+  `refresh_token` text NOT NULL COMMENT '刷新令牌',  
+  `faceimg` text NOT NULL COMMENT '头像URL',  
+  `bind_time` int UNSIGNED NOT NULL DEFAULT 0 COMMENT '绑定时间',  
+  `login_time` int UNSIGNED NOT NULL DEFAULT 0 COMMENT '登录时间',  
+  `expires` int UNSIGNED NOT NULL DEFAULT 0 COMMENT '到期时间',  
+  `extend` text NOT NULL COMMENT '扩展',  
+  FOREIGN KEY (`uid`) REFERENCES `global_user` (`ID`) ON DELETE CASCADE,  
+  PRIMARY KEY (`id`)  
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
--- a/system/SQLite/20230917.php
+++ b/system/SQLite/20230917.php
@@ -1,18 +0,0 @@
-<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
-// 检测是否已授权
-if(is_subscribe('bool')){
-    //读取授权信息,判断是否存在秘钥
-    $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
-    if(!isset($subscribe['public']) || empty($subscribe['public'])){
-        //尝试从服务器下载秘钥
-        $Res = ccurl("https://service.twonav.cn/api.php?fn=get_subscribe&order_id={$subscribe['order_id']}&email={$subscribe['email']}&domain={$subscribe['domain']}&mark=20230917",30,true);
-        $data = json_decode($Res["content"], true);
-        // 获取成功
-        if($data["code"] == 200){
-            $subscribe['public'] = $data['data']['public'];
-            $subscribe['type'] = $data['data']['type'];
-            $subscribe['type_name'] = $data['data']['type_name'];
-            write_global_config('s_subscribe',$subscribe,'订阅信息');
-        }
-    }
-}
--- a/system/SQLite/install.sql
+++ b/system/SQLite/install.sql
@@ -41,7 +41,8 @@ INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALU
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20230522.php', '1684762253', 'TRUE', '');
 INSERT INTO "updatadb_logs" ("file_name", "update_time", "status", "extra") VALUES ('20230715.php', '1689427853', 'TRUE', '');
 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', '');

 -- 创建用户表
 CREATE TABLE IF NOT EXISTS "global_user" (
@@ -79,6 +80,8 @@ CREATE TABLE IF NOT EXISTS "user_categorys" (
  "description" TEXT(128) NOT NULL DEFAULT "",
  "font_icon" TEXT DEFAULT "",
  "icon" TEXT DEFAULT "",
+  "category_type" TEXT DEFAULT "link",
+  "max" text DEFAULT "",
  "extend" TEXT DEFAULT ""
 );

@@ -263,4 +266,22 @@ CREATE TABLE "user_article_list" (
  "cover" TEXT,
  "extend" TEXT,
  CONSTRAINT "id" UNIQUE ("id" ASC)
+);
+
+-- 第三方用户表
+CREATE TABLE "third_party_user" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "uid" INTEGER NOT NULL,
+  "inlet" TEXT NOT NULL DEFAULT "",
+  "provider" TEXT NOT NULL DEFAULT "",
+  "nickname" TEXT NOT NULL DEFAULT "",
+  "openid" TEXT NOT NULL DEFAULT "",
+  "access_token" TEXT NOT NULL DEFAULT "",
+  "refresh_token" TEXT NOT NULL DEFAULT "",
+  "faceimg" TEXT NOT NULL DEFAULT "",
+  "bind_time" integer NOT NULL DEFAULT 0,
+  "login_time" integer NOT NULL DEFAULT 0,
+  "expires" integer NOT NULL DEFAULT 0,
+  "extend" TEXT NOT NULL DEFAULT "",
+  CONSTRAINT "uid" FOREIGN KEY ("uid") REFERENCES "global_user" ("ID") ON DELETE CASCADE
 );
--- a/system/api.php
+++ b/system/api.php
@@ -288,6 +288,7 @@ function write_category(){
    msg(-1,'操作类型错误');
 }

+//读链接列表
 //读链接列表
 function read_link_list(){
    if($_GET['type'] == 'extend_list'){
@@ -307,7 +308,8 @@ function read_link_list(){
    $page   = empty(intval($_REQUEST['page'])) ? 1 : intval($_REQUEST['page']);
    $limit  = empty(intval($_REQUEST['limit'])) ? 50 : intval($_REQUEST['limit']);
    $offset = ($page - 1) * $limit; //起始行号
-    $where = ["uid"=> UID];
+    $where = ["uid"=> UID,'fid[<=]'=>10000000];
+    
    //分类筛选
    if(!empty($fid)){
        $where['AND']['fid'] = $fid;
@@ -317,6 +319,12 @@ function read_link_list(){
        //     array_push($category,$fid);
        //     $where['AND']['fid'] = $category;
        // }
+    }else{
+        //240405新增: 避免查找全部时将已停用分类下的链接显示出来
+        $category_where = ['uid'=>UID,'fid'=>0,'status'=>1];
+        $fid = select_db('user_categorys','cid', $category_where);
+        $category_where['fid'] = $fid;
+        $where['AND']['fid'] = array_merge ($fid,select_db('user_categorys','cid',$category_where));
    }
    //属性筛选
    if($_POST['property']==='0' || $_POST['property'] ==='1'){$where['AND']['property'] = ($_POST['property'] == 1?1:0);}
@@ -1431,7 +1439,7 @@ function read_data(){
            msg(1,'您已开启离线模式,无法使用该功能!');
        }
        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $_POST['url']);
+        curl_setopt($ch, CURLOPT_URL, 'https://gitee.com/tznb/TwoNav_Resource/raw/master/connectivity_test.txt');
        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
--- a/system/install.php
+++ b/system/install.php
@@ -4,8 +4,8 @@ if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Fou
 //初始化
 session_name('TwoNav_initial');
 session_start();
-$layui['js']  = './static/Layui/v2.9.7/layui.js';
-$layui['css'] = './static/Layui/v2.9.7/css/layui.css';
+$layui['js']  = './static/Layui/v2.9.8/layui.js';
+$layui['css'] = './static/Layui/v2.9.8/css/layui.css';

 //判断请求类型
 if($_SERVER['REQUEST_METHOD'] === 'POST'){
--- a/system/public.php
+++ b/system/public.php
@@ -521,6 +521,9 @@ function Get_IP() {

 //获取URL状态码
 function get_http_code($url,$TIMEOUT = 10 ,$NOBODY = true) { 
+    if(!preg_match("/^(http:\/\/|https:\/\/).*/",$url)){
+        return false; 
+    }
    $curl = curl_init(); 
    curl_setopt($curl, CURLOPT_URL, $url);
    curl_setopt($curl, CURLOPT_HEADER, 1);
@@ -535,6 +538,9 @@ function get_http_code($url,$TIMEOUT = 10 ,$NOBODY = true) {
 }

 function ccurl($url,$overtime = 3,$Referer = false,$post_data = false){
+    if(!preg_match("/^(http:\/\/|https:\/\/).*/",$url)){
+        return false; 
+    }
    try {
        $curl  =  curl_init ( $url ) ; //初始化
        curl_setopt($curl, CURLOPT_TIMEOUT, $overtime ); //超时
@@ -565,6 +571,9 @@ function ccurl($url,$overtime = 3,$Referer = false,$post_data = false){
 }

 function downFile($url, $file = '', $savePath = './data/temp/',$referer = '',$TIMEOUT = 60,$post_data = false){
+    if(!preg_match("/^(http:\/\/|https:\/\/).*/",$url)){
+        return false; 
+    }
    $ch = curl_init();
    curl_setopt($ch, CURLOPT_URL, $url);
    curl_setopt($ch, CURLOPT_TIMEOUT, $TIMEOUT); //超时/秒
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.1.13-20240321
+v2.1.14-20240414