muzi
/
apeblog
mirror of https://github.com/1099438829/apeblog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

一大波修正

This commit is contained in:
1099438829 2021-02-19 18:06:36 +08:00
parent 279bbe4cf6
commit ead8fe18d5
15 changed files with 71 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class Admin extends AuthController
$form = array();
$form[] = Elm::input('name','登录账号')->col(10);
$form[] = Elm::input('nickname','昵称')->col(10);
$form[] = Elm::frameImage('avatar','头像',Url::buildUrl('admin/widget.images/index',array('fodder'=>'avatar','limit'=>1)))->icon("ios-image")->width('96%')->height('440px')->col(10);
$form[] = Elm::frameImage('avatar','头像',Url::buildUrl('admin/images/index',array('fodder'=>'avatar','limit'=>1)))->icon("ios-image")->width('96%')->height('440px')->col(10);
$form[] = Elm::password('pwd','密码')->col(10);
$form[] = Elm::input('realname','真实姓名')->col(10);
$form[] = Elm::select('role_id','角色')->options(function(){
@ -94,7 +94,7 @@ class Admin extends AuthController
$form = array();
$form[] = Elm::input('name','登录账号',$ainfo['name'])->col(10);
$form[] = Elm::input('nickname','昵称',$ainfo['nickname'])->col(10);
$form[] = Elm::frameImage('avatar','头像',Url::buildUrl('admin/widget.images/index',array('fodder'=>'avatar','limit'=>1)),$ainfo['avatar'])->icon("ios-image")->width('96%')->height('440px')->col(10);
$form[] = Elm::frameImage('avatar','头像',Url::buildUrl('admin/images/index',array('fodder'=>'avatar','limit'=>1)),$ainfo['avatar'])->icon("ios-image")->width('96%')->height('440px')->col(10);
$form[] = Elm::password('pwd','密码',$ainfo['pwd'])->col(10);
$form[] = Elm::input('realname','真实姓名',$ainfo['realname'])->col(10);
$form[] = Elm::select('role_id','角色',$ainfo['role_id'])->options(function(){

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

@ -68,8 +68,8 @@ class Article extends AuthController
['keywords',''],
['description',''],
['type','article'],
['isrecommend',0],
['istop',0],
['is_recommend',0],
['is_top',0],
['link_str',''],
['cover_path',''],
['display',1],

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

@ -37,8 +37,10 @@ class FriendLink extends AuthController
public function lst(Request $request)
{
$where = Util::postMore([
['name',''],
['title',''],
['status',''],
['start_time',''],
['end_time',''],
['page',1],
['limit',20],
]);

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

@ -103,13 +103,11 @@ class Images extends AuthController
if ($id == "")
{
$data['create_user'] = $this->adminId;
$data['create_time'] = time();
$res = AttachmentCategory::insert($data);
$res = AttachmentCategory::save($data);
}
else
{
$data['update_user'] = $this->adminId;
$data['update_time'] = time();
$res = AttachmentCategory::update($data,['id'=>$id]);
}
return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");

18
app/admin/controller/Message.php
View File

@ -15,9 +15,21 @@ use app\admin\services\UtilService as Util;
class Message extends AuthController
{
/**
* 账号列表
* 构造方法 初始化一些参数
*/
public function initialize()
{
parent::initialize(); // TODO: Change the autogenerated stub
//修正因为修改model名称和原来不能对应导致的model功能异常
$this->model = new aModel();
}
/**
* 留言管理
* @return string
* @throws \Exception
* @author 李玉坤
* @date 2021-02-19 11:53
*/
public function index()
{
@ -25,14 +37,14 @@ class Message extends AuthController
}
/**
* 文章列表
* 留言列表
* @param Request $request
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author 李玉坤
* @date 2021-02-15 23:26
* @date 2021-02-19 11:54
*/
public function lst(Request $request)
{

3
app/admin/model/DocumentCategory.php
View File

@ -14,6 +14,9 @@ use app\admin\model\BaseModel;
*/
class DocumentCategory extends BaseModel
{
// 开启自动写入时间戳字段
protected $autoWriteTimestamp = 'datetime';
/**
* 列表
* @param $where

4
app/admin/model/FriendLink.php
View File

@ -27,6 +27,10 @@ class FriendLink extends BaseModel
public static function systemPage($where): array
{
$model = new self;
if ($where['title'] != '') $model = $model->where("title|url","like","%$where[title]%");
if ($where['start_time'] != '') $model = $model->where("create_time",">",strtotime($where['start_time']." 00:00:00"));
if ($where['end_time'] != '') $model = $model->where("create_time","<", strtotime($where['end_time']." 23:59:59"));
if ($where['status'] != '') $model = $model->where("status",$where['status']);
$count = self::counts($model);
if ($where['page'] && $where['limit']) $model = $model->page((int)$where['page'],(int)$where['limit']);
$data = $model->select();

59
app/admin/view/article/index.html
View File

@ -137,65 +137,6 @@
},
events : {
'click .btn-edit': function (e, value, row, index) {
var rule_name = row.rule_name.replace('{$}','xx');
var content = '<form action="" class="form-inline searchForm">' +
' <div class="form-group">';
if (row.rule_name.indexOf('{$}')>-1){
//开始替换值
//切割字符串为数组
var arr = row.rule_name.split("{$}");
for (i = 0; i < arr.length; i++) {
content+=' <span>'+arr[i]+'</span>\n';
if (i < arr.length-1){
content+= ' <input class="form-control value" type="text" name="value[]" style="width: 15%;">\n';
}
}
content += '</div>'
'</form>';
}else{
$.alert('此规则不支持修改');
return false;
}
$.confirm({
title: '修改规则',
content: content,
buttons: {
formSubmit: {
text: '确定',
btnClass: 'btn-primary',
action: function () {
var vals = this.$content.find('form').serializeArray();
var vals = $('form').serializeArray();
var data = [];
$.each(vals, function () {
if (!this.value){
$.alert('值不能为空');
return false;
}
data.push(this.value);
});
$.post(url="/admin/pushRule/update",data={"rule_value":data.toString(),"id":row.id},function (res) {
if (res.code == 200 || res.status == 200) {
parent.lightyear.notify('操作成功', 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
$("#tb_departments").bootstrapTable('refresh',{query:{page:1},pageNumber:1});
} else{
parent.lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
}
});
}
},
cancel: {
text: '取消'
},
},
onContentReady: function () {
var jc = this;
this.$content.find('form').on('submit', function (e) {
e.preventDefault();
jc.$$formSubmit.trigger('click');
});
}
});
}
}
}],

14
app/admin/view/category/index.html
View File

@ -123,7 +123,7 @@
align: 'center',
events : {
'click .role-add': function (e, value, row, index) {
iframe.createIframe('添加权限','/admin/admin_auth/add?pid='+row.id);
iframe.createIframe('添加权限','/admin/category/add?pid='+row.id);
},
'click .role-delete': function (e, value, row, index) {
$.alert({
@ -134,7 +134,7 @@
text: '确认',
btnClass: 'btn-primary',
action: function(){
$.post(url="/admin/admin_auth/del",data={"id":row.id},function (res) {
$.post(url="/admin/category/del",data={"id":row.id},function (res) {
if (res.status == 200) {parent.lightyear.notify('删除成功', 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');$(".tree-table").bootstrapTable('refresh');}
else parent.lightyear.notify('删除失败', 'danger', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
});
@ -147,7 +147,7 @@
});
},
'click .role-edit': function (e, value, row, index) {
iframe.createIframe('修改权限','/admin/admin_auth/edit?id='+row.id)
iframe.createIframe('修改权限','/admin/category/edit?id='+row.id)
}
},
formatter: operateFormatter
@ -220,7 +220,7 @@
var newstate = (value == 1) ? 0 : 1; // 发送参数值跟当前参数值相反
$.ajax({
type: "post",
url: "/admin/admin_auth/field?id="+id,
url: "/admin/category/field?id="+id,
data: {field: field, value: newstate},
dataType: 'json',
success: function (res) {
@ -252,7 +252,7 @@
text: '确认',
btnClass: 'btn-danger',
action: function () {
$.post("/admin/admin_auth/del",data={id:checkID},function (res) {
$.post("/admin/category/del",data={id:checkID},function (res) {
if (res.status == 200){ lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');location.reload();}
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
})
@ -287,14 +287,14 @@
action: function () {
if (type == 'enable')
{
$.post("/admin/admin_auth/enabled",data={id:checkID},function (res) {
$.post("/admin/category/enabled",data={id:checkID},function (res) {
if (res.status == 200) {lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');location.reload();}
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
})
}else
{
$.post("/admin/admin_auth/disabled",data={id:checkID},function (res) {
$.post("/admin/category/disabled",data={id:checkID},function (res) {
if (res.status == 200) {lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');location.reload();}
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
})

22
app/admin/view/friendlink/index.html
View File

@ -13,20 +13,20 @@
<div class="card-body">
<form class="form-inline searchForm" onsubmit="return false;">
<div class="form-group">
<label for="name">操作人</label>
<label for="title">链接名称</label>
<div class="input-group">
<div class="input-group">
<input type="text" class="form-control" id="name" name="name" placeholder="请输入操作人名称，ID">
<input type="text" class="form-control" id="title" name="title" placeholder="请输入链接名称或url">
</div>
</div>
</div>
<div class="form-group">
<label for="ip">来访IP</label>
<div class="input-group">
<div class="input-group">
<input type="text" class="form-control" id="ip" name="ip" placeholder="IP地址">
</div>
</div>
<label for="status">状态</label>
<select name="status" id="status" class="form-control">
<option value="">所有</option>
<option value="1">启用</option>
<option value="0">禁用</option>
</select>
</div>
<div class="form-group">
<label for="start_time">操作时间</label>
@ -45,8 +45,10 @@
<div class="card">
<div class="card-toolbar clearfix">
<div class="toolbar-btn-action">
<button id="btn_add" type="button" class="btn btn-primary m-r-5" onclick="iframe.createIframe('添加用户','/admin/admin/add')">
<span class="mdi mdi-plus" aria-hidden="true"></span>新增
</button>
<a class="btn btn-warning" href="#!" onclick="delSelect()"><i class="mdi mdi-window-close"></i> 删除</a>
<a class="btn btn-danger" href="#!" onclick="delAll()"><i class="mdi mdi-window-close"></i> 全部删除</a>
</div>
</div>
<div class="card-body">
@ -107,7 +109,7 @@
}
}, {
field: 'create_time',
title: '创建时间',
title: '添加时间',
}, {
field: 'create_time',
title: '更新时间',

17
app/admin/view/images/index.html
View File

@ -1,17 +1,8 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<title>选择图片 - {:system_config("title")}后台管理系统</title>
<link rel="icon" href="{:system_config("favicon")}" type="image/ico">
<meta name="keywords" content="{:system_config("keywords")}">
<meta name="description" content="{:system_config("description")}">
<meta name="author" content="{:system_config("author")}">
<link rel="stylesheet" href="__ADMIN_PATH__js/bootstrap-treeview/bootstrap.min.css">
<link rel="stylesheet" href="__ADMIN_PATH__js/jconfirm/jquery-confirm.min.css">
<link rel="stylesheet" href="__ADMIN_PATH__js/bootstrap-treeview/bootstrap-treeview.min.css">
<script type="text/javascript" src="__ADMIN_PATH__js/iframe.js"></script>
{include file="public/header" /}
<style>
.list-group-item{
border: 0px !important;
@ -185,11 +176,7 @@
</div>
<input id="fileUpload" type="file" name="file" style="display: none;" @change="upload" accept="image/*">
</div>
<script type="text/javascript" src="__ADMIN_PATH__js/jquery.min.js"></script>
<script type="text/javascript" src="__ADMIN_PATH__js/bootstrap.min.js"></script>
<script type="text/javascript" src="__ADMIN_PATH__js/bootstrap-notify.min.js"></script>
<script type="text/javascript" src="__ADMIN_PATH__js/jconfirm/jquery-confirm.min.js"></script>
<script type="text/javascript" src="__ADMIN_PATH__js/lightyear.js"></script>
{include file="public/footer"/}
<script type="text/javascript" src="__ADMIN_PATH__js/bootstrap-treeview/bootstrap-treeview.min.js"></script>
<script type="text/javascript" src="__ADMIN_PATH__js/vue/vue.js"></script>
<script type="text/javascript" src="__ADMIN_PATH__js/vue-page/pageination.js"></script>

28
app/admin/view/invitation/index.html
View File

@ -37,8 +37,10 @@
<div class="card">
<div class="card-toolbar clearfix">
<div class="toolbar-btn-action">
<button id="btn_add" type="button" class="btn btn-primary m-r-5" onclick="iframe.createIframe('添加用户','/admin/admin/add')">
<span class="mdi mdi-plus" aria-hidden="true"></span>新增
</button>
<a class="btn btn-warning" href="#!" onclick="delSelect()"><i class="mdi mdi-window-close"></i> 删除</a>
<a class="btn btn-danger" href="#!" onclick="delAll()"><i class="mdi mdi-window-close"></i> 全部删除</a>
</div>
</div>
<div class="card-body">
@ -146,30 +148,6 @@
}
});
}
function delAll() {
$.confirm({
title: '重要提醒!',
content: '清空后将不可恢复，请谨慎操作!',
backgroundDismiss: true,
buttons: {
ok: {
text: '确认',
btnClass: 'btn-danger',
action: function () {
$.post("/admin/admin_log/empty",data={},function (res) {
if (res.status == 200 || res.code == 200) lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
location.reload();
})
}
},
cancel: {
text: '取消',
btnClass: 'btn-primary'
}
}
});
}
function delSelect() {
var checkID = "";

29
app/admin/view/message/index.html
View File

@ -54,7 +54,6 @@
<div class="card-toolbar clearfix">
<div class="toolbar-btn-action">
<a class="btn btn-warning" href="#!" onclick="delSelect()"><i class="mdi mdi-window-close"></i> 删除</a>
<a class="btn btn-danger" href="#!" onclick="delAll()"><i class="mdi mdi-window-close"></i> 全部删除</a>
</div>
</div>
<div class="card-body">
@ -179,31 +178,7 @@
text: '确认',
btnClass: 'btn-danger',
action: function () {
$.post("/admin/admin_log/del",data={id:id},function (res) {
if (res.status == 200 || res.code == 200) lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
location.reload();
})
}
},
cancel: {
text: '取消',
btnClass: 'btn-primary'
}
}
});
}
function delAll() {
$.confirm({
title: '重要提醒!',
content: '清空后将不可恢复，请谨慎操作!',
backgroundDismiss: true,
buttons: {
ok: {
text: '确认',
btnClass: 'btn-danger',
action: function () {
$.post("/admin/admin_log/empty",data={},function (res) {
$.post("/admin/message/del",data={id:id},function (res) {
if (res.status == 200 || res.code == 200) lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
location.reload();
@ -236,7 +211,7 @@
text: '确认',
btnClass: 'btn-danger',
action: function () {
$.post("/admin/admin_log/del",data={id:checkID},function (res) {
$.post("/admin/message/del",data={id:checkID},function (res) {
if (res.status == 200 || res.code == 200) { lightyear.notify(res.msg, 'success', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');location.reload();}
else lightyear.notify(res.msg, 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
})

20
app/admin/view/slides/index.html
View File

@ -36,9 +36,11 @@
<div class="col-lg-12">
<div class="card">
<div class="card-toolbar clearfix">
<div class="toolbar-btn-action">
<div id="toolbar" class="toolbar-btn-action">
<button id="btn_add" type="button" class="btn btn-primary m-r-5" onclick="iframe.createIframe('添加用户','/admin/admin/add')">
<span class="mdi mdi-plus" aria-hidden="true"></span>新增
</button>
<a class="btn btn-warning" href="#!" onclick="delSelect()"><i class="mdi mdi-window-close"></i> 删除</a>
<a class="btn btn-danger" href="#!" onclick="delAll()"><i class="mdi mdi-window-close"></i> 全部删除</a>
</div>
</div>
<div class="card-body">
@ -103,10 +105,7 @@
}, {
field: 'operate',
title: '操作',
formatter:function (value,row,index) {
let html ='<a class="btn btn-xs btn-default btn-del" href="#!" title="删除" data-toggle="tooltip" onclick="delOne('+row.id+')"><i class="mdi mdi-window-close"></i></a>';
return html;
}
formatter:operateFormatter
}],
onLoadSuccess: function(data){
$("[data-toggle='tooltip']").tooltip();
@ -124,6 +123,15 @@
$("#tb_departments").bootstrapTable('refresh',{query:{page:1},pageNumber:1});
});
// 操作按钮
function operateFormatter(value, row, index) {
return [
'<a type="button" class="role-add btn btn-xs btn-default m-r-5" title="编辑" data-toggle="tooltip"><i class="mdi mdi-plus"></i></a>',
'<a type="button" class="role-edit btn btn-xs btn-default m-r-5" title="修改" data-toggle="tooltip"><i class="mdi mdi-pencil"></i></a>',
'<a type="button" class="role-delete btn btn-xs btn-default" title="删除" data-toggle="tooltip"><i class="mdi mdi-delete"></i></a>'
].join('');
}
function delOne(id) {
$.confirm({
title: '重要提醒!',

2
config/database.php
View File

@ -10,7 +10,7 @@ return [
// 自动写入时间戳字段
// true为自动识别类型 false关闭
// 字符串则明确指定时间字段类型 支持 int timestamp datetime date
'auto_timestamp' => true,
'auto_timestamp' => 'datetime',
// 时间字段取出后的默认时间格式
'datetime_format' => 'Y-m-d H:i:s',