feat: better cron error handling & add more empty value detection

Anankke/SSPanel-UIM#1879 I can't believe I have to spend time on this stupid "problem".
The-NeXT-Project · Apr 3, 2023 · dd9ed54 · dd9ed54
1 parent 46c4d79
commit dd9ed54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/resources/views/tabler/admin/product/create.tpl b/resources/views/tabler/admin/product/create.tpl
@@ -103,20 +103,20 @@
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">用户分组</label>
+                                <label class="form-label col-3 col-form-label required">用户分组</label>
                                 <div class="col">
                                     <input id="node_group" type="text" class="form-control" value="">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">速率限制 (Mbps)</label>
+                                <label class="form-label col-3 col-form-label required">速率限制 (Mbps)</label>
                                 <div class="col">
                                     <input id="speed_limit" type="text" class="form-control"
                                         value="">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">同时连接IP限制</label>
+                                <label class="form-label col-3 col-form-label required">同时连接IP限制</label>
                                 <div class="col">
                                     <input id="ip_limit" type="text" class="form-control"
                                         value="">

diff --git a/src/Command/Cron.php b/src/Command/Cron.php
@@ -66,9 +66,6 @@ public function boot(): void
             // 如果用户账户中没有已激活的订单，且有等待激活的订单，则激活最早的等待激活订单
             if ($activated_order === null && count($pending_activation_orders) > 0) {
                 $order = $pending_activation_orders[0];
-                $order->status = 'activated';
-                $order->update_time = time();
-                $order->save();
                 // 获取订单内容准备激活
                 $content = json_decode($order->product_content);
                 // 激活商品
@@ -85,6 +82,9 @@ public function boot(): void
                 $user->node_speedlimit = $content->speed_limit;
                 $user->node_iplimit = $content->ip_limit;
                 $user->save();
+                $order->status = 'activated';
+                $order->update_time = time();
+                $order->save();
                 echo "订单 #{$order->id} 已激活。\n";
                 continue;
             }

diff --git a/src/Controllers/Admin/ProductController.php b/src/Controllers/Admin/ProductController.php
@@ -116,10 +116,10 @@ public function add(ServerRequest $request, Response $response, array $args): Re
 
         $product = new Product();
 
-        if ($name === '') {
+        if ($name === '' || $stock === '' || $node_group === '' || $speed_limit === '' || $ip_limit === '') {
             return $response->withJson([
                 'ret' => 0,
-                'msg' => '商品名称不能为空',
+                'msg' => '请填写所有必要栏位',
             ]);
         }
 
@@ -130,13 +130,6 @@ public function add(ServerRequest $request, Response $response, array $args): Re
             ]);
         }
 
-        if ($stock === '') {
-            return $response->withJson([
-                'ret' => 0,
-                'msg' => '商品库存不能为空',
-            ]);
-        }
-
         if ($type === 'tabp') {
             if ($time === '' || $time <= 0) {
                 return $response->withJson([
@@ -257,10 +250,10 @@ public function update(ServerRequest $request, Response $response, array $args):
 
         $product = Product::find($product_id);
 
-        if ($name === '') {
+        if ($name === '' || $stock === '' || $node_group === '' || $speed_limit === '' || $ip_limit === '') {
             return $response->withJson([
                 'ret' => 0,
-                'msg' => '商品名称不能为空',
+                'msg' => '请填写所有必要栏位',
             ]);
         }
 
@@ -271,13 +264,6 @@ public function update(ServerRequest $request, Response $response, array $args):
             ]);
         }
 
-        if ($stock === '') {
-            return $response->withJson([
-                'ret' => 0,
-                'msg' => '商品库存不能为空',
-            ]);
-        }
-
         if ($type === 'tabp') {
             if ($time === '' || $time <= 0) {
                 return $response->withJson([