v2.0.30-20230713

system/api.php

@@ -176,7 +176,7 @@ function write_category(){
             'fid'=>intval($_POST['fid']??'0'),
             'pid'=>intval($_POST['pwd_id']??'0'),
             'status'=>1,
-            'property'=>$_POST['property']??'0',
+            'property'=>intval($_POST['property']??'0'),
             'name'=>htmlspecialchars($_POST['name'],ENT_QUOTES),
             'add_time'=>time(),
             'up_time'=>time(),
@@ -230,7 +230,7 @@ function write_category(){
         $data = [
             'fid'=>$_POST['fid'],
             'pid'=>intval($_POST['pwd_id']??'0'),
-            'property'=>$_POST['property']??'0',
+            'property'=>intval($_POST['property']??'0'),
             'name'=>$_POST['name'],
             'up_time'=>time(),
             'description'=>$_POST['description'],
@@ -711,7 +711,7 @@ function write_link(){
         }
 
         $api = Get_Index_URL().'?c=icon&url='.base64_encode($link['url']);
-        $res = ccurl($api,30);
+        $res = ccurl($api,30,true);
         $data = get_db('global_icon','*',['url_md5'=>md5($link['url'])]);
         if(empty($data)){
             msg(1,'fail');
@@ -1463,7 +1463,7 @@ function write_data_control(){
 function read_data(){
     global $USER_DB;
     //指定类型限制仅root账号可用!
-    if(in_array($USER_DB['UserGroup'] != 'root' && $_GET['type'],['diagnostic_log','connectivity_test','phpinfo'])){
+    if($USER_DB['UserGroup'] != 'root' && in_array( $_GET['type'],['diagnostic_log','connectivity_test','phpinfo'])){
         msg(-1,'无权限');
     }
     
@@ -1569,6 +1569,25 @@ function read_data(){
         }else{
             exit('密码验证失败,请重试!');
         }
+    //报表统计
+    }elseif($_GET['type'] == 'echarts'){
+        $days = isset($_GET['date']) && !empty($_GET['date']) ? $_GET['date'] : 7;
+        $dates = [];
+        for ($i = 0; $i < $days; $i++) {
+            $date = date('Ymd', strtotime("-$i days"));
+            $dates[] = $date;
+        }
+        $dates = array_reverse($dates);
+        $day_data = [];
+        array_push($day_data, ['name' => '访问量', 'type' => 'line', 'data' => []]);
+        array_push($day_data, ['name' => '点击量', 'type' => 'line', 'data' => []]);
+        foreach ($dates as $date) {
+            array_push($day_data[0]['data'], get_db('user_count', 'v', ['uid' => UID, 'k' => $date, 't' => 'index_Ymd']) ?? 0);
+            array_push($day_data[1]['data'], get_db('user_count', 'v', ['uid' => UID, 'k' => $date, 't' => 'click_Ymd']) ?? 0);
+        }
+        
+        $data = ['dates'=>$dates,'day_data'=>$day_data];
+        msgA(['code'=>1,'data'=>$data]);
     }
 }
 

system/api_root.php

@@ -738,6 +738,25 @@ function other_root(){
         if(!is_subscribe('bool')){msg(-1,"未检测到有效授权,无法使用该功能!");}
         write_global_config('icon_config',$_POST,'图标配置');
         msg(1,'保存成功');
+    }elseif($_GET['type'] == 'write_icon_del_cache'){
+        //删除数据库缓存信息
+        if(empty(count_db('global_icon','*'))){
+            msg(-1,'无缓存记录..');
+        }
+        delete_db('global_icon','*');
+        
+        //删除缓存目录下的所有文件
+        $files = glob(DIR.'/data/icon' . '/*');
+        if (empty($files)) {
+            msg(-1,'无缓存文件..');
+        } 
+        foreach ($files as $file) {
+            if (is_file($file)) {
+                unlink($file);
+            }
+        }
+        
+        msg(1,'操作成功');
     }
 }
 

system/login.php

@@ -18,14 +18,19 @@ if($_SERVER['REQUEST_METHOD'] === 'GET'){
 AccessControl(); //访问控制
 $User = $_POST["User"];$Password = $_POST["Password"]; //获取请求数据
 
+if(empty($User)){
+    insert_db("user_log", ["uid" => '',"user"=>'',"ip"=>Get_IP(),"time"=>time(),"type" => 'login',"content"=>Get_Request_Content(),"description"=>"请求登录>账号为空"]);
+    msg(-1,'账号不能为空!');
+}elseif($User != $USER_DB['User']){ 
+    insert_db("user_log", ["uid" => '',"user"=>$User,"ip"=>Get_IP(),"time"=>time(),"type" => 'login',"content"=>Get_Request_Content(),"description"=>"请求登录>账号不存在"]);
+    msg(-1,'账号不存在!');
+}
+
 //记录请求日志
 insert_db("user_log", ["uid" => $USER_DB['ID'],"user"=>$USER_DB['User'],"ip"=>Get_IP(),"time"=>time(),"type" => 'login',"content"=>Get_Request_Content(),"description"=>"请求登录"]);
 $log_id = $db->id();
 //基础判断
-if(!isset($User)){
-    update_db_db("user_log", ["description" => "请求登录>账号不能为空"], ["id"=>$log_id]);
-    msg(-1,'账号不能为空!');
-}elseif(strlen($Password)!==32){
+if(strlen($Password)!==32){
     update_db("user_log", ["description" => "请求登录>密码错误(长度应该是32位的MD5)"], ["id"=>$log_id]);
     msg(-1,'密码错误!');
 }elseif($c != $global_config["Login"] && $c != $USER_DB['Login'] ){

system/public.php

@@ -530,7 +530,7 @@ function get_http_code($url,$TIMEOUT = 10 ,$NOBODY = true) {
     return $return;
 }
 
-function ccurl($url,$overtime = 3){
+function ccurl($url,$overtime = 3,$Referer = false){
     try {
         $curl  =  curl_init ( $url ) ; //初始化
         curl_setopt($curl, CURLOPT_TIMEOUT, $overtime ); //超时
@@ -539,6 +539,11 @@ function ccurl($url,$overtime = 3){
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+        if($Referer === true){
+            curl_setopt($curl, CURLOPT_REFERER, $_SERVER['HTTP_REFERER']);
+        }elseif(!empty($Referer)){
+            curl_setopt($curl, CURLOPT_REFERER, $Referer);
+        }
         curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36');
         $Res["content"] = curl_exec   ( $curl ) ;
         $Res["code"] = curl_getinfo($curl, CURLINFO_HTTP_CODE);

system/version.txt

@@ -1 +1 @@
-v2.0.29-20230705
+v2.0.30-20230713

templates/admin/js/link_list.js

@@ -135,6 +135,7 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                         key: input.name,value: input.checked
                     });
                 });
+                $('th[data-field="icon"]').attr('title', '仅显示已上传的图标');
             }
         });
         // 监听表格排序事件

templates/admin/page/home.php

@@ -240,9 +240,16 @@ require 'header.php';
                     </div>
                     <div class="layui-col-md12">
                         <div class="layui-card">
-                            <div class="layui-card-header"><i class="fa fa-line-chart icon"></i>报表统计</div>
+                            <div class="layui-card-header">
+                                <div style="display: flex; justify-content: space-between;">
+                                    <div><i class="fa fa-line-chart icon"></i>报表统计</div>
+                                    <div>
+                                        <button class="layui-btn layui-btn-primary echarts" style="border: none;display:none;"><span>最近7天</span><i class="layui-icon layui-icon-down layui-font-12"></i></button>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="layui-card-body">
-                                <div id="echarts-records" style="width: 100%;min-height:500px"></div>
+                                <div id="echarts-records" style="width: 100%; min-height: 500px;"></div>
                             </div>
                         </div>
                     </div>
@@ -323,29 +330,61 @@ if($USER_DB['UserGroup'] == 'root'){
         var $ = layui.jquery,
             layer = layui.layer,
             miniTab = layui.miniTab,
-            echarts = layui.echarts;
+            echarts = layui.echarts,
+            dropdown = layui.dropdown;
         miniTab.listen();
 
-        //报表功能
-        var echartsRecords = echarts.init(document.getElementById('echarts-records'), 'walden');
-        var optionRecords = {
-            tooltip: {trigger: 'axis'},
-            legend: {data:['访问量','点击量']},
-            grid: {left: '3%',right: '4%',bottom: '3%',containLabel: true},
-            xAxis: {
-                type: 'category',
-                boundaryGap: false,
-                data: <?php echo json_encode($day)?>
-            },
-            yAxis: {},
-            series: <?php echo json_encode($day_data)?>
-        };
-        echartsRecords.setOption(optionRecords);
-
-        // echarts 窗口缩放自适应
-        window.onresize = function(){
-            echartsRecords.resize();
+        
+        //报表统计下拉初始化
+        var home_echarts = localStorage.getItem(u + "_home_echarts") || 7 ;
+        $('.echarts').find('span').text(`最近${home_echarts}天`);
+        $('.echarts').show();
+        dropdown.render({
+          elem: '.echarts',
+          data: [{
+            title: '最近7天',
+            value: 7
+          },{
+            title: '最近14天',
+            value: 14
+          },{
+            title: '最近30天',
+            value: 30
+          }],
+          click: function(obj){
+              this.elem.find('span').text(obj.title);
+              localStorage.setItem(u + "_home_echarts",obj.value);
+              home_echarts = obj.value;
+              load_echarts();
+          }
+        });
+        
+        //加载报表统计
+        function load_echarts(){
+            var echartsRecords = echarts.init(document.getElementById('echarts-records'), 'walden');
+            $.post('./index.php?c=api&method=read_data&date='+home_echarts+'&type=echarts&u='+u,function(data,status){
+                if(data.code == 1){
+                    var optionRecords = {
+                        tooltip: {trigger: 'axis'},
+                        legend: {data:['访问量','点击量']},
+                        grid: {left: '3%',right: '4%',bottom: '3%',containLabel: true},
+                        xAxis: {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: data.data.dates
+                        },
+                        yAxis: {},
+                        series: data.data.day_data
+                    };
+                    echartsRecords.setOption(optionRecords);
+                    window.onresize = function(){echartsRecords.resize();} // echarts 窗口缩放自适应
+                    return;
+                }
+                layer.alert("获取统计数据失败..",{icon:5,title:'错误',anim: 2,closeBtn: 0,btn: ['刷新页面']},function () {location.reload();});
+            });
         }
+        load_echarts();
+        
         //定时刷新
         setInterval(function() {
             if($("#layuiminiHomeTabId",parent.document).attr('class') == 'layui-this' && document.visibilityState == 'visible'){

templates/admin/page/root/icon_set.php

@@ -86,6 +86,7 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
             
             <div class="layui-form-item">
                 <div class="layui-input-block">
+                    <button class="layui-btn layui-btn-danger" type="button" id="clean">清除缓存</button>
                     <button class="layui-btn layui-btn-normal" lay-submit lay-filter="save">确认保存</button>
                 </div>
             </div>
@@ -103,7 +104,24 @@ layui.use(['jquery','form'], function () {
     
     //表单赋值
     form.val('form', <?php echo json_encode(unserialize( get_db("global_config", "v", ["k" => "icon_config"])));?>);
-
+    //清除缓存
+    $('#clean').click(function() {
+        layer.confirm('确定要清除全部缓存吗?',{icon: 3, title:'温馨提示'}, function(index){
+            $.post(get_api('other_root','write_icon_del_cache'),function(data,status){
+                if(data.code == 1) {
+                    if(data.msg!="操作成功"){
+                        layer.alert(data.msg)
+                    }else{
+                        layer.msg(data.msg, {icon: 1});
+                    }
+                }else{
+                    layer.msg(data.msg, {icon: 5});
+                }
+            });
+            return false;
+        });
+    });
+    
     //监听提交
     form.on('submit(save)', function (data) {
         $.post(get_api('other_root','write_icon_config'),data.field,function(data,status){

templates/admin/page/theme_transit.php

@@ -1,4 +1,7 @@
-<?php $title='过渡模板';$awesome=true; require 'header.php'; ?>
+<?php $title='过渡模板';$awesome=true; require 'header.php'; 
+$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
+$tip = $site['link_model'] == 'Transition';
+?>
 <style type="text/css">
 .screenshot{
     width: 99%;  
@@ -15,7 +18,8 @@
     <blockquote class="layui-elem-quote layuimini-form" style="margin-top: 0px;border-left: 5px solid <?php echo $cache?"#1e9fff":($global_config['offline']?"":"#639d11") ?>;padding: 6px;">
         <span class="layui-breadcrumb" lay-separator="|">
             <a href="./index.php?c=admin&page=theme_transit&cache=no&u=<?php echo U;?>">刷新数据</a>
-            <a href="javascript:;" layuimini-content-href="set_transit" data-title="设置过渡页面">设置</a>
+            <a href="javascript:;" layuimini-content-href="set_transit" data-title="设置过渡页面">设置</a><?php if(!$tip){echo '
+            <a href="javascript:;" layuimini-content-href="SiteSetting" data-title="站点设置">注:请将站点设置>链接模式>改为过渡页面</a>';}?> 
         </span>
     </blockquote>
     <div class="layui-bg-gray" style="padding: 1px;" >

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.0.30-20230713</h4>
+            <ul>
+                <li>[修复] 登录接口的一个错误</li>
+                <li>[优化] 图标配置页面新增清除缓存按钮,优化图标拉取功能的成功率</li>
+                <li>[优化] 主题设置>过渡模板,当站点设置中链接模式不为过度页面时显示提示信息</li>
+                <li>[新增] 后台概要页的报表统计支持选择最近7/14/30天的统计数据 (终端记忆)</li>
+            </ul>
+        </div>
+    </li>
     <li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis"></i>
         <div class="layui-timeline-content layui-text">