v2.1.07-20231130

This commit is contained in:
MI15\Win
2023-12-01 00:14:39 +08:00
parent 01fdca800b
commit f2ce9c4eef
15 changed files with 447 additions and 19 deletions

View File

@@ -227,7 +227,7 @@ function echo_Atool(){
<head>
<meta charset="UTF-8">
<title>ATool 工具箱</title>
<link rel="stylesheet" href="../static/Layui/v2.8.17/css/layui.css">
<link rel="stylesheet" href="../static/Layui/v2.9.0/css/layui.css">
<style>
html, body {min-width: 1200px;background-color: #fff;position: relative;}
.page-wrapper {width: 1200px;margin: 0 auto;padding: 0 15px;}
@@ -279,7 +279,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.17/layui.js"></script>
<script src="../static/Layui/v2.9.0/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>
@@ -416,7 +416,7 @@ function echo_verify(){ ?>
<head>
<meta charset="UTF-8">
<title>ATool 工具箱</title>
<link rel="stylesheet" href="../static/Layui/v2.8.17/css/layui.css">
<link rel="stylesheet" href="../static/Layui/v2.9.0/css/layui.css">
<link rel="stylesheet" href="../static/Other/login.css">
</head>
<body>
@@ -441,7 +441,7 @@ function echo_verify(){ ?>
</div>
</div>
<script src = "../static/jquery/jquery-3.6.0.min.js"></script>
<script src = "../static/Layui/v2.8.17/layui.js"></script>
<script src = "../static/Layui/v2.9.0/layui.js"></script>
<script src = '../static/jquery/jquery.md5.js'></script>
<script>
layui.use(['form','jquery'], function () {

View File

@@ -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.17/layui.js';
$layui['css'] = './static/Layui/v2.8.17/css/layui.css';
$layui['js'] = './static/Layui/v2.9.0/layui.js';
$layui['css'] = './static/Layui/v2.9.0/css/layui.css';
//判断请求类型
if($_SERVER['REQUEST_METHOD'] === 'POST'){

View File

@@ -503,15 +503,18 @@ function Get_IP() {
$ip = getenv('HTTP_CLIENT_IP');
}elseif(getenv('HTTP_X_FORWARDED_FOR')) {
$ip = getenv('HTTP_X_FORWARDED_FOR');
} elseif (getenv('HTTP_X_FORWARDED')) {
}elseif (getenv('HTTP_X_FORWARDED')) {
$ip = getenv('HTTP_X_FORWARDED');
} elseif (getenv('HTTP_FORWARDED_FOR')) {
}elseif (getenv('HTTP_FORWARDED_FOR')) {
$ip = getenv('HTTP_FORWARDED_FOR');
} elseif (getenv('HTTP_FORWARDED')) {
}elseif (getenv('HTTP_FORWARDED')) {
$ip = getenv('HTTP_FORWARDED');
}else{
$ip = $_SERVER['REMOTE_ADDR'];
}
}
if(strpos($ip, ',') != false) {
$ip = reset(explode(",", $ip));
}
return $ip;
}

View File

@@ -1 +1 @@
v2.1.06-20231113
v2.1.07-20231130