修复局域网无法获取新版本时导致的页面混乱[#91](https://github.com/icret/EasyImages2.0/issues/91#issue-1585360193)

admin/admin.inc.php

@@ -606,8 +606,8 @@ auto_delete(); //定时删除
                                 <span class="input-group-addon">生成模式</span>
                                 <select class="form-control" name="thumbnail">
                                     <option value="0" <?php if ($config['thumbnail'] == 0) echo 'selected'; ?>>原图</option>
-                                    <option value="1" <?php if ($config['thumbnail'] == 1) echo 'selected'; ?>>TimThumb | 推荐</option>
                                     <option value="2" <?php if ($config['thumbnail'] == 2) echo 'selected'; ?>>上传生成 | 直链</option>
+                                    <option value="1" <?php if ($config['thumbnail'] == 1) echo 'selected'; ?>>TimThumb | 推荐</option>
                                 </select>
                             </div>
                         </div>
@@ -949,10 +949,8 @@ auto_delete(); //定时删除
                     <a href="<?php echo is_file(APP_ROOT . '/docs/index.html') ? $config['domain'] . '/docs' : 'https://icret.github.io/EasyImages2.0/#/'; ?>" target="_blank"><span class="label label-badge label-primary" data-toggle="tooltip" title="使用手册"><i class="icon icon-book"></i> Manual</span></a>
                     <a href="https://t.me/Easy_Image" target="_blank"><span class="label label-badge label-primary" data-toggle="tooltip" title="EasyImage Telegram Group"><i class="icon icon-comments-alt"></i> Telegram</span></a>
                     <a href="https://github.com/icret/EasyImages2.0/discussions" target="_blank"><span class="label label-badge label-primary" data-toggle="tooltip" title="GitHub 社区"><i class="icon icon-comments-alt"></i> Discuss</span></a>
-                    <span data-toggle="tooltip" title="当前版本更新日志"><button type="button" class="btn btn-sm btn-primary label label-badge" data-toggle="modal" data-moveable="true" ata-size="sm" data-scroll-inside="true" data-icon="heart" data-title="当前版本更新日志" data-custom="<pre style='background-color: rgba(0, 0, 0, 0);border-color:rgba(0, 0, 0, 0);'><?php echo getVersion('name') . '<br/><br/>' . getVersion('body'); ?></pre>"><i class="icon icon-github"></i> <?php echo get_current_version(); ?></button></span>
+                    <span data-toggle="tooltip" title="当前版本更新日志"><button type="button" class="btn btn-sm btn-primary label label-badge label-primary" data-toggle="modal" data-moveable="true" ata-size="sm" data-scroll-inside="true" data-icon="heart" data-title="当前版本更新日志" data-custom="<pre style='background-color: rgba(0, 0, 0, 0);border-color:rgba(0, 0, 0, 0);'><?php echo getVersion('name') . '<br/><br/>' . getVersion('body'); ?></pre>"><i class="icon icon-github"></i> <?php echo get_current_version(); ?></button></span>
-                    <span data-toggle="tooltip" title="您的赞美是我开发的动力!"><button type="button" class="btn btn-sm btn-danger label label-badge" data-toggle="modal" data-moveable="true" data-size="sm" data-icon="heart" data-title="您的赞美是我开发的动力!" data-custom="<ul class='nav nav-tabs'><li class='active'><a data-tab href='#wechat'><i class='icon icon-wechat' style='color:#329d38;'> 微信</i></a></li><li><a data-tab href='#alipay'><i class='icon icon-zhifubao-square' style='color:#1970fc;'> 支付宝</i></a></li></ul><div class='tab-content'><div class='tab-pane active' id='wechat'><img src='../public/images/wechat.jpg'></div><div class='tab-pane' id='alipay'><img src='../public/images/alipay.jpg'></div></div>"><i class="icon icon-yen"></i><small>打赏作者</small></button></span>
+                    <span data-toggle="tooltip" title="您的赞美是我开发的动力!"><button type="button" class="btn btn-sm btn-danger label label-badge label-danger" data-toggle="modal" data-moveable="true" data-size="sm" data-icon="heart" data-title="您的赞美是我开发的动力!" data-custom="<ul class='nav nav-tabs'><li class='active'><a data-tab href='#wechat'><i class='icon icon-wechat' style='color:#329d38;'> 微信</i></a></li><li><a data-tab href='#alipay'><i class='icon icon-zhifubao-square' style='color:#1970fc;'> 支付宝</i></a></li></ul><div class='tab-content'><div class='tab-pane active' id='wechat'><img src='../public/images/wechat.jpg'></div><div class='tab-pane' id='alipay'><img src='../public/images/alipay.jpg'></div></div>"><i class="icon icon-yen"></i><small>打赏作者</small></button></span>
-                    <!-- <a href="../public/images/wechat.jpg" data-toggle="lightbox" style="color:#329d38;"><i data-toggle="tooltip" title="您的赞美是我开发的动力!" class="icon icon-wechat"></i></a> -->
-                    <!-- <a href="../public/images/alipay.jpg" data-toggle="lightbox" class="hidden-xs inline-block" style="color:#1970fc;"><i class="icon icon-zhifubao" data-toggle="tooltip" title="您的赞美是我开发的动力!"> </i></a> -->
                 </p>
                 <h6>程序依赖</h6>
                 <p>
@@ -990,7 +988,7 @@ auto_delete(); //定时删除
                 <div class="bg-warning with-padding hidden-xs">
                     <h5 class="header-dividing"><span class="label label-success">New</span> <?php echo getVersion('name'); ?></h5>
                     <pre style="background-color: rgba(0, 0, 0, 0);border-color:rgba(0, 0, 0, 0);">更新内容: <br /><?php echo getVersion('body'); ?></pre>
-                    <h6>* 更新日期: <?php echo getVersion('created_at'); ?> 下载新版本上传至网站升级 <a href="https://icret.gitee.io/easyimages2.0/#/./图床更新升级" target="_blank" data-toggle="tooltip" title="升级方法"><i class="icon icon-question"></i></a> 然后点击更新版本号。</h6>
+                    <h6>* 更新日期: <?php echo getVersion('created_at'); ?> 下载新版本上传至网站升级 <a href="https://icret.github.io/EasyImages2.0/#/./图床更新升级" target="_blank" data-toggle="tooltip" title="升级方法"><i class="icon icon-question"></i></a> 然后点击更新版本号。</h6>
                     <form action="<?php $_SERVER['SCRIPT_NAME']; ?>" method="post">
                         <input class="form-control" type="hidden" name="del_version_file" value="/admin/logs/version/version.json" readonly>
                         <div class="btn-group">

application/class.version.php

@@ -66,6 +66,7 @@ class getVersion
         $headerArray = array("Content-type:application/json;", "Accept:application/json");
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_TIMEOUT_MS, 403); // 超时时间
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

application/function.php

@@ -853,17 +853,21 @@ function getVersion($name = 'tag_name')
     global $config;
 
     if ($config['checkEnv']) {
-
         require_once APP_ROOT . '/application/class.version.php';
         $url = "https://api.github.com/repositories/188228357/releases/latest"; // 获取版本地址
         $getVersion = new getVersion($url);
-
+        try {
             if (!empty($getVersion->readJson($name))) {
                 return $getVersion->readJson($name); // 返回版本信息
             } else {
-            $getVersion->downJson(); // 获取版本信息
+                return '存在版本文件, 但是内容为空,请等待1小时候后再次更新版本号!';
-            return '获取版本文件失败,请检查curl或者网络';
             }
+        } catch (Throwable $e) {
+            $getVersion->downJson(); // 获取版本信息
+            return '获取版本文件失败,请检查curl或者网络 错误信息: ' . $e->getMessage();
+        }
+    } else {
+        return '已关闭环境自检, 当前版本:' . get_current_version();
     }
 }
 

application/header.php

@@ -56,5 +56,4 @@
 			</ul>
 		</div>
 	</div>
-
 	<!-- 顶部导航栏END -->

application/list.php

@@ -62,7 +62,7 @@ if ($config['ad_top']) echo $config['ad_top_info'];
             ?>
                 <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
                   <div class="card">
-                    <li><img src="../public/images/loading.svg" data-image="<?php echo creat_thumbnail_by_list($imgUrl); ?>" data-original="<?php echo $imgUrl; ?>" alt="简单图床-EasyImage"></li>
+                    <li><img src="<?php static_cdn(); ?>/public/images/loading.svg" data-image="<?php echo creat_thumbnail_by_list($imgUrl); ?>" data-original="<?php echo $imgUrl; ?>" alt="简单图床-EasyImage"></li>
                     <div class="bottom-bar">
                       <a href="<?php echo $linkUrl; ?>" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="打开" style="margin-left:10px;"></i></a>
                       <a href="#" class="copy" data-clipboard-text="<?php echo $linkUrl; ?>" data-toggle="tooltip" title="复制链接" style="margin-left:10px;"><i class="icon icon-copy"></i></a>

config/config.php

@@ -115,7 +115,7 @@ $config=Array
 	'guest_path_status'=>0,
 	'token_path_status'=>0,
 	'admin_path'=>'u',
-	'update'=>'2023-02-15 11:44:21',
+	'update'=>'2023-02-18 00:41:45',
 	'footer'=>'<a href="https://github.com/icret/EasyImages2.0" target="_blank" rel="nofollow" data-toggle="tooltip" title="Since 2018 - Github">© Since 2018</a>
 <a href="https://png.cm/" target="_blank" data-toggle="tooltip" title="EasyImage 简单图床">EasyImage</a>
 <a href="/admin/terms.php" target="_blank" data-toggle="tooltip" title="使用协议">DMCA</a>

docs/update.md

@@ -1,6 +1,7 @@
-*2023-02-15 v2.7.5 dev
+*2023-02-18 v2.7.5 dev
 - 增加定时删除文件
 - 修复一处bug
+- 修复局域网无法获取新版本时导致的页面混乱[#91](https://github.com/icret/EasyImages2.0/issues/91#issue-1585360193)
 - 更换检测新版本方式
 - API上传增加返回Token ID
 - 优化显示

docs/其他格式.md

@@ -1,6 +1,6 @@
 - 如果你想上传其他的格式，比如`MP4` `pdf` `mp3` 可以这样操作
 
-1. 在后台`上传设置`中添加对应的格式
+1. 在后台上传设置中的`允许的扩展名`添加对应的格式
 2. 在图床安全中关闭`图床模式`
 - 这样你就可以上传任意格式文件了
-- 友情提示, 不要上传一些可执行文件 比如：`php` `sh`等危险文件
+- 友情提示: 不要允许上传一些可执行文件格式 比如：`php` `html` `js`等危险文件