mirror of
https://gitee.com/ulthon/ulthon_admin.git
synced 2026-07-10 11:52:49 +08:00
feat: 增加姓名字段;修改登录账号为可修改;
This commit is contained in:
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use think\migration\Migrator;
|
||||||
|
use think\migration\db\Column;
|
||||||
|
|
||||||
|
class NewAdminNicknameColumn extends Migrator
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
|
||||||
|
*
|
||||||
|
* The following commands can be used in this method and Phinx will
|
||||||
|
* automatically reverse them when rolling back:
|
||||||
|
*
|
||||||
|
* createTable
|
||||||
|
* renameTable
|
||||||
|
* addColumn
|
||||||
|
* renameColumn
|
||||||
|
* addIndex
|
||||||
|
* addForeignKey
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change()
|
||||||
|
{
|
||||||
|
|
||||||
|
$table = $this->table('system_admin');
|
||||||
|
|
||||||
|
if(!$table->hasColumn('nickname')){
|
||||||
|
$table->addColumn(Column::string('nickname', 50)->setDefault('')->setComment('昵称'));
|
||||||
|
$table->update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -60,15 +60,25 @@ class IndexBase extends AdminController
|
|||||||
$this->isDemo && $this->error('演示环境下不允许修改');
|
$this->isDemo && $this->error('演示环境下不允许修改');
|
||||||
$rule = [];
|
$rule = [];
|
||||||
$this->validate($post, $rule);
|
$this->validate($post, $rule);
|
||||||
|
if (empty($post['nickname'])) {
|
||||||
|
$post['nickname'] = $row['username'];
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
|
$model_admin = SystemAdmin::where('username', $post['username'])
|
||||||
|
->where('id', '<>', $id)
|
||||||
|
->find();
|
||||||
|
if (!empty($model_admin)) {
|
||||||
|
throw new \Exception('同名用户已存在');
|
||||||
|
}
|
||||||
|
|
||||||
$save = $row
|
$save = $row
|
||||||
->allowField(['head_img', 'phone', 'remark', 'update_time'])
|
->allowField(['head_img', 'phone', 'remark', 'update_time', 'nickname'])
|
||||||
->save($post);
|
->save($post);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
if (App::isDebug()) {
|
if (App::isDebug()) {
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
$this->error('保存失败');
|
$this->error('保存失败:'. $e->getMessage());
|
||||||
}
|
}
|
||||||
$save ? $this->success('保存成功') : $this->error('保存失败');
|
$save ? $this->success('保存成功') : $this->error('保存失败');
|
||||||
}
|
}
|
||||||
@@ -110,7 +120,7 @@ class IndexBase extends AdminController
|
|||||||
'password' => password($post['password']),
|
'password' => password($post['password']),
|
||||||
]);
|
]);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
if(App::isDebug()){
|
if (App::isDebug()) {
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
$this->error('保存失败');
|
$this->error('保存失败');
|
||||||
@@ -140,8 +150,8 @@ class IndexBase extends AdminController
|
|||||||
'sort' => 'desc',
|
'sort' => 'desc',
|
||||||
'id' => 'asc',
|
'id' => 'asc',
|
||||||
])
|
])
|
||||||
->where('status', 1)
|
->where('status', 1)
|
||||||
->select();
|
->select();
|
||||||
|
|
||||||
$list_menu_pid = SystemMenu::group('pid')->column('pid');
|
$list_menu_pid = SystemMenu::group('pid')->column('pid');
|
||||||
|
|
||||||
|
|||||||
@@ -84,6 +84,9 @@ class AdminBase extends AdminController
|
|||||||
$post['password'] = password(sysconfig('site', 'site_default_password', '123456'));
|
$post['password'] = password(sysconfig('site', 'site_default_password', '123456'));
|
||||||
$this->validate($post, $rule);
|
$this->validate($post, $rule);
|
||||||
|
|
||||||
|
if (empty($post['nickname'])) {
|
||||||
|
$post['nickname'] = $post['username'];
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
$model_admin = SystemAdmin::where('username', $post['username'])->find();
|
$model_admin = SystemAdmin::where('username', $post['username'])->find();
|
||||||
|
|
||||||
@@ -117,11 +120,21 @@ class AdminBase extends AdminController
|
|||||||
if (isset($row['password'])) {
|
if (isset($row['password'])) {
|
||||||
unset($row['password']);
|
unset($row['password']);
|
||||||
}
|
}
|
||||||
|
if (empty($post['nickname'])) {
|
||||||
|
$post['nickname'] = $post['username'];
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
|
$model_admin = SystemAdmin::where('username', $post['username'])
|
||||||
|
->where('id', '<>', $id)
|
||||||
|
->find();
|
||||||
|
if (!empty($model_admin)) {
|
||||||
|
throw new \Exception('同名用户已存在');
|
||||||
|
}
|
||||||
|
|
||||||
$save = $row->save($post);
|
$save = $row->save($post);
|
||||||
TriggerService::updateMenu($id);
|
TriggerService::updateMenu($id);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$this->error('保存失败');
|
$this->error('保存失败:' . $e->getMessage());
|
||||||
}
|
}
|
||||||
$save ? $this->success('保存成功') : $this->error('保存失败');
|
$save ? $this->success('保存成功') : $this->error('保存失败');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,10 +17,17 @@
|
|||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label required">登录账户</label>
|
<label class="layui-form-label required">登录账户</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="text" name="username" class="layui-input" readonly value="{$row.username|default=''}">
|
<input type="text" name="username" class="layui-input" value="{$row.username|default=''}">
|
||||||
<tip>填写登录账户。</tip>
|
<tip>填写登录账户。</tip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="layui-form-item">
|
||||||
|
<label class="layui-form-label">姓名</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<input type="text" name="nickname" class="layui-input" value="{$row.nickname|default=''}">
|
||||||
|
<tip>填写姓名,为空时默认使用登录账户作为姓名。</tip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">用户手机</label>
|
<label class="layui-form-label">用户手机</label>
|
||||||
|
|||||||
@@ -19,6 +19,13 @@
|
|||||||
<tip>填写登录账户。</tip>
|
<tip>填写登录账户。</tip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="layui-form-item">
|
||||||
|
<label class="layui-form-label">姓名</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<input type="text" name="nickname" class="layui-input" placeholder="请输入姓名" value="">
|
||||||
|
<tip>填写姓名,为空时默认使用登录账户作为姓名。</tip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">用户手机</label>
|
<label class="layui-form-label">用户手机</label>
|
||||||
|
|||||||
@@ -15,10 +15,17 @@
|
|||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label required">登录账户</label>
|
<label class="layui-form-label required">登录账户</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="text" name="username" class="layui-input" readonly value="{$row.username|default=''}">
|
<input type="text" name="username" class="layui-input" lay-verify="required" value="{$row.username|default=''}">
|
||||||
<tip>填写登录账户。</tip>
|
<tip>填写登录账户。</tip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="layui-form-item">
|
||||||
|
<label class="layui-form-label">姓名</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<input type="text" name="nickname" class="layui-input" value="{$row.nickname|default=''}">
|
||||||
|
<tip>填写姓名,为空时默认使用登录账户作为姓名。</tip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">用户手机</label>
|
<label class="layui-form-label">用户手机</label>
|
||||||
|
|||||||
Reference in New Issue
Block a user