blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-07-09 14:43:31 +08:00
parent 60a59b1601
commit 1f127304e9
8 changed files with 125 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,3 +7,5 @@
/nbproject /nbproject
/composer.lock /composer.lock
/public/upload /public/upload
/public/static/theme/css/node_modules/
/public/static/theme/css/package-lock.json

4
app/admin/controller/Config.php
View File

@ -16,6 +16,7 @@
namespace app\admin\controller; namespace app\admin\controller;
use think\admin\Controller; use think\admin\Controller;
use think\admin\service\AdminService;
use think\admin\service\SystemService; use think\admin\service\SystemService;
/** /**
@ -56,7 +57,7 @@ class Config extends Controller
'oss-ap-south-1.aliyuncs.com' => '亚太南部 1（孟买）', 'oss-ap-south-1.aliyuncs.com' => '亚太南部 1（孟买）',
'oss-eu-central-1.aliyuncs.com' => '欧洲中部 1（法兰克福）', 'oss-eu-central-1.aliyuncs.com' => '欧洲中部 1（法兰克福）',
'oss-eu-west-1.aliyuncs.com' => '英国（伦敦）', 'oss-eu-west-1.aliyuncs.com' => '英国（伦敦）',
'oss-me-east-1.aliyuncs.com' => '中东东部 1（迪拜）' 'oss-me-east-1.aliyuncs.com' => '中东东部 1（迪拜）',
]; ];
/** /**
@ -67,6 +68,7 @@ class Config extends Controller
public function index() public function index()
{ {
$this->title = '系统参数配置'; $this->title = '系统参数配置';
$this->isSuper = AdminService::instance()->isSuper();
$this->fetch(); $this->fetch();
} }

84
app/admin/view/config/index.html
View File

@ -3,14 +3,6 @@
{block name="button"} {block name="button"}
{if session('user.username') eq 'admin'} {if session('user.username') eq 'admin'}
<div class="layui-form inline-block think-switch-button margin-right-10">
<!--{if $app->isDebug()}-->
<input type="checkbox" lay-skin="switch" lay-text="生产模式|开发模式" lay-filter="ThinkAdminDebug">
<!--{else}-->
<input type="checkbox" lay-skin="switch" lay-text="生产模式|开发模式" lay-filter="ThinkAdminDebug" checked>
<!--{/if}-->
<script>form.render()</script>
</div>
<a class="layui-btn layui-btn-sm layui-btn-primary" data-queue="{:url('admin/api.plugs/optimize')}">优化数据库</a> <a class="layui-btn layui-btn-sm layui-btn-primary" data-queue="{:url('admin/api.plugs/optimize')}">优化数据库</a>
{/if} {/if}
@ -22,75 +14,98 @@
{block name="content"} {block name="content"}
<div class="think-box-shadow padding-40 padding-top-20 padding-bottom-20 margin-bottom-15"> {notempty name='isSuper'}
<div class="layui-form-item margin-bottom-5"> <div class="layui-card padding-20">
<span class="color-green font-w7">存储引擎 Storage</span> <div class="layui-card-header">
<div class="padding-top-5"> <b>运行模式</b><span class="color-desc font-s12 padding-left-5">Run Mode</span>
{foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','alioss'=>'阿里云OSS存储'] as $k => $v}
{if sysconf('storage.type') eq $k}
{if auth('storage')}<a data-title="配置{$v}" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
{else}
{if auth('storage')}<a data-title="配置{$v}" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
{/if}
{/foreach}
</div> </div>
<div class="layui-card-body nowrap">
{if $app->isDebug()}
<a class="layui-btn layui-btn-sm" data-tips-text="当前以开发模式运行中...">以开发模式运行</a>
<a class="layui-btn layui-btn-sm layui-btn-primary" data-tips-text="立即切换到生产模式" data-load="{:url('admin/api.plugs/debug')}?state=1">以生产模式运行</a>
{else}
<a class="layui-btn layui-btn-sm layui-btn-primary" data-tips-text="立即切换到开发模式" data-load="{:url('admin/api.plugs/debug')}?state=0">以开发模式运行</a>
<a class="layui-btn layui-btn-sm" data-tips-text="当前以生产模式运行中...">以生产模式运行</a>
{/if}
</div>
</div>
{/notempty}
<div class="layui-card padding-20">
<div class="layui-card-header">
<b>存储引擎</b><span class="color-desc font-s12 padding-left-5">Storage Engine</span>
</div>
<div class="layui-card-body nowrap">
{foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','alioss'=>'阿里云OSS存储'] as $k => $v} {if sysconf('storage.type') eq $k}
{if auth('storage')}<a data-title="配置{$v}" data-tips-text="配置当前的{$v}" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm">{$v}</a>{else}<a class="layui-btn layui-btn-sm layui-btn-sm">{$v}</a>{/if}
{else}
{if auth('storage')}<a data-title="配置{$v}" data-tips-text="切换并配置{$v}" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
{/if} {/foreach}
</div> </div>
</div> </div>
<div class="think-box-shadow padding-40 padding-top-30 padding-bottom-20 margin-bottom-15"> <div class="layui-card padding-20">
<div class="layui-card-header">
<b>系统参数</b><span class="color-desc font-s12 padding-left-5">System Parameter</span>
</div>
<div class="layui-card-body">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="color-green font-w7">网站名称 Website</div> <span class="color-green font-w7">网站名称</span><span class="margin-left-5 color-desc">Website</span>
<label class="relative block"> <label class="relative block">
<input readonly value="{:sysconf('site_name')}" class="layui-input layui-bg-gray"> <input readonly value="{:sysconf('site_name')}" class="layui-input layui-bg-gray">
<a data-copy="{:sysconf('site_name')}" class="fa fa-copy input-right-icon"></a> <a data-copy="{:sysconf('site_name')}" class="fa fa-copy input-right-icon"></a>
</label> </label>
<div class="help-block">网站名称及网站图标，将显示在浏览器的标签上</div> <div class="help-block">网站名称及网站图标，将显示在浏览器的标签上。</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="color-green font-w7">管理程序名称 Name</div> <span class="color-green font-w7">管理程序名称</span><span class="margin-left-5 color-desc">Name</span>
<label class="relative block"> <label class="relative block">
<input readonly placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input layui-bg-gray"> <input readonly placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input layui-bg-gray">
<a data-copy="{:sysconf('app_name')}" class="fa fa-copy input-right-icon"></a> <a data-copy="{:sysconf('app_name')}" class="fa fa-copy input-right-icon"></a>
</label> </label>
<div class="help-block">管理程序名称，将显示在后台左上角标题</div> <div class="help-block">管理程序名称，将显示在后台左上角标题。</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="color-green font-w7">管理程序版本 Version</div> <span class="color-green font-w7">管理程序版本</span><span class="margin-left-5 color-desc">Version</span>
<label class="relative block"> <label class="relative block">
<input readonly value="{:sysconf('app_version')}" class="layui-input layui-bg-gray"> <input readonly value="{:sysconf('app_version')}" class="layui-input layui-bg-gray">
<a data-copy="{:sysconf('app_version')}" class="fa fa-copy input-right-icon"></a> <a data-copy="{:sysconf('app_version')}" class="fa fa-copy input-right-icon"></a>
</label> </label>
<div class="help-block">管理程序版本，将显示在后台左上角标题</div> <div class="help-block">管理程序版本，将显示在后台左上角标题。</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<span class="color-green font-w7">公网备案号 Baian</span> <span class="color-green font-w7">公网备案号</span><span class="margin-left-5 color-desc">Baian</span>
<label class="relative block"> <label class="relative block">
<input readonly value="{:sysconf('beian')}" placeholder="请输入公网备案号" class="layui-input layui-bg-gray"> <input readonly value="{:sysconf('beian')}" placeholder="请输入公网备案号" class="layui-input layui-bg-gray">
<a data-copy="{:sysconf('beian')}" class="fa fa-copy input-right-icon"></a> <a data-copy="{:sysconf('beian')}" class="fa fa-copy input-right-icon"></a>
</label> </label>
<p class="help-block">公网备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将在登录页面下面显示</p> <p class="help-block">公网备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将在登录页面下面显示。</p>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="color-green font-w7">网站备案号 Miitbeian</div> <span class="color-green font-w7">网站备案号</span><span class="margin-left-5 color-desc">Miitbeian</span>
<label class="relative block"> <label class="relative block">
<input readonly value="{:sysconf('miitbeian')}" class="layui-input layui-bg-gray"> <input readonly value="{:sysconf('miitbeian')}" class="layui-input layui-bg-gray">
<a data-copy="{:sysconf('miitbeian')}" class="fa fa-copy input-right-icon"></a> <a data-copy="{:sysconf('miitbeian')}" class="fa fa-copy input-right-icon"></a>
</label> </label>
<div class="help-block">网站备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将显示在登录页面下面</div> <div class="help-block">网站备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将显示在登录页面下面。</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="color-green font-w7">网站版权信息 Copyright</div> <span class="color-green font-w7">网站版权信息</span><span class="margin-left-5 color-desc">Copyright</span>
<label class="relative block"> <label class="relative block">
<input readonly value="{:sysconf('site_copy')}" class="layui-input layui-bg-gray"> <input readonly value="{:sysconf('site_copy')}" class="layui-input layui-bg-gray">
<a data-copy="{:sysconf('site_copy')}" class="fa fa-copy input-right-icon"></a> <a data-copy="{:sysconf('site_copy')}" class="fa fa-copy input-right-icon"></a>
</label> </label>
<div class="help-block">网站版权信息，在后台登录页面显示版本信息并链接到备案到信息备案管理系统</div> <div class="help-block">网站版权信息，在后台登录页面显示版本信息并链接到备案到信息备案管理系统。</div>
</div>
</div> </div>
</div> </div>
<div class="think-box-shadow padding-40 padding-top-30 padding-bottom-30"> <div class="layui-card padding-20">
<div class="layui-card-header">
<b>系统信息</b><span class="color-desc font-s12 padding-left-5">System Information</span>
</div>
<div class="layui-card-body">
<table class="layui-table" lay-even> <table class="layui-table" lay-even>
<caption class="color-green font-w7 text-left">系统信息 System Information</caption>
<tbody> <tbody>
<tr> <tr>
<td>核心框架</td> <td>核心框架</td>
@ -119,5 +134,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
{/block} {/block}

2
public/static/theme/css/console.css
View File

File diff suppressed because one or more lines are too long

2
public/static/theme/css/console.css.map
View File

File diff suppressed because one or more lines are too long

4
public/static/theme/css/console.form.less
View File

@ -99,8 +99,8 @@ fieldset {
} }
.think-box-shadow { .think-box-shadow {
background: #fff; padding: 20px !important;
padding: 20px 20px !important; background: #fff !important;
box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .1); box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .1);
} }

2
public/static/theme/css/package.json
View File

@ -8,6 +8,6 @@
}, },
"scripts": { "scripts": {
"install": "npm install -g less less-plugin-clean-css", "install": "npm install -g less less-plugin-clean-css",
"build": "lessc --clean-css --source-map console.less console.css;\n lessc --clean-css --source-map login.less login.css" "build": "lessc --clean-css --source-map console.less console.css \n lessc --clean-css --source-map login.less login.css"
} }
} }

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-07-06 13:55:11 // This file is automatically generated at:2020-07-09 14:33:02
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',