mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
代码样式同步
This commit is contained in:
邹景立
parent
4b52c4d9f2
commit
b7d2d7af49
@ -69,7 +69,7 @@ class Config extends Controller
|
||||
}
|
||||
foreach ($this->request->post() as $name => $value) sysconf($name, $value);
|
||||
sysoplog('系统配置管理', "修改系统参数成功");
|
||||
$this->success('修改系统参数成功！', sysuri("{$xpath}/index/index") . '#' . url("{$xpath}/config/index"));
|
||||
$this->success('修改系统参数成功！', 'javascript:$.form.reload(true)');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -99,7 +99,7 @@ class Index extends Controller
|
||||
}
|
||||
if ($this->app->request->isGet()) {
|
||||
$this->verify = true;
|
||||
$this->_form('SystemUser', 'admin@user/pass', 'id', [], ['id' => $id]);
|
||||
SystemUser::mForm('admin@user/pass', 'id', [], ['id' => $id]);
|
||||
} else {
|
||||
$data = $this->_vali([
|
||||
'password.require' => '登录密码不能为空！',
|
||||
|
||||
@ -46,7 +46,7 @@ class Login extends Controller
|
||||
$this->title = '系统登录';
|
||||
$this->captchaType = 'LoginCaptcha';
|
||||
$this->captchaToken = CodeExtend::uniqidDate(18);
|
||||
$this->devmode = SystemService::instance()->checkRunMode();
|
||||
$this->developmentMode = SystemService::instance()->checkRunMode();
|
||||
// 刷新当前后台域名
|
||||
$host = "{$this->request->scheme()}://{$this->request->host()}";
|
||||
if ($host !== sysconf('base.site_host')) sysconf('base.site_host', $host);
|
||||
|
||||
@ -65,7 +65,7 @@ class Menu extends Controller
|
||||
// 菜单数据树数据变平化
|
||||
$data = DataExtend::arr2table($data);
|
||||
foreach ($data as &$vo) {
|
||||
if ($vo['url'] !== '#' && !preg_match('#^https?://#', $vo['url'])) {
|
||||
if ($vo['url'] !== '#' && !preg_match('/^(https?:)?(\/\/|\\\\)/i', $vo['url'])) {
|
||||
$vo['url'] = trim(url($vo['url']) . ($vo['params'] ? "?{$vo['params']}" : ''), '\\/');
|
||||
}
|
||||
$vo['ids'] = join(',', DataExtend::getArrSubIds($data, $vo['id']));
|
||||
|
||||
@ -49,11 +49,6 @@ class User extends Controller
|
||||
$this->bases = SystemBase::mk()->items('身份权限');
|
||||
}, function (QueryHelper $query) {
|
||||
|
||||
// 关联用户身份资料
|
||||
$query->with(['userinfo' => function (Relation $relation) {
|
||||
$relation->field('code,name,content');
|
||||
}]);
|
||||
|
||||
// 加载对应数据列表
|
||||
if ($this->type === 'index') {
|
||||
$query->where(['is_deleted' => 0, 'status' => 1]);
|
||||
@ -61,6 +56,11 @@ class User extends Controller
|
||||
$query->where(['is_deleted' => 0, 'status' => 0]);
|
||||
}
|
||||
|
||||
// 关联用户身份资料
|
||||
$query->with(['userinfo' => function (Relation $relation) {
|
||||
$relation->field('code,name,content');
|
||||
}]);
|
||||
|
||||
// 数据列表搜索过滤
|
||||
$query->equal('status,usertype')->dateBetween('login_at,create_at');
|
||||
$query->like('username,nickname,contact_phone#phone,contact_mail#mail');
|
||||
|
||||
@ -97,14 +97,14 @@ class Runtime extends Controller
|
||||
public function config()
|
||||
{
|
||||
if (AdminService::instance()->isSuper()) try {
|
||||
$this->app->db->transaction(function () {
|
||||
[$tmpdata, $newdata] = [[], []];
|
||||
foreach (SystemConfig::mk()->order('type,name asc')->cursor() as $item) {
|
||||
$tmpdata[$item['type']][$item['name']] = $item['value'];
|
||||
}
|
||||
foreach ($tmpdata as $type => $items) foreach ($items as $name => $value) {
|
||||
$newdata[] = ['type' => $type, 'name' => $name, 'value' => $value];
|
||||
}
|
||||
[$tmpdata, $newdata] = [[], []];
|
||||
foreach (SystemConfig::mk()->order('type,name asc')->cursor() as $item) {
|
||||
$tmpdata[$item['type']][$item['name']] = $item['value'];
|
||||
}
|
||||
foreach ($tmpdata as $type => $items) foreach ($items as $name => $value) {
|
||||
$newdata[] = ['type' => $type, 'name' => $name, 'value' => $value];
|
||||
}
|
||||
$this->app->db->transaction(function () use ($newdata) {
|
||||
SystemConfig::mQuery()->empty()->insertAll($newdata);
|
||||
});
|
||||
$this->app->cache->delete('SystemConfig');
|
||||
|
||||
@ -186,7 +186,7 @@ class Upload extends Controller
|
||||
|
||||
/**
|
||||
* 获取本地文件对象
|
||||
* @return UploadedFile
|
||||
* @return UploadedFile|void
|
||||
*/
|
||||
private function getFile(): UploadedFile
|
||||
{
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="login-container" data-supersized="__ROOT__/static/theme/img/login/bg1.jpg,__ROOT__/static/theme/img/login/bg2.jpg">
|
||||
<div class="header notselect layui-hide-xs">
|
||||
<a href="{:url('@')}" class="title">{:sysconf('app_name')}<span>{:sysconf('app_version')}</span></a>
|
||||
{notempty name='devmode'}
|
||||
{notempty name='developmentMode'}
|
||||
<a class="pull-right layui-anim layui-anim-fadein" href='https://gitee.com/zoujingli/ThinkAdmin'>
|
||||
<img src='https://gitee.com/zoujingli/ThinkAdmin/widgets/widget_1.svg' alt='Fork me on Gitee'>
|
||||
</a>
|
||||
@ -38,10 +38,10 @@
|
||||
</ul>
|
||||
</form>
|
||||
<div class="footer notselect">
|
||||
<p class="layui-hide-xs"><a target="_blank" href="https://www.google.cn/chrome">推荐使用谷歌浏览器</a></p>
|
||||
<p class="layui-hide-xs">推荐使用 <a target="_blank" href="https://www.google.cn/chrome">Google Chrome</a> 或 <a target="_blank" href="https://www.microsoft.com/zh-cn/edge#platform">Microsoft Edge</a> 浏览器访问</p>
|
||||
{:sysconf('site_copy')}
|
||||
{if sysconf('beian')}<span class="padding-5">|</span><a target="_blank" href="http://beian.miit.gov.cn">{:sysconf('beian')}</a>{/if}
|
||||
{if sysconf('miitbeian')}<span class="padding-5">|</span><a target="_blank" href="http://beian.miit.gov.cn">{:sysconf('miitbeian')}</a>{/if}
|
||||
{if sysconf('beian')}<span class="padding-5">|</span><a target="_blank" href="https://beian.miit.gov.cn/">{:sysconf('beian')}</a>{/if}
|
||||
{if sysconf('miitbeian')}<span class="padding-5">|</span><a target="_blank" href="https://beian.miit.gov.cn/">{:sysconf('miitbeian')}</a>{/if}
|
||||
</div>
|
||||
</div>
|
||||
{/block}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<ul class="layui-tab-title">
|
||||
{foreach ['index'=>'系统菜单','recycle'=>'回 收 站'] as $k=>$v}
|
||||
{if isset($type) and $type eq $k}
|
||||
<li class="layui-this" data-open="{:url('index')}?type={$k}">{$v}</li>
|
||||
<li class="layui-this color-green" data-open="{:url('index')}?type={$k}">{$v}</li>
|
||||
{else}
|
||||
<li data-open="{:url('index')}?type={$k}">{$v}</li>
|
||||
{/if}{/foreach}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<div class="layui-tab layui-tab-card">
|
||||
<ul class="layui-tab-title">
|
||||
{foreach ['index'=>'系统用户','recycle'=>'回 收 站'] as $k=>$v}{if isset($type) and $type eq $k}
|
||||
<li data-open="{:url('index')}?type={$k}" class="layui-this">{$v}</li>
|
||||
<li data-open="{:url('index')}?type={$k}" class="layui-this color-green">{$v}</li>
|
||||
{else}
|
||||
<li data-open="{:url('index')}?type={$k}">{$v}</li>
|
||||
{/if}{/foreach}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user