diff --git a/app/BaseController.php b/app/BaseController.php
index 951f66f..7980d44 100644
--- a/app/BaseController.php
+++ b/app/BaseController.php
@@ -74,6 +74,8 @@ abstract class BaseController
if (is_array($validate)) {
$v = new Validate();
$v->rule($validate);
+ } else if ($validate instanceof Validate) {
+ $v = $validate;
} else {
if (strpos($validate, '.')) {
// 支持场景
diff --git a/app/admin/controller/system/Admin.php b/app/admin/controller/system/Admin.php
index cbdd35b..4635f53 100644
--- a/app/admin/controller/system/Admin.php
+++ b/app/admin/controller/system/Admin.php
@@ -11,6 +11,8 @@ use app\common\controller\AdminController;
use app\admin\service\annotation\ControllerAnnotation;
use app\admin\service\annotation\NodeAnotation;
use think\App;
+use think\facade\Validate;
+use think\validate\ValidateRule;
/**
* Class Admin
@@ -76,12 +78,23 @@ class Admin extends AdminController
$post = $this->request->post();
$authIds = $this->request->post('auth_ids', []);
$post['auth_ids'] = implode(',', array_keys($authIds));
- $rule = [];
+ $rule = Validate::rule('username|用户登录名', ValidateRule::isRequire());
+ $post['password'] = password(sysconfig('site', 'site_default_password', '123456'));
$this->validate($post, $rule);
+
+
+
try {
+
+ $model_admin = SystemAdmin::where('username', $post['username'])->find();
+
+ if (!empty($model_admin)) {
+ throw new \Exception('同名用户已存在');
+ }
+
$save = $this->model->save($post);
} catch (\Exception $e) {
- $this->error('保存失败');
+ $this->error('保存失败:' . $e->getMessage());
}
$save ? $this->success('保存成功') : $this->error('保存失败');
}
diff --git a/app/admin/traits/Curd.php b/app/admin/traits/Curd.php
index 44ebcf1..304461a 100644
--- a/app/admin/traits/Curd.php
+++ b/app/admin/traits/Curd.php
@@ -79,7 +79,7 @@ trait Curd
try {
$save = $row->save($post);
} catch (\Exception $e) {
- $this->error('保存失败');
+ $this->error('保存失败:' . $e->getMessage());
}
$save ? $this->success('保存成功') : $this->error('保存失败');
}
@@ -98,7 +98,7 @@ trait Curd
try {
$save = $row->delete();
} catch (\Exception $e) {
- $this->error('删除失败');
+ $this->error('删除失败:' . $e->getMessage());
}
$save ? $this->success('删除成功') : $this->error('删除失败');
}
@@ -156,7 +156,7 @@ trait Curd
$post['field'] => $post['value'],
]);
} catch (\Exception $e) {
- $this->error($e->getMessage());
+ $this->error('修改失败:' . $e->getMessage());
}
$this->success('保存成功');
}
diff --git a/app/admin/view/system/config/site.html b/app/admin/view/system/config/site.html
index 18e61c3..512f0c6 100644
--- a/app/admin/view/system/config/site.html
+++ b/app/admin/view/system/config/site.html
@@ -49,6 +49,13 @@