fix bug

Author: linyiyuan

app/Command/InitCommand.php

@@ -5,6 +5,8 @@
 namespace App\Command;
 
 use App\Model\Auth\User;
+use App\Model\System\DictData;
+use App\Model\System\DictType;
 use Hyperf\Command\Command as HyperfCommand;
 use Hyperf\Command\Annotation\Command;
 use Donjan\Permission\Models\Permission;
@@ -73,6 +75,17 @@ public function handle()
             $this->line('添加权限成功----------------------------' . $permission['display_name']);
         }
 
+        //初始化字典数据
+        $dictTypeList = config('dictData.dict_type');
+        foreach ($dictTypeList as $dictType) {
+            if (empty(DictType::query()->find($dictType['dict_id']))) DictType::query()->insert($dictType);
+        }
+        $dictDataList = config('dictData.dict_data');
+        foreach ($dictDataList as $dictData) {
+            if (empty(DictData::query()->find($dictData['dict_code']))) DictData::query()->insert($dictData);
+        }
+        $this->line('初始化字典数据成功', 'info');
+
         //添加默认角色到默认用户
         $user->assignRole($super_role->name);
         // 通过内置方法 line 在 Console 输出 Hello Hyperf.

app/Controller/Auth/UserController.php

@@ -100,7 +100,7 @@ public function store()
         //配置验证
         $rules = [
             'username' => 'required|min:4|max:18|unique:users',
-            'password' => 'required|confirmed:password_confirmation',
+            'password' => 'required|min:6|max:18|confirmed:password_confirmation',
             'password_confirmation' => 'required',
             'status' => 'required',
             'mobile' => 'required',
@@ -116,6 +116,8 @@ public function store()
             'roleData.array' => '[roleData]必须为数组',
             'username.min' => '[username]最少4位',
             'username.max' => '[username]最多18位',
+            'password.min' => '[password]最少6位',
+            'password.max' => '[password]最多18位',
             'password.confirmed' => '两次密码输入不一致',
             'mobile.required' => '手机号码不能为空',
         ];
@@ -133,6 +135,7 @@ public function store()
         $user->desc = $postData['desc'] ?? '';
         $user->mobile = $postData['mobile'] ?? '';
         $user->email = $postData['email'] ?? '';
+        $user->address = $postData['address'] ?? '';
         $user->sex = $postData['sex'] ?? 0;
         if (!$user->save()) $this->throwExp(StatusCode::ERR_EXCEPTION, '添加用户失败');
 
@@ -203,6 +206,7 @@ public function profileEdit($id)
         $user->desc = $postData['desc'] ?? '';
         $user->mobile = $postData['mobile'] ?? '';
         $user->sex = $postData['sex'] ?? '';
+        $user->address = $postData['address'] ?? '';
         if (!$user->save()) $this->throwExp(StatusCode::ERR_EXCEPTION,  '修改用户信息失败');
 
         //正确返回信息
@@ -312,6 +316,9 @@ public function update(int $id)
         $user->desc = $postData['desc'] ?? '';
         $user->mobile = $postData['mobile'] ?? '';
         $user->sex = $postData['sex'] ?? '';
+        $user->address = $postData['address'] ?? '';
+        $user->email = $postData['email'] ?? '';
+        $user->status = $postData['status'] ?? '';
         if (!$user->save()) $this->throwExp(StatusCode::ERR_EXCEPTION,  '修改用户信息失败');
 
         //将所有角色移除并重新赋予角色
@@ -349,44 +356,44 @@ public function destroy(int $id)
     /**
      * @Explanation(content="修改用户密码")
      * @RequestMapping(path="reset_password", methods="post")
-     * @Middleware(RequestMiddleware::class)
+     * @Middlewares({
+     *     @Middleware(RequestMiddleware::class),
+     *     @Middleware(PermissionMiddleware::class)
+     * })
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function resetPassword()
     {
-        $postData = $this->request->all() ?? [];
+        $postData = $this->request->all()['postData'] ?? [];
         $params = [
-            'id' => $postData['id'],
-            'old_password' => $postData['old_password'] ?? '',
+            'id' => $postData['uid'],
             'new_password' => $postData['new_password'] ?? '',
             'confirm_password' => $postData['confirm_password'] ?? '',
         ];
         //配置验证
         $rules = [
             'id' => 'required',
-            'old_password' => 'required',
-            'new_password' => 'required',
+            'new_password' => 'required|min:6|max:18',
             'confirm_password' => 'required',
         ];
         $message = [
             'id.required' => '[id]缺失',
-            'old_password.required' => '[old_password]缺失',
             'new_password.required' => '[new_password]缺失',
+            'new_password.min' => '[new_password]最少6位',
+            'new_password.max' => '[new_password]最多18位',
             'confirm_password.required' => '[confirm_password]缺失',
         ];
 
         $this->verifyParams($params, $rules, $message);
         $userInfo = User::getOneByUid($params['id']);
 
         if (empty($userInfo)) $this->throwExp(400, '账号不存在');
-        if (md5($params['old_password']) != $userInfo['password']) $this->throwExp(StatusCode::ERR_EXCEPTION, '输入密码与原先密码不一致');
         if (md5($params['new_password']) != md5($params['confirm_password'])) $this->throwExp(StatusCode::ERR_EXCEPTION, '两次密码输入不一致');
 
         $userInfo->password  = md5($params['new_password']);
         $updateRes = $userInfo->save();
 
         if (!$updateRes) $this->throwExp(400, '修改密码失败');
-
         return $this->success([], '修改密码成功');
     }
 

app/Controller/Blog/AlbumController.php

@@ -61,7 +61,6 @@ public function index()
      * @RequestMapping(path="album_option", methods="get")
      * @Middlewares({
      *     @Middleware(RequestMiddleware::class),
-     *     @Middleware(PermissionMiddleware::class)
      * })
      */
     public function albumOptionList()

app/Controller/Setting/TimedTaskController.php

@@ -100,8 +100,9 @@ public function store()
         $timedTaskQuery->execute_time = $params['execute_time'];
         $timedTaskQuery->status = $params['status'];
         $timedTaskQuery->desc = $params['desc'];
+        $timedTaskQuery->times = 0;
 
-        $executeTime = $timedTaskInfo['execute_time'] ?? '';
+        $executeTime = $params['execute_time'] ?? '';
         $nextExecuteTime = Cron::init($executeTime)->getNextRunDate()->format('Y-m-d H:i');
         $timedTaskQuery->next_execute_time = $nextExecuteTime;
 

app/Controller/System/DictTypeController.php

@@ -143,14 +143,13 @@ public function update(int $id)
         ];
         $rules = [
             'dict_name' => 'required|min:4|max:18|',
-            'dict_type' => 'required|unique:dict_type',
+            'dict_type' => 'required',
         ];
         $message = [
             'dict_name.required' => '[dict_name]缺失',
             'dict_name.min' => '[dict_name]最少4位',
             'dict_name.max' => '[dict_name]最多18位',
             'dict_type.required' => '[dict_type]缺失',
-            'dict_type.unique' => '[dict_type]已经存在',
         ];
         $this->verifyParams($params, $rules, $message);
 

app/Controller/System/NoticeController.php

@@ -101,6 +101,7 @@ public function store()
         $noticeQuery->content = $params['content'];
         $noticeQuery->public_time = strtotime($params['public_time']);
         $noticeQuery->user_id = conGet('user_info')['id'];
+        $noticeQuery->username = conGet('user_info')['desc'];
 
         if (!$noticeQuery->save()) $this->throwExp(StatusCode::ERR_EXCEPTION, '添加系统通知错误');
 

app/Model/Laboratory/Group.php

@@ -9,8 +9,6 @@
 
 class Group extends Model
 {
-    use SoftDeletes;
-
     /**
      * The table associated with the model.
      *

app/Model/Laboratory/GroupChatHistory.php

@@ -16,8 +16,6 @@
  */
 class GroupChatHistory extends Model
 {
-    use SoftDeletes;
-
     /**
      * The table associated with the model.
      *

app/Model/Laboratory/GroupRelation.php

@@ -16,8 +16,6 @@
  */
 class GroupRelation extends Model
 {
-    use SoftDeletes;
-
     /**
      * The table associated with the model.
      *