修改重置密码后的代码

backendApi/modules/v1/controllers/OauthController.php

@@ -70,6 +70,7 @@ class OauthController extends BaseController
     public function actionNoLoginModifyPassword() {
         $form = new AdminForm();
         $form->scenario = 'noLoginModifyPassword';
+
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
             // Log::adminHandle('管理员'.$result->ADMIN_NAME.'重置密码');
             return static::notice('重置密码成功');

backendApi/modules/v1/models/AdminForm.php

@@ -130,14 +130,19 @@ class AdminForm extends Model
             $this->addError('id', '提交场景不存在');
             return null;
         }
+
+        // 给密码进行加密 ，如果需要添加验证密码安全验证时 ，可以在这个地方加
         if($this->password){
             $model->PASSWORD_HASH = \Yii::$app->security->generatePasswordHash($this->password);
         }
 
+        // 执行修改或添加 , 如果执行不成功就在这里报出错误
         if(!$model->save()){
             $this->addErrors($model->getErrors());
             return null;
         }
+
+        // 执行完成后根据对应的类型写入日志
         if($this->scenario == 'add'){
             $this->adminOperateLogger->afterInsert($model)->clean()->save([
                 'optType' => '添加管理员',
@@ -154,7 +159,8 @@ class AdminForm extends Model
         } elseif($this->scenario == 'noLoginModifyPassword') {
             $this->adminOperateLogger->clean()->save([
                 'optType' => '不登录重置密码',
-                'userName' => $this->adminName,
+                'userName' => $model->ADMIN_NAME,
+                'adminName' => $model->ADMIN_NAME,
                 'remark' => '不登录重置密码',
             ]);
         }else{
@@ -164,6 +170,7 @@ class AdminForm extends Model
                 'remark' => $this->remark,
             ]);
         }
+
         return $model;
     }
 

common/libs/logging/operate/AbstractOperate.php

@@ -276,6 +276,7 @@ abstract class AbstractOperate extends Component {
      */
     public function save(array $params = []){
         $this->setColumn($params);
+
         if(!$this->columns){
             return false;
         }

common/libs/logging/operate/AdminOperate.php

@@ -40,6 +40,7 @@ class AdminOperate extends AbstractOperate {
         if(!isset($params['optType'])){
             throw new \Exception('请设置操作类型');
         }
+
         $period = Period::instance();
         $periodNum = $period->getNowPeriodNum();
         $this->columns[] = [
@@ -49,7 +50,7 @@ class AdminOperate extends AbstractOperate {
             'save_before_content' => $this->saveBeforeContent,
             'save_after_content' => $this->saveAfterContent,
             'admin_id' => Yii::$app->user->id,
-            'admin_name' => \Yii::$app->user->getUserInfo()['adminName'],
+            'admin_name' => isset(\Yii::$app->user->getUserInfo()['adminName']) ?\Yii::$app->user->getUserInfo()['adminName'] :$params['adminName'],
             'ip' => Yii::$app->request->getUserIP(),
             'request_route' => Yii::$app->requestedRoute,
             'opt_type' => $params['optType'],

frontendApi/modules/v1/controllers/UserController.php

@@ -219,7 +219,7 @@ class UserController extends BaseController {
                 return static::notice('会员编号过期',400);
             }
             if ($insertUserName != $getRedisUserName){
-                return static::notice('和会员编号不符合',400);
+                return static::notice('会员编号不符合',400);
             }
 
             $post['insertUserName'] = $insertUserName;