1.修复编辑商品时错误

2.编辑、删除账号等级时判断以是否存在该等级的分组、账号，防止出现错误

app/Http/Controllers/AdminController.php

@@ -1174,6 +1174,23 @@ TXT;
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级名称不能为空']);
         }
 
+        $level = Level::where('id', $id)->first();
+        if (empty($level)) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级不存在']);
+        }
+
+        // 校验该等级下是否存在关联分组
+        $existGroups = SsGroup::where('level', $level->level)->get();
+        if (!$existGroups->isEmpty()) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级下存在关联分组，请先取消关联']);
+        }
+
+        // 校验该等级下是否存在关联账号
+        $existUsers = User::where('level', $level->level)->get();
+        if (!$existUsers->isEmpty()) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级下存在关联账号，请先取消关联']);
+        }
+
         try {
             Level::where('id', $id)->update(["level" => $level, "level_name" => $level_name]);
 
@@ -1194,6 +1211,23 @@ TXT;
             return Response::json(['status' => 'fail', 'data' => '', 'message' => 'ID不能为空']);
         }
 
+        $level = Level::where('id', $id)->first();
+        if (empty($level)) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级不存在']);
+        }
+
+        // 校验该等级下是否存在关联分组
+        $existGroups = SsGroup::where('level', $level->level)->get();
+        if (!$existGroups->isEmpty()) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级下存在关联分组，请先取消关联']);
+        }
+
+        // 校验该等级下是否存在关联账号
+        $existUsers = User::where('level', $level->level)->get();
+        if (!$existUsers->isEmpty()) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级下存在关联账号，请先取消关联']);
+        }
+
         try {
             Level::where('id', $id)->delete();
 

app/Http/Controllers/BaseController.php

@@ -123,7 +123,7 @@ class BaseController extends Controller
         $config = $this->systemConfig();
 
         $port = mt_rand($config['min_port'], $config['max_port']);
-        $deny_port = [17185, 28281]; // 注意：生成的端口可能是服务器的SSH端口，需要编辑账号手动调整
+        $deny_port = [1068, 1434, 3127, 3128, 3129, 3130, 3332, 4444, 5554, 6669, 8080, 8081, 8082, 8181, 8282, 9996, 17185, 28281]; // 不生成的端口
 
         $exists_port = User::query()->pluck('port')->toArray();
         if (in_array($port, $exists_port) || in_array($port, $deny_port)) {

app/Http/Controllers/ShopController.php

@@ -107,8 +107,8 @@ class ShopController extends BaseController
             $logo = '';
             if ($request->hasFile('logo')) {
                 $file = $request->file('logo');
-                $type = $file->getClientOriginalExtension();
-                $logoName = date('YmdHis') . mt_rand(1000, 2000) . '.' . $type;
+                $fileType = $file->getClientOriginalExtension();
+                $logoName = date('YmdHis') . mt_rand(1000, 2000) . '.' . $fileType;
                 $move = $file->move(base_path() . '/public/upload/image/goods/', $logoName);
                 $logo = $move ? '/upload/image/goods/' . $logoName : '';
             }