yunzerwebsite/yunzer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.yunzer.cn/yunzerwebsite/yunzer

Browse Source
This commit is contained in:
云泽网
2025-07-03 19:33:58 +08:00
parent 7f7ff6be06 7aa55a7c1c
commit e25a0e4736
34 changed files with 4011 additions and 10281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/ResourcesController.php
+9 -14
View File
@@ -139,25 +139,20 @@ class ResourcesController extends BaseController
$this->error('添加失败');
}
Log::record('添加资源', 1, '', '资源管理');
return View::fetch('lists');
}
try {
// 获取资源列表
$lists = Resource::where('delete_time', null)
->where('status', '<>', 3)
return json(['code' => 0, 'msg' => '添加成功', 'data' => []]);
} else {
// 获取所有分类
$allCategories = ResourceCategory::where('delete_time', null)
->where('status', 1)
->field('id, name, cid, icon, number')
->order('sort asc, id asc')
->select()
->toArray();
// 确保变量存在且不为空
if (!isset($lists) || empty($lists)) {
$lists = [];
}
$categories = $this->buildParentChild($allCategories);
// 传递数据到视图
View::assign([
'lists' => $lists,
'categories' => [] // 添加空的分类数组
'categories' => $categories
]);
return View::fetch();
app/admin/controller/YunzeradminController.php
+443 -2
View File
@@ -25,8 +25,11 @@ use app\admin\controller\LogController as Log;
use app\admin\model\AdminSysMenu;
use app\admin\model\AdminUserGroup;
use app\admin\model\AdminUser;
use app\admin\model\User\Users;
use app\admin\model\User\UsersGroup;
use app\admin\model\Banner;
use app\admin\model\ContentPush;
use app\admin\model\ContentPush\ContentPush;
use app\admin\model\ContentPush\ContentPushSetting;
class YunzeradminController extends Base
@@ -332,6 +335,208 @@ class YunzeradminController extends Base
}
}
// 前端会员列表
public function frontuser()
{
$lists = Users::select();
$group = [];
$groups = UsersGroup::select();
foreach ($groups as $key => $value) {
$group[$value['group_id']] = $value['group_name'];
}
// 替换 group_id 为 group_name
foreach ($lists as &$user) {
$gid = $user['group_id'] ?? 0;
$user['group_id'] = isset($group[$gid]) ? $group[$gid] : '';
}
unset($user);
if (request()->isAjax()) {
return json([
'code' => 0,
'msg' => '',
'count' => count($lists),
'data' => $lists
]);
}
View::assign([
'lists' => $lists,
'group' => $group
]);
return View::fetch();
}
// 前端会员添加
public function frontuseradd()
{
if (Request::isPost()) {
$data['account'] = trim(input('post.account'));
if (empty($data['account'])) {
Log::record('添加管理员', 0, '账号不能为空', '管理员管理');
return json(['code' => 1, 'msg' => '账号不能为空']);
}
$pattern = "/^([0-9A-Za-z-_.]+)@([0-9a-z]+.[a-z]{2,3}(.[a-z]{2})?)$/i";
if (!preg_match($pattern, $data['account'])) {
Log::record('添加管理员', 0, '邮箱格式不正确', '管理员管理');
return json(['code' => 1, 'msg' => '邮箱格式不正确']);
}
$item = Users::where('account', $data['account'])->find();
if ($item) {
Log::record('添加管理员', 0, '该账号已存在', '管理员管理');
return json(['code' => 1, 'msg' => '该账号已存在']);
}
$data['name'] = trim(input('post.name'));
$data['phone'] = trim(input('post.phone'));
$data['qq'] = (int) trim(input('post.qq'));
$data['group_id'] = (int) input('post.group_id');
$data['sex'] = (int) (input('post.sex'));
$data['status'] = (int) (input('post.status'));
$password = trim(input('post.password'));
if (empty($data['name'])) {
Log::record('添加管理员', 0, '姓名不能为空', '管理员管理');
return json(['code' => 1, 'msg' => '姓名不能为空']);
}
if (empty($data['phone'])) {
Log::record('添加管理员', 0, '手机号不能为空', '管理员管理');
return json(['code' => 1, 'msg' => '手机号不能为空']);
}
if (empty($data['group_id'])) {
Log::record('添加管理员', 0, '请选择角色', '管理员管理');
return json(['code' => 1, 'msg' => '请选择角色']);
}
if (empty($password)) {
Log::record('添加管理员', 0, '密码不能为空', '管理员管理');
return json(['code' => 1, 'msg' => '密码不能为空']);
} else {
$data['password'] = md5($password);
}
$data['create_time'] = time();
$data['update_time'] = time();
$res = Users::insert($data);
if (!$res) {
Log::record('添加管理员', 0, '添加管理员失败', '管理员管理');
return json(['code' => 1, 'msg' => '添加管理员失败']);
}
Log::record('添加管理员', 1, '', '管理员管理');
return json(['code' => 0, 'msg' => '添加成功']);
} else {
$group = [];
$groups = UsersGroup::select();
foreach ($groups as $key => $value) {
$group[$value['group_id']] = $value;
}
View::assign([
'group' => $group
]);
return View::fetch();
}
}
// 前端会员编辑
public function frontuseredit()
{
if (Request::isPost()) {
$uid = (int) trim(input('post.uid'));
$data['name'] = trim(input('post.name'));
$data['phone'] = trim(input('post.phone'));
$data['qq'] = (int) trim(input('post.qq'));
$data['group_id'] = (int) input('post.group_id');
$data['sex'] = (int) (input('post.sex'));
$data['status'] = (int) (input('post.status'));
if (empty($data['name'])) {
Log::record('编辑管理员', 0, '姓名不能为空', '管理员管理');
return json(['code' => 1, 'msg' => '姓名不能为空']);
}
if (empty($data['phone'])) {
Log::record('编辑管理员', 0, '手机号不能为空', '管理员管理');
return json(['code' => 1, 'msg' => '手机号不能为空']);
}
if (empty($data['group_id'])) {
Log::record('编辑管理员', 0, '请选择角色', '管理员管理');
return json(['code' => 1, 'msg' => '请选择角色']);
}
$res = Users::where('uid', $uid)->update($data);
if (!$res) {
Log::record('编辑管理员', 0, '更新管理员信息失败', '管理员管理');
return json(['code' => 1, 'msg' => '更新管理员信息失败']);
}
Log::record('编辑管理员', 1, '', '管理员管理');
return json(['code' => 0, 'msg' => '更新成功']);
} else {
$uid = (int) input('get.uid');
// 加载前端会员
$lists = Users::where('uid', $uid)->find();
// 加载角色
$group = [];
$groups = UsersGroup::select();
foreach ($groups as $key => $value) {
$group[$value['group_id']] = $value;
}
View::assign([
'lists' => $lists,
'group' => $group
]);
return View::fetch();
}
}
// 前端会员删除
public function frontuserdel()
{
$uid = (int) input('post.uid');
$res = Users::where('uid', $uid)->delete();
if (empty($res)) {
Log::record('删除管理员', 0, '删除管理员失败', '管理员管理');
return json(['code' => 1, 'msg' => '删除管理员失败']);
}
Log::record('删除管理员', 1, '', '管理员管理');
return json(['code' => 0, 'msg' => '删除成功']);
}
// 前端会员信息
public function frontuserdetail()
{
if (Request::isPost()) {
$find = Users::where('uid', $this->adminId)->find();
if (empty($find)) {
Log::record('修改个人信息', 0, '当前账户不存在', '个人信息');
return json(['code' => 1, 'msg' => '当前账户不存在']);
}
$data['name'] = trim(input('post.name'));
$data['phone'] = trim(input('post.phone'));
$data['qq'] = (int) trim(input('post.qq'));
$data['sex'] = (int) (input('post.sex'));
if (empty($data['name'])) {
Log::record('修改个人信息', 0, '姓名不能为空', '个人信息');
return json(['code' => 1, 'msg' => '姓名不能为空']);
}
if (empty($data['phone'])) {
Log::record('修改个人信息', 0, '手机号不能为空', '个人信息');
return json(['code' => 1, 'msg' => '手机号不能为空']);
}
// 处理密码修改
$old_pw = trim(input('post.old_pw'));
$new_pw = trim(input('post.new_pw'));
if (!empty($old_pw) && !empty($new_pw)) {
if (md5($old_pw) != $find['password']) {
Log::record('修改个人信息', 0, '原密码错误', '个人信息');
return json(['code' => 1, 'msg' => '原密码错误']);
}
$data['password'] = md5($new_pw);
}
$res = Users::where('uid', $this->adminId)->update($data);
if (!$res) {
Log::record('修改个人信息', 0, '更新管理员信息失败', '个人信息');
return json(['code' => 1, 'msg' => '更新管理员信息失败']);
}
Log::record('修改个人信息', 1, '', '个人信息');
return json(['code' => 0, 'msg' => '更新成功']);
} else {
return View::fetch();
}
}
//banner管理
public function banner()
{
@@ -533,8 +738,9 @@ class YunzeradminController extends Base
}
Log::record('添加内容推送', 1, '', '内容推送管理');
return json(['code' => 0, 'msg' => '添加成功']);
} else {
return View::fetch();
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
// 编辑内容推送
@@ -612,4 +818,239 @@ class YunzeradminController extends Base
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
//推送配置列表（渲染列表）
public function contentpushsetting()
{
if (Request::isAjax() || Request::isPost()) {
$page = intval(input('get.page', 1));
$limit = intval(input('get.limit', 10));
$query = ContentPushSetting::where('delete_time', null)
->field('id, title, value, status, sort, create_time');
$count = $query->count();
$lists = $query->order(['sort' => 'DESC', 'id' => 'DESC'])
->page($page, $limit)
->select()
->toArray();
foreach ($lists as &$item) {
$item['create_time'] = is_numeric($item['create_time']) ? date('Y-m-d H:i:s', $item['create_time']) : $item['create_time'];
}
return json([
'code' => 0,
'msg' => '获取成功',
'count' => $count,
'data' => $lists
]);
} else {
return View::fetch();
}
}
//推送配置添加和编辑通用方法
public function contentpushsettingadd()
{
if (Request::isPost()) {
$params = input('post.');
$id = isset($params['id']) ? intval($params['id']) : 0;
if ($id > 0) {
// 编辑
$res = ContentPushSetting::update($params, ['id' => $id]);
if ($res === false) {
Log::record('编辑推送配置', 0, '编辑推送配置失败', '推送配置管理');
return json(['code' => 1, 'msg' => '编辑推送配置失败']);
}
Log::record('编辑推送配置', 1, '', '推送配置管理');
return json(['code' => 0, 'msg' => '编辑成功']);
} else {
// 添加
$res = ContentPushSetting::create($params);
if (!$res) {
Log::record('添加推送配置', 0, '添加推送配置失败', '推送配置管理');
return json(['code' => 1, 'msg' => '添加推送配置失败']);
}
Log::record('添加推送配置', 1, '', '推送配置管理');
return json(['code' => 0, 'msg' => '添加成功']);
}
} else {
$id = input('get.id', 0);
$info = [];
if ($id) {
$info = ContentPushSetting::where('id', $id)->find();
if ($info) {
$info = $info->toArray();
}
}
return View::fetch('', ['info' => $info]);
}
}
//推送配置软删除
public function contentpushsettingdel()
{
if (Request::isPost()) {
$id = intval(input('post.id', 0));
if (!$id) {
return json(['code' => 1, 'msg' => '参数错误']);
}
$setting = ContentPushSetting::where('id', $id)->find();
if (!$setting) {
return json(['code' => 1, 'msg' => '配置不存在']);
}
$res = ContentPushSetting::where('id', $id)->update(['delete_time' => date('Y-m-d H:i:s')]);
if ($res === false) {
Log::record('删除推送配置', 0, '删除失败', '推送配置管理');
return json(['code' => 1, 'msg' => '删除失败']);
}
Log::record('删除推送配置', 1, '', '推送配置管理');
return json(['code' => 0, 'msg' => '删除成功']);
}
return json(['code' => 1, 'msg' => '请求方式错误']);
}
//素材中心
public function materialcenter()
{
return View::fetch();
}
// 内容推送列表
public function materialcenterlist()
{
if (Request::isGet()) {
$page = intval(input('post.page', 1));
$limit = intval(input('post.limit', 10));
$query = ContentPush::where('delete_time', null)
->field('id, title, type, status, sort, create_time, update_time');
// 获取总记录数
$count = $query->count();
// 获取分页数据
$lists = $query->order(['sort DESC', 'id DESC'])
->page($page, $limit)
->select()
->toArray();
// 处理数据
foreach ($lists as &$item) {
$item['create_time'] = is_numeric($item['create_time']) ? date('Y-m-d H:i:s', $item['create_time']) : $item['create_time'];
$item['update_time'] = is_numeric($item['update_time']) ? date('Y-m-d H:i:s', $item['update_time']) : $item['update_time'];
}
return json([
'code' => 0,
'msg' => '',
'count' => $count,
'data' => $lists
]);
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
// 添加内容推送
public function materialcenteradd()
{
if (Request::isPost()) {
$data = [
'title' => input('post.title'),
'content' => input('post.content'),
'image' => input('post.image'),
'url' => input('post.url'),
'type' => input('post.type', 1),
'status' => input('post.status', 1),
'sort' => input('post.sort', 0),
'create_time' => time()
];
$res = ContentPush::insert($data);
if (!$res) {
Log::record('添加内容推送', 0, '添加内容推送失败', '内容推送管理');
return json(['code' => 1, 'msg' => '添加内容推送失败']);
}
Log::record('添加内容推送', 1, '', '内容推送管理');
return json(['code' => 0, 'msg' => '添加成功']);
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
// 编辑内容推送
public function materialcenteredit()
{
if (Request::isPost()) {
$id = input('post.id');
if (empty($id)) {
Log::record('编辑内容推送', 0, 'ID不能为空', '内容推送管理');
return json(['code' => 1, 'msg' => 'ID不能为空']);
}
$data = [
'title' => input('post.title'),
'content' => input('post.content'),
'image' => input('post.image'),
'url' => input('post.url'),
'type' => input('post.type', 1),
'status' => input('post.status', 1),
'sort' => input('post.sort', 0),
'update_time' => time()
];
$res = ContentPush::where('id', $id)->update($data);
if ($res === false) {
Log::record('编辑内容推送', 0, '更新内容推送失败', '内容推送管理');
return json(['code' => 1, 'msg' => '更新内容推送失败']);
}
Log::record('编辑内容推送', 1, '', '内容推送管理');
return json(['code' => 0, 'msg' => '更新成功']);
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
// 删除内容推送
public function materialcenterdel()
{
if (Request::isPost()) {
$id = input('post.id');
if (empty($id)) {
Log::record('删除内容推送', 0, 'ID不能为空', '内容推送管理');
return json(['code' => 1, 'msg' => 'ID不能为空']);
}
$res = ContentPush::where('id', $id)->update(['delete_time' => time()]);
if (!$res) {
Log::record('删除内容推送', 0, '删除内容推送失败', '内容推送管理');
return json(['code' => 1, 'msg' => '删除内容推送失败']);
}
Log::record('删除内容推送', 1, '', '内容推送管理');
return json(['code' => 0, 'msg' => '删除成功']);
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
// 修改内容推送状态
public function materialcenterstatus()
{
if (Request::isPost()) {
$id = input('post.id');
$status = input('post.status');
if (empty($id)) {
Log::record('修改内容推送状态', 0, 'ID不能为空', '内容推送管理');
return json(['code' => 1, 'msg' => 'ID不能为空']);
}
$res = ContentPush::where('id', $id)->update(['status' => $status]);
if ($res === false) {
Log::record('修改内容推送状态', 0, '更新状态失败', '内容推送管理');
return json(['code' => 1, 'msg' => '更新状态失败']);
}
Log::record('修改内容推送状态', 1, '', '内容推送管理');
return json(['code' => 0, 'msg' => '更新成功']);
}
return json(['code' => 1, 'msg' => '请求方法无效']);
}
}