优化显示

pull/18/head
icret 2022-01-18 03:13:56 +08:00
parent e110392b6d
commit baedc49465
19 changed files with 124 additions and 342 deletions

1
.github/FUNDING.yml vendored
View File

@ -1 +0,0 @@
custom: ['https://img.545141.com/sponsor/index.html']

View File

@ -1,38 +0,0 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.

View File

@ -1,10 +0,0 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''
---

View File

@ -1,20 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -1,49 +0,0 @@
# This workflow checks out code, performs a Codacy security scan
# and integrates the results with the
# GitHub Advanced Security code scanning feature. For more information on
# the Codacy security scan action usage and parameters, see
# https://github.com/codacy/codacy-analysis-cli-action.
# For more information on Codacy Analysis CLI in general, see
# https://github.com/codacy/codacy-analysis-cli.
name: Codacy Security Scan
on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '17 9 * * 2'
jobs:
codacy-security-scan:
name: Codacy Security Scan
runs-on: ubuntu-latest
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v2
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@1.1.0
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
verbose: true
output: results.sarif
format: sarif
# Adjust severity of non-security issues
gh-code-scanning-compat: true
# Force 0 exit code to allow SARIF file generation
# This will handover control about PR rejection to the GitHub side
max-allowed-issues: 2147483647
# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v1
with:
sarif_file: results.sarif

View File

@ -1,71 +0,0 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '20 15 * * 5'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

View File

@ -1,36 +0,0 @@
name: PHP Composer
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Validate composer.json and composer.lock
run: composer validate --strict
- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Install dependencies
run: composer install --prefer-dist --no-progress
# Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
# Docs: https://getcomposer.org/doc/articles/scripts.md
# - name: Run test suite
# run: composer run-script test

View File

@ -7,7 +7,7 @@
[演示](https://img.545141.com)  
[Chrome 拓展](https://github.com/icret/EasyImage-Browser-Extension)  
[使用手册](https://www.kancloud.cn/easyimage/easyimage)  
[使用手册](https://www.kancloud.cn/easyimage/easyimage/)  
[问题反馈](https://support.qq.com/products/367633)  
[QQ群](https://shang.qq.com/wpa/qunwpa?idkey=3feb4e8be8f1839f71e53bf2e876de36afc6889b2630c33c877d8df5a5583a6f)
@ -16,7 +16,7 @@
[![Issues](https://img.shields.io/github/issues/icret/EasyImages2.0)](https://github.com/icret/EasyImages2.0/issues)
[![stargazers](https://img.shields.io/github/stars/icret/EasyImages2.0)](https://github.com/icret/EasyImages2.0/stargazers)
[![Code size](https://img.shields.io/github/languages/code-size/icret/EasyImages2.0?color=blueviolet)](https://github.com/icret/EasyImages2.0)
[![License](https://img.shields.io/badge/license-GPL_V3.0-yellowgreen.svg)](https://github.com/icret/EasyImages2.0/blob/master/LICENSE)
[![License](https://img.shields.io/badge/license-GPL_V2.0-yellowgreen.svg)](https://github.com/icret/EasyImages2.0/blob/master/LICENSE)
>本人善写bug 发现bug可提交 [Issues](https://github.com/icret/EasyImages2.0/issues) 追求稳定请下载 [稳定版](https://github.com/icret/EasyImages2.0/releases)
<hr />
@ -80,7 +80,7 @@ Deny from all
#### 程序升级
- 保存config目录和上传目录
- 保存`config`目录和`上传目录`
- 将新程序下载至网站目录解压覆盖,然后将保存的文件替换既完成升级
<details><summary><mark><font color=darkred>点击查看2.0版更新日志</font></mark></summary>

View File

@ -71,8 +71,9 @@ if (isset($_GET['reimg'])) {
<h5>本人仅为程序开源创作,如非法网站使用与本人无关,请勿用于非法用途;</h5>
<h5>请为本人博客<a class="alert-link" href="https://www.545141.com/" target="_blank">www.545141.com</a>加上网址链接,谢谢支持。作为开发者你可以对相应的后台功能进行扩展(增删改相应代码),但请保留代码中相关来源信息(例如:<a class="alert-link" href="https://www.545141.com/">本人博客</a>,邮箱等)。</h5>
<p>
<a href="https://img.545141.com/" target="_blank"><button type="button" class="btn btn-success btn-mini"><i class="icon icon-unlink"></i> 演示网站</button></a>
<a href="https://support.qq.com/products/367633" target="_blank"><button type="button" class="btn btn-primary btn-mini"><i class="icon icon-bug"></i> 问题反馈</button></a>
<a href="https://img.545141.com/" target="_blank"><button type="button" class="btn btn-mini"><i class="icon icon-unlink"></i> 演示网站</button></a>
<a href="https://www.kancloud.cn/easyimage/easyimage" target="_blank"><button type="button" class="btn btn-mini"><i class="icon icon-hand-right"></i> 使用手册</button></a>
<a href="https://support.qq.com/products/367633" target="_blank"><button type="button" class="btn btn-mini"><i class="icon icon-bug"></i> 问题反馈</button></a>
<button type="button" class="btn btn-danger btn-mini" data-scroll-inside="true" data-moveable="true" data-width="300px" data-height="250px" data-icon="heart" data-title="您的赞美是我开发的动力!" data-iframe="https://img.545141.com/sponsor/index.html" data-toggle="modal"><i class="icon icon-heart-empty"></i> 打赏作者</button>
</p>
</div>
@ -688,14 +689,14 @@ if (isset($_GET['reimg'])) {
<hr />
<p><?php
if (empty($config['TinyImag_key'])) {
echo '压缩图片 TinyImag Key未填写申请地址<a href="https://tinypng.com/developers" target="_blank">https://tinypng.com/developers</a><br/>';
echo '<i class="icon icon-times" title="图片压缩TinyImag未填写">TinyImag Key</i><br />';
} else {
echo '压缩图片 TinyImag Key已填写<br/>';
echo '<i class="icon icon-check" title="图片压缩TinyImag已填写">TinyImag Key</i><br/>';
}
if (empty($config['moderatecontent_key'])) {
echo '图片检查 moderatecontent key未填写申请地址 <a href="https://client.moderatecontent.com" target="_blank">https://client.moderatecontent.com/</a>';
echo '<i class="icon icon-times" title="图片审查moderatecontent未填写">moderatecontent key</i><br />';
} else {
echo '图片检查 moderatecontent key已填写';
echo '<i class="icon icon-check" title="图片审查moderatecontent已填写">Moderatecontent Key</i><br/>';
}
?>
</p>

View File

@ -16,7 +16,7 @@ if (isset($_POST['del_total'])) {
@deldir($_POST['del_total']);
echo '
<script>
new $.zui.Messager("删除统计成功!", {type: "success" // 定义颜色主题
new $.zui.Messager("重新统计成功!", {type: "success" // 定义颜色主题
}).show();
</script>
';
@ -72,61 +72,88 @@ if (is_array($char_data)) {
</div>
</div>
<div class="col-md-12 col-xs-12">
<div class="col-md-6 col-xs-12">
<div class="col-md-3 col-xs-3 alert alert-success autoshadow">今日上传
<div class="col-xs-3 alert alert-success autoshadow">今日上传
<hr />
<?php printf("%u 张", preg_replace('/\D/s', '', $char_data['number'][0])); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-success autoshadow">昨日上传
<div class="col-xs-3 alert alert-success autoshadow">昨日上传
<hr />
<?php printf("%u 张", preg_replace('/\D/s', '', $char_data['number'][1])); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-primary autoshadow">
<div class="col-xs-3 alert alert-primary autoshadow">
累计上传
<hr />
<?php printf("%u 张", read_total_json('filenum')); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-primary autoshadow">
<div class="col-xs-3 alert alert-primary autoshadow">
缓存文件
<hr />
<?php printf("%u 张", getFileNumber(APP_ROOT . $config['path'] . 'thumbnails/')); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-primary autoshadow">
<div class="col-xs-3 alert alert-primary autoshadow">
可疑图片
<hr />
<?php printf("%u 张", getFileNumber(APP_ROOT . $config['path'] . 'suspic/')); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-primary autoshadow">
<div class="col-xs-3 alert alert-primary autoshadow">
文件夹
<hr />
<?php printf("%d 个", read_total_json('dirnum')); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-primary autoshadow">
<div class="col-xs-3 alert alert-primary autoshadow">
占用存储
<hr />
<?php echo getDistUsed(disk_total_space('.') - disk_free_space('.')); ?>
</div>
<div class="col-md-3 col-xs-3 alert alert-primary autoshadow">
<div class="col-xs-3 alert alert-primary autoshadow">
剩余空间
<hr />
<?php echo getDistUsed(disk_free_space('.')); ?>
</div>
</div>
<div class="col-md-12 col-xs-12">
<hr />
<div class="col-md-6 col-xs-12">
<div id="myPieChart" style="width:300px;height: 300px;"></div>
<span>硬盘使用量</span>
<div id="Piedisk" style="width:350px;height: 350px;"></div>
</div>
<div class="col-md-6 col-xs-12">
<div id="myPieChart" style="width:350px;height: 350px;"></div>
</div>
</div>
<div class="col-md-12 col-xs-12">
<hr />
<span>最近30日上传趋势与空间占用</span>
<div id="myLineChart" style="width: 100%;height: 300px;"></div>
<h4 style="text-align: center;">最近30日上传趋势与空间占用</h4>
</div>
</div>
<script src="<?php static_cdn(); ?>/public/static/echarts/echarts.common.min.js"></script>
<script src="<?php static_cdn(); ?>/public/static/echarts/echarts.min.js"></script>
<script>
// 基于准备好的dom初始化echarts实例
var myChart = echarts.init(document.getElementById('Piedisk'));
// 指定图表的配置项和数据
var Piedisk = {
tooltip: {
formatter: "{a} <br/>{b} : {c}%"
},
series: [{
name: '硬盘使用量',
type: 'gauge',
detail: {
valueAnimation: true,
formatter: '{value}%'
},
data: [{
value: <?php echo ceil((disk_total_space('.') - disk_free_space('.')) / disk_total_space('.') * 100); ?>,
name: '已使用'
}]
}]
};
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(Piedisk);
// 文件统计-折线图
var myChart = echarts.init(document.getElementById('myLineChart'));
window.onresize = function() {

View File

@ -16,7 +16,7 @@ if (isset($_POST['del_total'])) {
@deldir($_POST['del_total']);
echo '
<script>
new $.zui.Messager("删除统计成功!", {type: "success" // 定义颜色主题
new $.zui.Messager("重新统计成功!", {type: "success" // 定义颜色主题
}).show();
</script>
';

View File

@ -84,7 +84,14 @@ if ($handle->uploaded) {
header('Content-type:text/json');
// 上传成功后返回json数据
$imageUrl = $config['imgurl'] . config_path() . $handle->file_dst_name;
// 判断PHP版本启用删除
if (PHP_VERSION >= '7') {
$delUrl = $config['domain'] . '/application/del.php?hash=' . urlHash(config_path() . $handle->file_dst_name, 0);
} else {
$delUrl = "Sever PHP version lower 7.0 and does't support deletion";
}
$reJson = array(
"result" => "success",
"code" => 200,

View File

@ -54,10 +54,6 @@
// console
console.log("%cEasyImage 简单图床", "background: rgba(252,234,187,1);background: -moz-linear-gradient(left, rgba(252,234,187,1) 0%, rgba(175,250,77,1) 12%, rgba(0,247,49,1) 28%, rgba(0,210,247,1) 39%,rgba(0,189,247,1) 51%, rgba(133,108,217,1) 64%, rgba(177,0,247,1) 78%, rgba(247,0,189,1) 87%, rgba(245,22,52,1) 100%);background: -webkit-gradient(left top, right top, color-stop(0%, rgba(252,234,187,1)), color-stop(12%, rgba(175,250,77,1)), color-stop(28%, rgba(0,247,49,1)), color-stop(39%, rgba(0,210,247,1)), color-stop(51%, rgba(0,189,247,1)), color-stop(64%, rgba(133,108,217,1)), color-stop(78%, rgba(177,0,247,1)), color-stop(87%, rgba(247,0,189,1)), color-stop(100%, rgba(245,22,52,1)));background: -webkit-linear-gradient(left, rgba(252,234,187,1) 0%, rgba(175,250,77,1) 12%, rgba(0,247,49,1) 28%, rgba(0,210,247,1) 39%, rgba(0,189,247,1) 51%, rgba(133,108,217,1) 64%, rgba(177,0,247,1) 78%, rgba(247,0,189,1) 87%, rgba(245,22,52,1) 100%);background: -o-linear-gradient(left, rgba(252,234,187,1) 0%, rgba(175,250,77,1) 12%, rgba(0,247,49,1) 28%, rgba(0,210,247,1) 39%, rgba(0,189,247,1) 51%, rgba(133,108,217,1) 64%, rgba(177,0,247,1) 78%, rgba(247,0,189,1) 87%, rgba(245,22,52,1) 100%);background: -ms-linear-gradient(left, rgba(252,234,187,1) 0%, rgba(175,250,77,1) 12%, rgba(0,247,49,1) 28%, rgba(0,210,247,1) 39%, rgba(0,189,247,1) 51%, rgba(133,108,217,1) 64%, rgba(177,0,247,1) 78%, rgba(247,0,189,1) 87%, rgba(245,22,52,1) 100%);background: linear-gradient(to right, rgba(252,234,187,1) 0%, rgba(175,250,77,1) 12%, rgba(0,247,49,1) 28%, rgba(0,210,247,1) 39%, rgba(0,189,247,1) 51%, rgba(133,108,217,1) 64%, rgba(177,0,247,1) 78%, rgba(247,0,189,1) 87%, rgba(245,22,52,1) 100%);filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#f51634', GradientType=1 );font-size:2.34em;font-weight:bold")
console.log('%c图床演示网站 https://img.545141.com/ \n本程序由 Icret 独自开发并完全开源,碰到收费发布的请不要轻易付款;\n本人仅为程序开源创作如非法网站使用与本人无关请勿用于非法用途\n作为开发者你可以对相应的后台功能进行扩展增删改相应代码,但请保留代码中相关来源信息(例如:本人博客,邮箱等)。\n请为本人博客 https://www.545141.com/ 加上链接,谢谢尊重!%c ', 'color: #eaad1a; padding:5px 0; border:1px solid #448ef6; font-size:12px;', '');
/**
console.log("%c图床演示网站 https://img.545141.com/ \n本程序由 Icret 独自开发并完全开源,碰到收费发布的请不要轻易付款;\n本人仅为程序开源创作,如非法网站使用与本人无关,请勿用于非法用途; ", "color: #123456;font-size:14px;");
console.log("%c作为开发者你可以对相应的后台功能进行扩展增删改相应代码,但请保留代码中相关来源信息(例如:本人博客,邮箱等)\n请为本人博客 https://www.545141.com/ 加上链接,谢谢尊重!", "color: #eaad1a;font-size:14px;font-weight:bold;");
*/
</script>
<footer class="text-muted small col-md-12" style="text-align: center;margin-bottom: 10px"><?php if ($config['ad_bot']) {echo $config['ad_bot_info'];} ?>
<?php if($config['customize']){echo $config['customize'];}?>

View File

@ -62,7 +62,7 @@ require_once APP_ROOT . '/application/total_files.php';
if (is_online()) {
echo '
<li class="' . getActive('admin.inc') . '";><a href="' . $config['domain'] . '/admin/admin.inc.php' . '"><i class="icon icon-cogs"> 网站设置</i></a></li>
<li class="' . getActive('counts') . '";><a href="' . $config['domain'] . '/admin/counts.php' . '"><i class="icon icon-pie-chart"> 上传统计</i></a></li>
<li class="' . getActive('chart') . '";><a href="' . $config['domain'] . '/admin/chart.php' . '"><i class="icon icon-pie-chart"> 上传统计</i></a></li>
';
}
?>

View File

@ -87,11 +87,10 @@ if ($handle->uploaded) {
$imageUrl = $config['imgurl'] . config_path() . $handle->file_dst_name;
// 判断PHP版本启用删除
$ver = substr(PHP_VERSION, 0, 3);
if ($ver >= '7.0') {
if (PHP_VERSION >= '7') {
$delUrl = $config['domain'] . '/application/del.php?hash=' . urlHash(config_path() . $handle->file_dst_name, 0);
} else {
$delUrl = 'PHP≥7.0 才能启用删除!';
$delUrl = "Sever PHP version lower 7.0 and does't support deletion";
}
$reJson = array(

File diff suppressed because one or more lines are too long

22
public/static/echarts/echarts.min.js vendored Executable file

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
# robots.txt
#robots.txt
User-agent: *
Disallow:
Disallow: /config/
Disallow: /admin/
Disallow: /install/
Allow: /
Disallow: /admin
Disallow: /config
Disallow: /install