浏览代码

可能因邮件问题引起公告不保存的bug修复

DESKTOP-40MKVL5\Z3205 7 年之前
父节点
当前提交
9d785bc7fa
共有 1 个文件被更改,包括 7 次插入9 次删除
  1. 7 9
      app/Controllers/Admin/AnnController.php

+ 7 - 9
app/Controllers/Admin/AnnController.php

@@ -37,7 +37,11 @@ class AnnController extends AdminController
         $issend = $request->getParam('issend');
         $issend = $request->getParam('issend');
         $vip = $request->getParam('vip');
         $vip = $request->getParam('vip');
         $users = User::all();
         $users = User::all();
-      
+        if (!$ann->save()) {
+            $rs['ret'] = 0;
+            $rs['msg'] = "添加失败";
+            return $response->getBody()->write(json_encode($rs));
+        }
         if ($issend == 1){
         if ($issend == 1){
             foreach($users as $user){
             foreach($users as $user){
                 if ($user->class >= $vip){
                 if ($user->class >= $vip){
@@ -50,18 +54,12 @@ class AnnController extends AdminController
                         ], [
                         ], [
                         ]);
                         ]);
                     } catch (Exception $e) {
                     } catch (Exception $e) {
-                        $rs['ret'] = 0;
-                        $rs['msg'] = $e;
-                        return $response->getBody()->write(json_encode($rs));
+                        echo $e;
                     }
                     }
                 }
                 }
             }
             }
         }
         }
-        if (!$ann->save()) {
-            $rs['ret'] = 0;
-            $rs['msg'] = "添加失败";
-            return $response->getBody()->write(json_encode($rs));
-        }
+
         Telegram::SendMarkdown("新公告:".PHP_EOL.$request->getParam('markdown'));
         Telegram::SendMarkdown("新公告:".PHP_EOL.$request->getParam('markdown'));
         $rs['ret'] = 1;
         $rs['ret'] = 1;
         $rs['msg'] = "公告添加成功,邮件发送成功";
         $rs['msg'] = "公告添加成功,邮件发送成功";