diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index 9d9f074..17003ad 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -1,5 +1,6 @@ */ @@ -14,6 +15,12 @@ use app\util\Tools; class Login extends Base { + /** + * 用户登录 + * @author zhaoxiang + * @return array + * @throws \think\exception\DbException + */ public function index() { $username = $this->request->post('username'); $password = $this->request->post('password'); @@ -73,4 +80,4 @@ class Login extends Base { return $this->buildSuccess(ReturnCode::SUCCESS, [], '登出成功'); } -} \ No newline at end of file +} diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 08835a6..6d4af8f 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -96,7 +96,7 @@ class User extends Base { $postData['regTime'] = time(); $postData['password'] = Tools::userMd5($postData['password']); if ($postData['groupId']) { - $groups = implode(',', $postData['groupId']); + $groups = trim(implode(',', $postData['groupId']), ','); } unset($postData['groupId']); $res = ApiUser::create($postData); @@ -193,7 +193,7 @@ class User extends Base { $postData['password'] = Tools::userMd5($postData['password']); } if ($postData['groupId']) { - $groups = implode(',', $postData['groupId']); + $groups = trim(implode(',', $postData['groupId']), ','); } unset($postData['groupId']); $res = ApiUser::update($postData);