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:
hero920103
2025-05-21 16:51:36 +08:00
parent d3dfd860b3 7447661a21
commit 40d1625a22
120 changed files with 5545 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/IndexController.php
+1 -1
View File
@@ -354,7 +354,7 @@ class IndexController extends Base{
try {
// 验证上传的文件
validate([
'image'=>'filesize:10240|fileExt:jpg,png,gif,jpeg'
'image'=>'filesize:51200|fileExt:jpg,png,gif,jpeg'
])->check($file);
// 存储文件到public磁盘的uploads目录
app/admin/controller/ResourcesController.php
+34 -4
View File
@@ -106,9 +106,13 @@ class ResourcesController extends BaseController
'url' => input('post.url'),
'fileurl' => input('post.fileurl'),
'code' => input('post.code'),
'zipcode' => input('post.zipcode'),
'uploader' => input('post.uploader'),
'desc' => input('post.desc'),
'content' => input('post.content'),
'number' => input('post.number'),
'status' => input('post.status', 1),
'create_time' => time()
];
@@ -131,9 +135,7 @@ class ResourcesController extends BaseController
}
}
/**
* 编辑资源
*/
// 编辑资源
public function edit()
{
if (Request::isPost()) {
@@ -154,7 +156,10 @@ class ResourcesController extends BaseController
'fileurl' => $data['fileurl'],
'url' => $data['url'],
'code' => $data['code'],
'zipcode' => $data['zipcode'],
'sort' => $data['sort'],
'number' => $data['number'],
'content' => $data['content'],
'update_time' => time()
];
@@ -179,7 +184,7 @@ class ResourcesController extends BaseController
$resource = Resource::where('id', $id)
->where('delete_time', null)
->find();
if (!$resource) {
Log::record('编辑资源', 0, '资源不存在', '资源管理');
$this->error('资源不存在');
@@ -226,6 +231,29 @@ class ResourcesController extends BaseController
->order('sort asc, id asc')
->select()
->toArray();
// 获取每个分类下的资源总数
foreach ($lists as &$item) {
if ($item['cid'] == 0) {
// 父级分类 - 统计所有子分类的资源总数
$childIds = ResourceCategory::where('cid', $item['id'])
->where('delete_time', null)
->where('status', 1)
->column('id');
$item['total'] = Resource::where('cate', 'in', array_merge([$item['id']], $childIds))
->where('delete_time', null)
->where('status', '<>', 3)
->count();
} else {
// 子分类 - 只统计当前分类的资源
$item['total'] = Resource::where('cate', $item['id'])
->where('delete_time', null)
->where('status', '<>', 3)
->count();
}
}
$tree = $this->buildParentChild($lists);
return json(['code' => 0, 'msg' => '获取成功', 'data' => $tree]);
}
@@ -238,6 +266,7 @@ class ResourcesController extends BaseController
'name' => input('post.name'),
'icon' => input('post.icon'),
'cid' => input('post.cid'),
'number' => input('post.number'),
'sort' => input('post.sort', 0),
'status' => input('post.status', 1),
'create_time' => time()
@@ -276,6 +305,7 @@ class ResourcesController extends BaseController
'name' => input('post.name'),
'icon' => input('post.icon'),
'cid' => input('post.cid'),
'number' => input('post.number'),
'sort' => input('post.sort', 0),
'status' => input('post.status', 1),
'update_time' => time()
app/admin/view/resources/add.php
+187 -2
View File
@@ -22,12 +22,20 @@
<div class="layui-form-item">
<label class="layui-form-label">分类</label>
<div class="layui-input-block">
<select name="cate" lay-verify="required">
<select name="cate" lay-verify="required" lay-filter="cate">
<option value="">请选择分类</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">资源编号</label>
<div class="layui-input-block">
<input type="text" name="number" required lay-verify="required" placeholder="选取分类后系统自动生成" autocomplete="off"
class="layui-input" lay-affix="clear" disabled>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
@@ -39,7 +47,7 @@
<label class="layui-form-label">上传者</label>
<div class="layui-input-block">
<input type="text" name="uploader" required lay-verify="required" placeholder="请输入上传者"
autocomplete="off" class="layui-input" lay-affix="clear">
autocomplete="off" class="layui-input" lay-affix="clear" value="{$aUser['name']}">
</div>
</div>
@@ -104,6 +112,14 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">解压密码</label>
<div class="layui-input-block">
<input type="text" name="zipcode" required placeholder="请输入解压密码" autocomplete="off"
class="layui-input" lay-affix="clear">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
@@ -111,6 +127,16 @@
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">内容</label>
<div class="layui-input-block">
<div id="editor—wrapper" id="content" name="content" style="border: 1px solid #ccc;">
<div id="toolbar-container" style="border-bottom: 1px solid #ccc;"><!-- 工具栏 --></div>
<div id="editor-container" style="height: 800px;"><!-- 编辑器 --></div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
@@ -120,6 +146,7 @@
</form>
</div>
<script src="/static/js/wangeditor.js"></script>
<script>
layui.use(['form', 'layer'], function () {
var form = layui.form;
@@ -220,14 +247,92 @@
});
$('select[name="cate"]').html(html);
form.render('select');
// 存储分类数据供后续使用
window.categoryData = res.data;
} else {
layer.msg(res.msg, { icon: 2 });
}
});
// 监听分类选择变化
form.on('select(cate)', function(data) {
var selectedId = data.value;
if (!selectedId) {
$('input[name="number"]').val('');
return;
}
// 递归查找分类信息的函数
function findCategory(categories, targetId) {
for (let category of categories) {
// 检查当前分类
if (category.id == targetId) {
return {
parent: null,
current: category,
total: category.total || 0
};
}
// 检查子分类
if (category.children && category.children.length > 0) {
for (let child of category.children) {
if (child.id == targetId) {
return {
parent: category,
current: child,
total: child.total || 0
};
}
// 递归检查更深层级的子分类
if (child.children && child.children.length > 0) {
const result = findCategory([child], targetId);
if (result) {
return result;
}
}
}
}
}
return null;
}
// 查找选中的分类信息
const categoryInfo = findCategory(window.categoryData, selectedId);
if (categoryInfo) {
// 生成资源编号
var nextNumber = categoryInfo.total + 1;
var numberStr = nextNumber.toString().padStart(5, '0');
var resourceNumber = '';
// 构建编号前缀
if (categoryInfo.parent) {
resourceNumber = categoryInfo.parent.number + categoryInfo.current.number;
} else {
resourceNumber = categoryInfo.current.number;
}
// 添加序号
resourceNumber += numberStr;
// 设置资源编号
$('input[name="number"]').val(resourceNumber);
}
});
// 表单提交
form.on('submit(formSubmit)', function (data) {
// 获取编辑器内容
var content = editor.getHtml();
if (!content || content === '<p><br></p>') {
layer.msg('请输入文章内容', { icon: 2 });
return false;
}
var loadIndex = layer.load(2);
data.field.content = content;
$.ajax({
url: '{:url("resources/add")}',
type: 'POST',
@@ -272,6 +377,86 @@
});
</script>
<!-- wangeditor编辑器脚本 -->
<script>
const { createEditor, createToolbar } = window.wangEditor
const editorConfig = {
MENU_CONF: {},
placeholder: '请输入内容...',
onChange(editor) {
const html = editor.getHtml()
},
}
// 配置图片上传
editorConfig.MENU_CONF['uploadImage'] = {
server: '{:url("index/upload_img")}',
fieldName: 'file',
maxFileSize: 50 * 1024 * 1024, // 50M
maxNumberOfFiles: 10,
allowedFileTypes: ['image/*'],
meta: {
token: 'xxx'
},
metaWithUrl: true,
headers: {
Accept: 'text/x-json'
},
timeout: 30 * 1000, // 30s
onBeforeUpload(file) {
console.log('准备上传图片', file)
return file
},
onProgress(progress) {
console.log('上传进度', progress)
},
onSuccess(file, res) {
console.log('上传成功', file, res)
},
onFailed(file, res) {
layer.msg('上传失败：' + res.msg, { icon: 2 })
console.log('上传失败', file, res)
},
onError(file, err, res) {
layer.msg('上传出错：' + err.message, { icon: 2 })
console.error('上传出错', file, err, res)
},
customInsert(res, insertFn) {
// 只使用返回的url字段，并确保使用完整的URL
if (res.code === 0 && res.url) {
// 如果URL不是以http开头，添加https://
let imageUrl = res.url;
if (!imageUrl.startsWith('http')) {
imageUrl = 'https://' + imageUrl;
}
// 移除可能存在的重复域名和路径
imageUrl = imageUrl.replace(/^https?:\/\/[^\/]+\/admin\/resources\//, 'https://www.yunzer.cn/');
insertFn(imageUrl);
} else {
layer.msg('图片上传失败：' + (res.msg || '未知错误'), { icon: 2 });
}
}
}
const editor = createEditor({
selector: '#editor-container',
html: '<p><br></p>',
config: editorConfig,
mode: 'default', // or 'simple'
})
const toolbarConfig = {}
const toolbar = createToolbar({
editor,
selector: '#toolbar-container',
config: toolbarConfig,
mode: 'default', // or 'simple'
})
</script>
<script>
//返回资源列表
function goBack() {
app/admin/view/resources/cate.php
+8
View File
@@ -50,6 +50,13 @@
<!-- 分类表单 -->
<form class="layui-form category-form" lay-filter="categoryForm" style="display: none;">
<input type="hidden" name="id" id="categoryId">
<div class="layui-form-item">
<label class="layui-form-label">分类编号</label>
<div class="layui-input-block">
<input type="text" name="number" required lay-verify="required" placeholder="请输入分类编号"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">分类名称</label>
@@ -403,6 +410,7 @@
form.val('categoryForm', {
id: data ? data.info.id : '',
name: data ? data.info.name : '',
number: data ? data.info.number : '',
cid: data ? data.info.cid : parentId,
sort: data ? data.info.sort : 0,
status: data ? data.info.status : 1
app/admin/view/resources/edit.php
+152 -1
View File
@@ -23,11 +23,19 @@
<div class="layui-form-item">
<label class="layui-form-label">分类</label>
<div class="layui-input-block">
<select name="cate" lay-verify="required">
<select name="cate" lay-verify="required" lay-filter="cate">
<option value="">请选择分类</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">资源编号</label>
<div class="layui-input-block">
<input type="text" name="number" required lay-verify="required" placeholder="请输入分类编号" autocomplete="off"
class="layui-input" value="{$resource.number|default=''}" lay-affix="clear" disabled>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
@@ -105,6 +113,14 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">解压密码</label>
<div class="layui-input-block">
<input type="text" name="zipcode" required placeholder="请输入解压密码" autocomplete="off"
class="layui-input" value="{$resource.zipcode|default=''}" lay-affix="clear">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
@@ -112,6 +128,16 @@
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">内容</label>
<div class="layui-input-block">
<div id="editor—wrapper" id="content" name="content" style="border: 1px solid #ccc;">
<div id="toolbar-container" style="border-bottom: 1px solid #ccc;"><!-- 工具栏 --></div>
<div id="editor-container" style="height: 800px;"><!-- 编辑器 --></div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
@@ -121,6 +147,7 @@
</form>
</div>
<script src="/static/js/wangeditor.js"></script>
<script>
layui.use(['form', 'layer'], function () {
var form = layui.form;
@@ -245,6 +272,9 @@
// 获取分类列表
$.get('{:url("resources/getcate")}', function (res) {
if (res.code == 0) {
// 存储分类数据供后续使用
window.categoryData = res.data;
var html = '<option value="">请选择分类</option>';
res.data.forEach(function (item) {
html += '<option value="' + item.id + '">' + item.name + '</option>';
@@ -269,9 +299,50 @@
}
});
// 监听分类选择变化
form.on('select(cate)', function(data) {
var selectedId = data.value;
if (!selectedId) {
$('input[name="number"]').val('');
return;
}
// 查找选中的分类信息
var parentCategory = null;
var childCategory = null;
window.categoryData.forEach(function(parent) {
if (parent.children) {
parent.children.forEach(function(child) {
if (child.id == selectedId) {
parentCategory = parent;
childCategory = child;
}
});
}
});
if (parentCategory && childCategory) {
// 生成资源编号
var total = childCategory.total || 0;
// 判断是否是初始化时的分类
var isInitialCategory = resourceData && resourceData.cate == selectedId;
var nextNumber = isInitialCategory ? total : total + 1;
var numberStr = nextNumber.toString().padStart(5, '0');
var resourceNumber = parentCategory.number + childCategory.number + numberStr;
// 设置资源编号
$('input[name="number"]').val(resourceNumber);
}
});
// 表单提交
form.on('submit(formSubmit)', function (data) {
// 获取编辑器内容
var content = editor.getHtml();
var loadIndex = layer.load(2);
data.field.content = content;
$.ajax({
url: '{:url("resources/edit")}',
type: 'POST',
@@ -324,6 +395,86 @@
});
</script>
<!-- wangeditor编辑器脚本 -->
<script>
const { createEditor, createToolbar } = window.wangEditor
const editorConfig = {
MENU_CONF: {},
placeholder: '请输入内容...',
onChange(editor) {
const html = editor.getHtml()
},
}
// 配置图片上传
editorConfig.MENU_CONF['uploadImage'] = {
server: '{:url("index/upload_img")}',
fieldName: 'file',
maxFileSize: 50 * 1024 * 1024, // 50M
maxNumberOfFiles: 10,
allowedFileTypes: ['image/*'],
meta: {
token: 'xxx'
},
metaWithUrl: true,
headers: {
Accept: 'text/x-json'
},
timeout: 30 * 1000, // 30s
onBeforeUpload(file) {
console.log('准备上传图片', file)
return file
},
onProgress(progress) {
console.log('上传进度', progress)
},
onSuccess(file, res) {
console.log('上传成功', file, res)
},
onFailed(file, res) {
layer.msg('上传失败：' + res.msg, { icon: 2 })
console.log('上传失败', file, res)
},
onError(file, err, res) {
layer.msg('上传出错：' + err.message, { icon: 2 })
console.error('上传出错', file, err, res)
},
customInsert(res, insertFn) {
// 只使用返回的url字段，并确保使用完整的URL
if (res.code === 0 && res.url) {
// 如果URL不是以http开头，添加https://
let imageUrl = res.url;
if (!imageUrl.startsWith('http')) {
imageUrl = 'https://' + imageUrl;
}
// 移除可能存在的重复域名和路径
imageUrl = imageUrl.replace(/^https?:\/\/[^\/]+\/admin\/resources\//, 'https://www.yunzer.cn/');
insertFn(imageUrl);
} else {
layer.msg('图片上传失败：' + (res.msg || '未知错误'), { icon: 2 });
}
}
}
const editor = createEditor({
selector: '#editor-container',
html: `{$resource.content|raw|default=''}`,
config: editorConfig,
mode: 'default', // or 'simple'
})
const toolbarConfig = {}
const toolbar = createToolbar({
editor,
selector: '#toolbar-container',
config: toolbarConfig,
mode: 'default', // or 'simple'
})
</script>
<script>
//返回资源列表
function goBack() {
app/admin/view/resources/lists.php
+2 -1
View File
@@ -60,7 +60,7 @@
{{# if(d.status == '0'){ }}
<span style="color:red;">未审核</span>
{{# } else if(d.status == '1'){ }}
<span style="color:orange;">已审核</span>
<span style="color:green;">已审核</span>
{{# } }}
</script>
@@ -87,6 +87,7 @@
method: 'post',
cols: [[
{ field: 'id', title: 'ID', align: 'center', width: 80 },
{ field: 'number', title: '资源编号', width: 100 },
{ field: 'title', title: '资源名称' },
{ field: 'cate', title: '分类', align: 'center', width: 120 },
{ field: 'icon', title: '图标', templet: '#iconTemplate', align: 'center', width: 100 },