v2.0.39-20230913

2025-08-10 08:51:49 +00:00 · 2023-09-13 13:41:29 +08:00
parent 98cf84b16c
commit cdeea3ff36
30 changed files with 144 additions and 71 deletions
--- a/index.php
+++ b/index.php
@@ -34,8 +34,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.8.10/layui.js';
-$layui['css'] = $libs.'/Layui/v2.8.10/css/layui.css';
+$layui['js']  = $libs.'/Layui/v2.8.17/layui.js';
+$layui['css'] = $libs.'/Layui/v2.8.17/css/layui.css';
 define('libs',$global_config['Libs']);
 define('SysVer',Get_Version());
 define('Debug',$global_config['Debug'] == 1);
--- a/static/Layui/v2.8.10/css/layui.css
+++ b/static/Layui/v2.8.10/css/layui.css
--- a/static/Layui/v2.8.10/layui.js
+++ b/static/Layui/v2.8.10/layui.js
--- a/static/Layui/v2.8.17/css/layui.css
+++ b/static/Layui/v2.8.17/css/layui.css
--- a/static/Layui/v2.8.17/font/iconfont.eot
+++ b/static/Layui/v2.8.17/font/iconfont.eot
--- a/static/Layui/v2.8.17/font/iconfont.svg
+++ b/static/Layui/v2.8.17/font/iconfont.svg
--- a/static/Layui/v2.8.17/font/iconfont.ttf
+++ b/static/Layui/v2.8.17/font/iconfont.ttf
--- a/static/Layui/v2.8.17/font/iconfont.woff
+++ b/static/Layui/v2.8.17/font/iconfont.woff
--- a/static/Layui/v2.8.17/font/iconfont.woff2
+++ b/static/Layui/v2.8.17/font/iconfont.woff2
--- a/static/Layui/v2.8.17/layui.js
+++ b/static/Layui/v2.8.17/layui.js
--- a/system/ATool.php
+++ b/system/ATool.php
@@ -226,7 +226,7 @@ function echo_Atool(){
 <head>
    <meta charset="UTF-8">
    <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.8.10/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.8.17/css/layui.css">
    <style>
        html, body {min-width: 1200px;background-color: #fff;position: relative;}
        .page-wrapper {width: 1200px;margin: 0 auto;padding: 0 15px;}
@@ -278,7 +278,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.8.10/layui.js"></script>
+<script src="../static/Layui/v2.8.17/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>
@@ -415,7 +415,7 @@ function echo_verify(){ ?>
 <head>
    <meta charset="UTF-8">
    <title>ATool 工具箱</title>
-    <link rel="stylesheet" href="../static/Layui/v2.8.10/css/layui.css">
+    <link rel="stylesheet" href="../static/Layui/v2.8.17/css/layui.css">
    <link rel="stylesheet" href="../static/Other/login.css">
 </head>
 <body>
@@ -440,7 +440,7 @@ function echo_verify(){ ?>
    </div>
 </div>
 <script src = "../static/jquery/jquery-3.6.0.min.js"></script>
-<script src = "../static/Layui/v2.8.10/layui.js"></script>
+<script src = "../static/Layui/v2.8.17/layui.js"></script>
 <script src = '../static/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/system/admin.php
+++ b/system/admin.php
@@ -68,7 +68,12 @@ if($page == 'config_home'){
    if(!in_array($_GET['fn'],['home','login','register','transit','guide','article','verify','guestbook','apply'])){
        msg(-1,"参数错误");
    }
-    $theme_config_db = get_db('user_config','v',['t'=>'theme_'.$_GET['fn'],'k'=>$theme,'uid'=>UID]);
+    if(in_array($_GET['fn'],['guide','register'])){
+        $theme_config_db = get_db('user_config','v',['k'=>'theme_'.$theme,'uid'=>UID]);
+    }else{
+        $theme_config_db = get_db('user_config','v',['t'=>'theme_'.$_GET['fn'],'k'=>$theme,'uid'=>UID]);
+    }
+    
    $theme_config_db = unserialize($theme_config_db);
    
    //如果不为空则合并数据
--- a/system/api.php
+++ b/system/api.php
@@ -1641,7 +1641,11 @@ function write_theme(){
            msg(-1,"参数错误");
        }
        //0420 END
-        write_user_config($_GET['t'],$_POST,'theme_' . $fn,'主题配置');
+        if(in_array($fn,['guide','register'])){
+            write_global_config("theme_{$fn}_{$_GET['t']}",$_POST,'主题配置');
+        }else{
+            write_user_config($_GET['t'],$_POST,'theme_' . $fn,'主题配置');
+        }
        msg(1,"保存成功！");
    }
 }
--- a/system/api_root.php
+++ b/system/api_root.php
@@ -520,9 +520,9 @@ function write_sys_settings(){
    if($_POST['Login'] == $_POST['Register']){
        msg(-1,'注册入口名不能和登录入口名相同');
    }elseif(!preg_match("/^[a-zA-Z0-9]+$/",$_POST['Register'])){ 
-         msg(-1,'注册入口错误,仅允许使用字母和数字');
+        msg(-1,'注册入口错误,仅允许使用字母和数字');
    }elseif(!preg_match("/^[a-zA-Z0-9]+$/",$_POST['Login'])){ 
-         msg(-1,'登陆入口错误,仅允许使用字母和数字');
+        msg(-1,'登陆入口错误,仅允许使用字母和数字');
    }elseif(empty($_POST['Default_User']) || !get_db("global_user", "User", [ "User"=>$_POST['Default_User'] ]) ){
        msg(-1,'默认账号不存在');
    }elseif(!empty($_POST['default_UserGroup']) && empty(get_db('user_group','code',['code' => $_POST['default_UserGroup']]))){
@@ -539,6 +539,14 @@ function write_sys_settings(){
        }
    }
    
+    //自定义登录入口和注册入口检测
+    $prohibits = ['admin','click','api','ico','icon','verify','apply','guestbook','article','sitemap'];
+    if(in_array($_POST['Login'],$prohibits)){
+        msg(-1,'此登录入口名已被系统使用');
+    }
+    if(in_array($_POST['Register'],$prohibits)){
+        msg(-1,'此注册入口名已被系统使用');
+    }
    //长度限制
    foreach (['c_name','c_desc','l_name','l_url','l_key','l_desc'] as $name){
        $length_limit[$name] = is_subscribe('bool') ? intval($_POST[$name]) : 0;
@@ -567,6 +575,7 @@ function write_sys_settings(){
        'global_footer'=>['empty'=>true],
        'api_extend'=>['empty'=>true],
        'c_code'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'自定义代码参数错误'],
+        'static_link'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'静态链接参数错误'],
        //更新设置
        'Update_Source'=>['empty'=>true],
        'Update_Overtime'=>['int'=>true,'min'=>3,'max'=>60,'msg'=>'资源超时参数错误'],
@@ -596,6 +605,7 @@ function write_sys_settings(){
        if($_POST['guestbook'] == 1){$o_config['guestbook'] = 0;$filter = true;}
        if($_POST['link_extend'] == 1){$o_config['link_extend'] = 0;$filter = true;}
        if($_POST['article'] == 1){$o_config['article'] = 0;$filter = true;}
+        if($_POST['static_link'] == 1){$o_config['static_link'] = 0;$filter = true;}
    }
    //检测于下载文章管理依赖资源
    clearstatcache();
--- a/system/expand/sitemap_create.php
+++ b/system/expand/sitemap_create.php
@@ -37,7 +37,7 @@ function create_sitemap($sitemap_config,$sitemap_path,$u){
    $today = date("Y-m-d\TH:i:s", time());
    //域名
    $host = $_SERVER['HTTP_HOST']; // 获取主机名
-    $port = isset($_SERVER['SERVER_PORT']) ? ($_SERVER['SERVER_PORT'] == 80 ? '' : ':'.$_SERVER['SERVER_PORT']) : ''; // 获取端口号
+    $port = isset($_SERVER['SERVER_PORT']) ? ($_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443 ? '' : ':'.$_SERVER['SERVER_PORT']) : ''; // 获取端口号
    $scheme = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://'; // 获取协议
    $host = $scheme.$host.$port;
    //用户主页 0.关闭 1.动态地址 2.静态地址 3.二级域名
@@ -106,6 +106,20 @@ function create_sitemap($sitemap_config,$sitemap_path,$u){
            }
        }
    }
+    
+    //文章页面
+    if($sitemap_config['article_page'] > 0){
+        $article_list = select_db('user_article_list',['id','up_time'],['state'=>1,'uid'=>UID]);
+        foreach ($article_list as $data) {
+            if($sitemap_config['article_page'] == '2'){
+                $locurl = "{$host}/{$u}/article/{$data['id']}.html";
+            }else{
+                $locurl = "{$host}/index.php?c=article&id={$data['id']}&u={$u}";
+            }
+            $url = createUrlElement($xml, $locurl, date("Y-m-d\TH:i:s", $data['up_time']), $sitemap_config['article_page_changefreq'], $sitemap_config['article_page_weight']);
+            $urlset->appendChild($url);
+        }
+    }

    //保存 XML 内容到文件
    $xml->save($sitemap_path);
--- a/system/index.php
+++ b/system/index.php
@@ -174,7 +174,12 @@ function get_links($fid) {
        }
        
        if($click || $site['link_model'] != 'direct'){
-            $links[$key]['url'] = "./index.php?c=click&id={$link['id']}&u=".U;
+            if($GLOBALS['global_config']['static_link'] == 1){
+                $links[$key]['url'] = "/{$u}/click/{$link['id']}.html";
+            }else{
+                $links[$key]['url'] = "./index.php?c=click&id={$link['id']}&u=".U;
+            }
+            
            if($lock){
                $links[$key]['real_url'] = $links[$key]['url']; //篡改真实URL,防止泄密
                if(isset($share['sid'])){
@@ -202,7 +207,11 @@ function get_links($fid) {
    if( intval($site['article_visual'] ?? '1') > 0 && $GLOBALS['theme_info']['support']['article'] != 'notdisplay'){
        $articles = get_article_list($fid);
        foreach ($articles['data'] as $article) {
-            $url = "./index.php?c=article&id={$article['id']}&u={$u}";
+            if($GLOBALS['global_config']['static_link'] == 1){
+                $url = "/{$u}/article/{$article['id']}.html";
+            }else{
+                $url = "./index.php?c=article&id={$article['id']}&u={$u}";
+            }
            if($site['article_icon'] == '1'){ //站点图标
                $icon = $GLOBALS['favicon'];
            }elseif($site['article_icon'] == '2' && !empty($article['cover'])){ //封面
--- 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.8.10/layui.js';
-$layui['css'] = './static/Layui/v2.8.10/css/layui.css';
+$layui['js']  = './static/Layui/v2.8.17/layui.js';
+$layui['css'] = './static/Layui/v2.8.17/css/layui.css';

 //判断请求类型
 if($_SERVER['REQUEST_METHOD'] === 'POST'){
--- a/system/templates.php
+++ b/system/templates.php
@@ -3,7 +3,7 @@
 //读取全局模板配置
 $global_templates = unserialize(get_db("global_config",'v', ["k" => "s_templates"]));

-if(defined('UID')){
+if(defined('UID') && $c != 'guide'){
    //读取用户模板配置
    $s_templates = unserialize(get_db("user_config", "v", ["uid"=>UID,"k"=>"s_templates"]));
    //没找到用户模板配置
@@ -65,11 +65,12 @@ if($c == 'index'){
 }elseif($c == 'guide'){ //引导页,由主页修改$c
    $theme = $global_templates['guide'];
    $dir_path = DIR.'/templates/guide';
+    $s_site = unserialize( get_db("global_config", "v", ["k" => "s_site"]));//读入默认站点配置
 }

 //模板类型(用于读取配置)
 $templates_type = substr($dir_path, strrpos($dir_path, "/") + 1) ;
-
+$config_type = in_array($templates_type,['guide','register']) ? 'global' : 'user';
 //无权限或不存在使用默认
 if( !check_purview('theme_in',1) || !is_file("{$dir_path}/{$theme}/index.php")){
    $theme = 'default';
@@ -87,23 +88,20 @@ $theme_info = json_decode(@file_get_contents($dir_path.'/info.json'),true);
 //主题配置(默认)
 $theme_config = empty($theme_info['config']) ? []:$theme_info['config'];

-
-if(defined('UID')){
-    //主题配置(用户)
+//读取主题配置
+if(defined('UID') && !in_array($templates_type,['guide','register'])){
    $theme_config_db = get_db('user_config','v',['t'=>"theme_{$templates_type}",'k'=>$theme,'uid'=>UID]);
-    $theme_config_db = unserialize($theme_config_db);
 }else{
-    //主题配置(用户)
-    $theme_config_db = get_db('global_config','v',['t'=>"theme_{$templates_type}",'k'=>$theme]);
-    $theme_config_db = unserialize($theme_config_db);
+    $theme_config_db = get_db('global_config','v',['k'=>"theme_{$templates_type}_{$theme}"]);
 }
+$theme_config_db = unserialize($theme_config_db);

 //合并配置数据
 $theme_config = empty($theme_config_db) ? $theme_config : array_merge ($theme_config,$theme_config_db);
 //主题版本
 $theme_ver = Debug ? "{$theme_info['version']}.".time() : $theme_info['version'];

-if(defined('UID')){
+if($config_type == 'user'){
    //载入站点设置
    $site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
    //如果没有权限则清除自定义代码
@@ -223,6 +221,11 @@ function get_article_list($category = 0,$limit = 0){
        $data['category_name'] = $categorys[$data['category']] ?? 'Null';
        $data['title'] = htmlspecialchars($data['title'],ENT_QUOTES);
        $data['summary'] = htmlspecialchars($data['summary'],ENT_QUOTES);
+        if($GLOBALS['global_config']['static_link'] == 1){
+            $data['url'] = "/{$GLOBALS['u']}/article/{$data['id']}.html";
+        }else{
+            $data['url'] = "./index.php?c=article&id={$data['id']}&u={$GLOBALS['u']}";
+        }
    }
    return ['data'=>$datas,'count'=>$count];
 }
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.0.38-20230906
+v2.0.39-20230913
--- a/templates/admin/page/expand/sitemap.php
+++ b/templates/admin/page/expand/sitemap.php
@@ -71,8 +71,8 @@ $title='站点地图';require(dirname(__DIR__).'/header.php');
                <div class="layui-input-block" >
                    <select name="user_homepage">
                        <option value="0" >不生成</option>
-                        <option value="1" selected="">动态地址 | http://example.com/index.php?u=user</option>
-                        <option value="2" >静态地址 | http://example.com/user.html</option>
+                        <option value="1" >动态地址 | http://example.com/index.php?u=user</option>
+                        <option value="2" selected="">静态地址 | http://example.com/user.html</option>
                        <option value="3" >二级域名 | http://user.example.com</option>
                    </select>
                </div>
@@ -98,8 +98,8 @@ $title='站点地图';require(dirname(__DIR__).'/header.php');
                <div class="layui-input-block" >
                    <select name="click_page">
                        <option value="0" >不生成</option>
-                        <option value="1" selected="">动态地址 | http://example.com/index.php?c=click&id=1&u=user</option>
-                        <option value="2" >静态地址 | http://example.com/user/click/1.html</option>
+                        <option value="1" >动态地址 | http://example.com/index.php?c=click&id=1&u=user</option>
+                        <option value="2" selected="">静态地址 | http://example.com/user/click/1.html</option>
                    </select>
                </div>
            </div>
@@ -118,31 +118,31 @@ $title='站点地图';require(dirname(__DIR__).'/header.php');
                </div>
            </div>
            
-            <!--<fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>文章页面</legend></fieldset>-->
-            <!--<div class="layui-form-item">-->
-            <!--    <label class="layui-form-label">URL格式</label>-->
-            <!--    <div class="layui-input-block" >-->
-            <!--        <select name="article_page">-->
-            <!--            <option value="0" >不生成</option>-->
-            <!--            <option value="1" selected="">动态地址 | http://example.com/index.php?c=article&id=1&u=user</option>-->
-            <!--            <option value="2" >静态地址 | http://example.com/user/article/1.html</option>-->
-            <!--        </select>-->
-            <!--    </div>-->
-            <!--</div>-->
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>文章页面</legend></fieldset>
+            <div class="layui-form-item">
+                <label class="layui-form-label">URL格式</label>
+                <div class="layui-input-block" >
+                    <select name="article_page">
+                        <option value="0" >不生成</option>
+                        <option value="1" >动态地址 | http://example.com/index.php?c=article&id=1&u=user</option>
+                        <option value="2" selected="">静态地址 | http://example.com/user/article/1.html</option>
+                    </select>
+                </div>
+            </div>
            
-            <!--<div class="layui-form-item">-->
-            <!--    <label class="layui-form-label">权重</label>-->
-            <!--    <div class="layui-input-inline">-->
-            <!--        <input type="text" name="article_page_weight" lay-verify="required" value="0.8" autocomplete="off" class="layui-input">-->
-            <!--    </div>-->
-            <!--</div>-->
+            <div class="layui-form-item">
+                <label class="layui-form-label">权重</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="article_page_weight" lay-verify="required" value="0.8" autocomplete="off" class="layui-input">
+                </div>
+            </div>
            
-            <!--<div class="layui-form-item">-->
-            <!--    <label class="layui-form-label">更新频率</label>-->
-            <!--    <div class="layui-input-inline" >-->
-            <!--        <select name="article_page_changefreq"></select>-->
-            <!--    </div>-->
-            <!--</div>-->
+            <div class="layui-form-item">
+                <label class="layui-form-label">更新频率</label>
+                <div class="layui-input-inline" >
+                    <select name="article_page_changefreq"></select>
+                </div>
+            </div>
            
            <div class="layui-form-item">
                <div class="layui-input-block">
--- a/templates/admin/page/root/default_setting.php
+++ b/templates/admin/page/root/default_setting.php
@@ -9,7 +9,7 @@ $LoginConfig = unserialize( get_db("global_config", "v", ["k" => "LoginConfig"])
    <div class="layuimini-main">
    <form class="layui-form" lay-filter="form">
        <div class="layui-form layuimini-form layui-form-pane">
-            <blockquote class="layui-elem-quote layui-text" style="">1.本页功能<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享<br />2.用户注册后默认使用此方案<br />3.此功能不会修改现有用户的配置<br />4.如果您不理解选项的作用请勿乱改   </blockquote>
+            <blockquote class="layui-elem-quote layui-text" style="">1.本页功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享<br />2.用户注册后默认使用此方案<br />3.此功能不会修改现有用户的配置<br />4.如果您不理解选项的作用请勿乱改   </blockquote>
            <fieldset class="layui-elem-field layui-field-title"><legend>安全设置</legend></fieldset>
            
            <div class="layui-form-item">
--- a/templates/admin/page/root/icon_set.php
+++ b/templates/admin/page/root/icon_set.php
@@ -8,7 +8,7 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
    <form class="layui-form" lay-filter="form">
        <div class="layui-form layuimini-form layui-form-pane">
            <blockquote class="layui-elem-quote layui-text" style="">
-                1.此功能<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享,请仔细阅读本页说明<br />
+                1.此功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享,请仔细阅读本页说明<br />
                2.缓存时间视自身需求而定,希望及时更新则短一点(实际上站点很少会更新图标),建议值: 604800 (7天)<br />
                3.修改缓存时间可能不会立即生效,因为浏览器已经缓存的图标会等过期后再刷新 (可以清理浏览器缓存来强制刷新)<br />
                4.用户需在站点设置>链接图标>选择本地服务或本地服务(伪静态),后者需要从站长工具生成伪静态并正确配置<br />
--- a/templates/admin/page/root/mail_set.php
+++ b/templates/admin/page/root/mail_set.php
@@ -8,7 +8,7 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
    <form class="layui-form" lay-filter="form">
        <div class="layui-form layuimini-form layui-form-pane">
            <blockquote class="layui-elem-quote layui-text" style="">
-                1.此功能<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享
+                1.此功能<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享
            </blockquote>
            
            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;"><legend>SMTP 配置</legend></fieldset>
--- a/templates/admin/page/root/sys_setting.php
+++ b/templates/admin/page/root/sys_setting.php
@@ -16,7 +16,7 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
        </div>
    <form class="layui-form" lay-filter="form">
        <div class="layui-form layuimini-form layui-form-pane">
-            <blockquote class="layui-elem-quote layui-text" style="">1.带*号的选项属<a href="https://gitee.com/tznb/OneNav/wikis/%E8%AE%A2%E9%98%85%E6%9C%8D%E5%8A%A1%E6%8C%87%E5%BC%95" target="_blank">授权用户</a>专享<br />2.原OneNav Extend的部分配置已下放到用户组配置中<br />3.如果您不理解选项的作用请勿乱改   </blockquote>
+            <blockquote class="layui-elem-quote layui-text" style="">1.带*号的选项属<a href="https://gitee.com/tznb/TwoNav/wikis/pages?sort_id=7968669&doc_id=3767990" target="_blank">授权用户</a>专享<br />2.如果您不理解选项的作用请勿乱改   </blockquote>
            
            <div class="layui-form-item">
                <label class="layui-form-label">默认用户</label>
@@ -144,7 +144,18 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
                </div>
                <div class="layui-form-mid layui-word-aux">开启时将关闭主页/登录/注册等服务,站长账号不受影响(网站升级迁移时适用)</div>
            </div>
-
+            
+            <div class="layui-form-item">
+                <label class="layui-form-label required">静态链接</label>
+                <div class="layui-input-inline">
+                    <select name="static_link">
+                        <option value="0" selected="">关闭</option>
+                        <option value="1" >开启</option>
+                    </select>
+                </div>
+                <div class="layui-form-mid layui-word-aux">开启后部分动态链接将改为静态链接 (请确保伪静态生效中)</div>
+            </div>
+            
            <div class="layui-form-item">
                <label class="layui-form-label required">强制私有</label>
                <div class="layui-input-inline">
--- a/templates/admin/page/root/tool.php
+++ b/templates/admin/page/root/tool.php
@@ -34,7 +34,7 @@ require(dirname(__DIR__).'/header.php');
        <pre class="layui-code" id="console_log" >
 1.功能都集中在上方的按钮了,需要那个就点击那个!
 2.一键诊断和phpinfo用于帮助站长和开发者快速了解服务器环境
-3.生成伪静态(伪静态无需求可不设置,安全设置最好设置下)
+3.生成伪静态(仅针对Nginx,安全配置必选,其他规则按需,Apache已内置规则无需设置,其他环境不支持)
 4.数据库升级: 手动安装更新时,若有说明需更新数据库,则需要手动点击此按钮!自动更新时无需干预,特殊情况除外!
 5.清理缓存: 用于清理特定情况下产生的临时数据 (仅清理60分钟前的数据)
        产生原因1:用户在添加链接页面上传了图标且未点击删除图标或添加链接,而是直接关闭了页面
@@ -46,10 +46,10 @@ require(dirname(__DIR__).'/header.php');
 </div>


-<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>
+<script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js?v=<?php echo $Ver;?>"></script>
 <script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
-<script src = "<?php echo $libs?>/Other/ClipBoard.min.js"></script>
-<script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
+<script src = "<?php echo $libs?>/Other/ClipBoard.min.js?v=<?php echo $Ver;?>"></script>
+<script src = '<?php echo $libs?>/jquery/jquery.md5.js?v=<?php echo $Ver;?>'></script>
 <?php load_static('js');?>
 <script>
 layui.use(['layer','form','miniTab'], function () {
--- a/templates/admin/page/root/vip.php
+++ b/templates/admin/page/root/vip.php
@@ -15,9 +15,9 @@ if(!empty($Notice)){
        <h3 style = "margin-bottom:1em;">当前域名：<font color="red"><?php echo $HTTP_HOST; ?></font></h3>
        
        <div class="layui-form-item">
-            <label class="layui-form-label">订单号</label>
+            <label class="layui-form-label">授权卡密</label>
            <div class="layui-input-block">
-                <input type="text" id = "order_id" name="order_id" value="<?php echo $subscribe['order_id']; ?>" required  autocomplete="off" placeholder="请输入订单号" class="layui-input">
+                <input type="text" id = "order_id" name="order_id" value="<?php echo $subscribe['order_id']; ?>" required  autocomplete="off" placeholder="请输入授权单号/卡密" class="layui-input">
            </div>
        </div>

--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -2,6 +2,23 @@
 <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.0.39-20230913</h4>
+            <ul>
+                <li>[升级] Layui组件由 v2.8.10 升级到 v2.8.17</li>
+                <li>[优化] 站点地图支持生成文章页面链接</li>
+                <li>[新增] 系统设新增静态链接选项,开启后部分动态链接将改为静态链接 (请确保伪静态生效中,仅针对前台内容)</li>
+                <li>[优化] 挽风导航V1:文章图片点击放大,新增两处自定义代码,添加返回顶部功能!主页增加一处自定义代码,修复全局底部代码无效,磨砂风格支持</li>
+                <li>[修复] 使用Mysql数据库在访问注册页面/引导时报错</li>
+                <li>[修复] 全局类模板配置保存位置错误</li>
+                <li>[修复] 站点地图HTTPS访问时携带443端口的问题 #I80I6K</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">
--- a/templates/guide/default/config.php
+++ b/templates/guide/default/config.php
@@ -15,14 +15,14 @@
    <div class="layui-form-item layui-form-text">
        <label class="layui-form-label">页内标题</label>
        <div class="layui-input-block">
-            <input type="text" name="title" placeholder="留空则使用默认用户站点配置的主标题" autocomplete="off" class="layui-input">
+            <input type="text" name="title" placeholder="留空则使用:默认设置>站点设置>主标题" autocomplete="off" class="layui-input">
        </div>
    </div>

    <div class="layui-form-item layui-form-text">
        <label class="layui-form-label">页内描述</label>
        <div class="layui-input-block">
-            <input type="text" name="p1" placeholder="留空则使用默认用户站点配置的描述" autocomplete="off" class="layui-input">
+            <input type="text" name="p1" placeholder="留空则使用:默认设置>站点设置>站点描述" autocomplete="off" class="layui-input">
        </div>
    </div>

--- a/templates/guide/default/index.php
+++ b/templates/guide/default/index.php
@@ -18,8 +18,8 @@
 		<header id="header">
 			<div class="content">
 				<div class="inner">
-					<h3><?php echo empty($theme_config['title'])?$site['title']:$theme_config['title'];?></h3>
-					<p><?php echo empty($theme_config['p1'])?$site['description']:$theme_config['p1']; ?></p>
+					<h3><?php echo empty($theme_config['title'])?$s_site['title']:$theme_config['title'];?></h3>
+					<p><?php echo empty($theme_config['p1'])?$s_site['description']:$theme_config['p1']; ?></p>
 				</div>
 			</div>
 			<nav>
--- a/templates/home/default/info.json
+++ b/templates/home/default/info.json
@@ -1,7 +1,7 @@
 {
    "name":"默认主题(加强)",
    "description":"默认主题(加强)",
-    "homepage":"https://gitee.com/tznb/OneNav",
+    "homepage":"https://gitee.com/tznb/TwoNav",
    "version":"2.0.3",
    "update":"2023/07/31",
    "author":"落幕",