renun/TwoNav
1
0
Fork 0
mirror of https://github.com/tznb1/TwoNav.git synced 2025-08-10 08:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

v2.1.04-20231029

Browse Source
This commit is contained in:
MI15\Win
2023-10-30 01:40:27 +08:00
parent 68464e34f9
commit 3ece39150c
6 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
index.php
View File

@@ -48,15 +48,6 @@ if(!in_array($c,[$global_config["Register"],'ico','icon'])){
$_GET['u'] = $global_config['static_link'] == 2 ? get_db("global_user", "User", ["ID"=>$UUID]) : $UUID;
}
$u = Get('u');
if(empty($u) && $global_config['Sub_domain'] == 1 && is_subscribe('bool')){
$cut = explode('.',$_SERVER["HTTP_HOST"]);
if(count($cut) == 3){
$USER_DB = get_db("global_user", "*", ["User"=>reset($cut)]);
if(!empty($USER_DB) && check_purview('Sub_domain',1)){
$_COOKIE['Default_User'] = $USER_DB['User'];unset($cut);
}
}
}
$u = !empty($u)?$u:(!empty($_COOKIE['Default_User'])?$_COOKIE['Default_User']:(!empty($global_config['Default_User'])?$global_config['Default_User']:'admin'));//优先级:Get>Host>Cookie>默认用户>admin
$USER_DB = get_db("global_user", "*", ["User"=>$u]);
//没找到账号显示404

6
system/api_root.php
View File

@@ -456,7 +456,8 @@ function other_services(){
'order_id' => isset($_POST['order_id']) ? $_POST['order_id'] : "",
'sysver' => SysVer,
'ip' => Get_IP(),
'method' => $_GET['type']
'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']);
// 判断操作类型
@@ -514,7 +515,7 @@ function other_services(){
//如果不为空,则解析数据
if(!empty($Notice)){
$data = json_decode($Notice, true);
$cache_time = 60; //缓存时间(秒);
$cache_time = Debug ? 0 : 60; //缓存时间(秒);
$reload = time() > $data["download_time"] + $cache_time; //是否更新
}else{
$reload = true; //需要刷新
@@ -531,6 +532,7 @@ function other_services(){
$new_data['download_time'] = time();
$new_data['version'] = version_compare($new_data['version'],SysVer,'<') ? SysVer : $new_data['version'];
write_global_config('notice',json_encode($new_data),'官方公告(缓存)');
write_global_config('sys_switch',"{$new_data['sys_switch']}",'sys_switch');
$data = $new_data;
}
}

2
system/version.txt
View File

@@ -1 +1 @@
v2.1.03-20231019
v2.1.04-20231029

3
templates/admin/js/category.js
View File

@@ -73,6 +73,7 @@
//分类切换按钮
$("#btn-type").text(type == '&type=all' ?'收起':'展开');
//将一级分类加入下拉框
let old_val = $("#fid").val();
$("#fid").empty();
$("#fid").append("<option value=\"0\">无</option>");
for (i = 0; i < count; i++) {
@@ -80,6 +81,8 @@
$("#fid").append("<option value=\""+res.data[i].cid+"\">"+res.data[i].name+"</option>");
}
}
$("#fid").val(old_val);
form.render('select');
limit = false; //取消修改限制
layer.closeAll('loading'); //关闭加载层
//加载加密分组数据

18
templates/admin/page/root/vip.php
View File

@@ -56,7 +56,18 @@ 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>
@@ -100,7 +111,8 @@ layui.use(['jquery','form'], function () {
var layer = layui.layer;
var $ = layui.jquery;
var vcode;
$("#sys").val('<?php echo empty($subscribe['sys']) ? 'biaozhun':$subscribe['sys']; ?>');
form.render('select');
//保存订阅
form.on('submit(save_key)', function(data){
var order_id = data.field.order_id;
@@ -113,7 +125,7 @@ layui.use(['jquery','form'], function () {
return false;
}
layer.load(2, {shade: [0.1,'#fff']});
$.post(get_api('other_services','save_key'),{'order_id':data.field.order_id,'email':data.field.email},function(data,status){
$.post(get_api('other_services','save_key'),{'order_id':data.field.order_id,'email':data.field.email,'sys':data.field.sys},function(data,status){
layer.closeAll('loading');
if(data.code == 200) {
$("#order_id").val(data.data.order_id);

13
templates/admin/page/updatelog.php
View File

@@ -5,7 +5,18 @@
<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.03-20231019</h4>
<h4 class="layui-timeline-title">v2.1.04-20231029</h4>
<ul>
<li>[修复] 连续添加分类时未正确添加到所选的父分类中</li>
<li>[修复] 使用MySQL/MariaDB数据库时文章图片可能不显示的bug</li>
<li>[优化] 二级域名功能支持已知的双后缀顶级域名(例如example.com.cn)</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.03-20231020</h4>
<ul>
<li>[修复] 站点地图时间格式问题</li>
<li>[修复] 后台我的主页地址错误</li>