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

2025-05-21 16:51:36 +08:00
parent d3dfd860b3 7447661a21
commit 40d1625a22
120 changed files with 5545 additions and 286 deletions
@@ -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目录
@@ -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()