From be6f7ede0d992d1e15a596b721c844f8780066dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=A7=80=E9=92=A2?= Date: Thu, 24 Oct 2019 11:45:31 +0800 Subject: [PATCH] =?UTF-8?q?modified=20=E7=BB=9F=E4=B8=80=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Index.php | 11 +++++------ database/migrations/20190425073802_admin_app.php | 3 ++- .../migrations/20190425094427_admin_app_group.php | 2 +- .../migrations/20190508070533_admin_auth_group.php | 2 +- .../20190508100337_admin_auth_group_access.php | 2 +- .../migrations/20190508101122_admin_auth_rule.php | 2 +- database/migrations/20190508152801_admin_fields.php | 2 +- database/migrations/20190508153800_admin_group.php | 2 +- database/migrations/20190513065521_admin_list.php | 3 +-- database/migrations/20190513070628_admin_menu.php | 2 +- database/migrations/20190513081034_admin_user.php | 2 +- .../migrations/20190513082503_admin_user_action.php | 2 +- .../migrations/20190513085755_admin_user_data.php | 6 ++---- database/migrations/20190513155519_ini_admin_menu.php | 1 + .../migrations/20190514034923_ini_admin_group.php | 5 ++--- database/migrations/20190515031308_ini_admin_user.php | 2 +- 16 files changed, 23 insertions(+), 26 deletions(-) diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index f965292..c813a9b 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -2,7 +2,6 @@ namespace app\admin\controller; - use app\util\ReturnCode; class Index extends Base { @@ -18,19 +17,19 @@ class Index extends Base { //过滤错误 if ($error) { switch ($error) { - case 1 : + case 1: $error_message = '您上传的文件超过了PHP.INI配置文件中UPLOAD_MAX-FILESIZE的大小'; break; - case 2 : + case 2: $error_message = '您上传的文件超过了PHP.INI配置文件中的post_max_size的大小'; break; - case 3 : + case 3: $error_message = '文件只被部分上传'; break; - case 4 : + case 4: $error_message = '文件不能为空'; break; - default : + default: $error_message = '未知错误'; } die($error_message); diff --git a/database/migrations/20190425073802_admin_app.php b/database/migrations/20190425073802_admin_app.php index 91d8253..3d56af7 100644 --- a/database/migrations/20190425073802_admin_app.php +++ b/database/migrations/20190425073802_admin_app.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminApp extends Migrator { + /** * Change Method. * @@ -43,7 +44,7 @@ class AdminApp extends Migrator { */ public function change() { $table = $this->table('admin_app', [ - 'comment' => 'appId和appSecret表' + 'comment' => 'appId和appSecret表', ])->setCollation('utf8mb4_general_ci'); $table->addColumn('app_id', 'string', [ 'limit' => 50, diff --git a/database/migrations/20190425094427_admin_app_group.php b/database/migrations/20190425094427_admin_app_group.php index c5e1dcc..84c618b 100644 --- a/database/migrations/20190425094427_admin_app_group.php +++ b/database/migrations/20190425094427_admin_app_group.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminAppGroup extends Migrator { + /** * Change Method. * @@ -35,7 +36,6 @@ class AdminAppGroup extends Migrator { * PRIMARY KEY (`id`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用组，目前只做管理使用，没有实际权限控制'; */ - public function change() { $table = $this->table('admin_app_group', [ 'comment' => '应用组，目前只做管理使用，没有实际权限控制' diff --git a/database/migrations/20190508070533_admin_auth_group.php b/database/migrations/20190508070533_admin_auth_group.php index dde6e81..c0d9d4a 100644 --- a/database/migrations/20190508070533_admin_auth_group.php +++ b/database/migrations/20190508070533_admin_auth_group.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminAuthGroup extends Migrator { + /** * Change Method. * @@ -34,7 +35,6 @@ class AdminAuthGroup extends Migrator { * PRIMARY KEY (`id`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限组'; */ - public function change() { $table = $this->table('admin_auth_group', [ 'comment' => '权限组' diff --git a/database/migrations/20190508100337_admin_auth_group_access.php b/database/migrations/20190508100337_admin_auth_group_access.php index 7792338..f9eb42f 100644 --- a/database/migrations/20190508100337_admin_auth_group_access.php +++ b/database/migrations/20190508100337_admin_auth_group_access.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminAuthGroupAccess extends Migrator { + /** * Change Method. * @@ -35,7 +36,6 @@ class AdminAuthGroupAccess extends Migrator { * KEY `groupId` (`groupId`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和组的对应关系'; */ - public function change() { $table = $this->table('admin_auth_group_access', [ 'comment' => '用户和组的对应关系' diff --git a/database/migrations/20190508101122_admin_auth_rule.php b/database/migrations/20190508101122_admin_auth_rule.php index 9280fda..91efbe9 100644 --- a/database/migrations/20190508101122_admin_auth_rule.php +++ b/database/migrations/20190508101122_admin_auth_rule.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminAuthRule extends Migrator { + /** * Change Method. * @@ -35,7 +36,6 @@ class AdminAuthRule extends Migrator { * PRIMARY KEY (`id`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限细节'; */ - public function change() { $table = $this->table('admin_auth_rule', [ 'comment' => '权限细节' diff --git a/database/migrations/20190508152801_admin_fields.php b/database/migrations/20190508152801_admin_fields.php index af5cd61..49de174 100644 --- a/database/migrations/20190508152801_admin_fields.php +++ b/database/migrations/20190508152801_admin_fields.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminFields extends Migrator { + /** * Change Method. * @@ -41,7 +42,6 @@ class AdminFields extends Migrator { * KEY `hash` (`hash`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用于保存各个API的字段规则'; */ - public function change() { $table = $this->table('admin_fields', [ 'comment' => '用于保存各个API的字段规则' diff --git a/database/migrations/20190508153800_admin_group.php b/database/migrations/20190508153800_admin_group.php index 6dd61bf..68edb47 100644 --- a/database/migrations/20190508153800_admin_group.php +++ b/database/migrations/20190508153800_admin_group.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminGroup extends Migrator { + /** * Change Method. * @@ -39,7 +40,6 @@ class AdminGroup extends Migrator { * PRIMARY KEY (`id`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='接口组管理'; */ - public function change() { $table = $this->table('admin_group', [ 'comment' => '接口组管理' diff --git a/database/migrations/20190513065521_admin_list.php b/database/migrations/20190513065521_admin_list.php index 2b48480..321efad 100644 --- a/database/migrations/20190513065521_admin_list.php +++ b/database/migrations/20190513065521_admin_list.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminList extends Migrator { + /** * Change Method. * @@ -42,7 +43,6 @@ class AdminList extends Migrator { * KEY `hash` (`hash`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用于维护接口信息'; */ - public function change() { $table = $this->table('admin_list', [ 'comment' => '用于维护接口信息' @@ -87,6 +87,5 @@ class AdminList extends Migrator { 'default' => 'default', 'comment' => '当前接口所属的接口分组' ])->addIndex(['hash'])->create(); - } } diff --git a/database/migrations/20190513070628_admin_menu.php b/database/migrations/20190513070628_admin_menu.php index a15d1ed..6a40e6f 100644 --- a/database/migrations/20190513070628_admin_menu.php +++ b/database/migrations/20190513070628_admin_menu.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminMenu extends Migrator { + /** * Change Method. * @@ -39,7 +40,6 @@ class AdminMenu extends Migrator { * PRIMARY KEY (`id`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='目录信息'; */ - public function change() { $table = $this->table('admin_menu', [ 'comment' => '目录信息' diff --git a/database/migrations/20190513081034_admin_user.php b/database/migrations/20190513081034_admin_user.php index 3cc651b..d346b58 100644 --- a/database/migrations/20190513081034_admin_user.php +++ b/database/migrations/20190513081034_admin_user.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminUser extends Migrator { + /** * Change Method. * @@ -40,7 +41,6 @@ class AdminUser extends Migrator { * KEY `create_time` (`create_time`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管理员认证信息'; */ - public function change() { $table = $this->table('admin_user', [ 'comment' => '管理员认证信息' diff --git a/database/migrations/20190513082503_admin_user_action.php b/database/migrations/20190513082503_admin_user_action.php index e478a49..faefe24 100644 --- a/database/migrations/20190513082503_admin_user_action.php +++ b/database/migrations/20190513082503_admin_user_action.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class AdminUserAction extends Migrator { + /** * Change Method. * @@ -38,7 +39,6 @@ class AdminUserAction extends Migrator { * KEY `uid` (`uid`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户操作日志'; */ - public function change() { $table = $this->table('admin_user_action', [ 'comment' => '用户操作日志' diff --git a/database/migrations/20190513085755_admin_user_data.php b/database/migrations/20190513085755_admin_user_data.php index 772294d..ee83950 100644 --- a/database/migrations/20190513085755_admin_user_data.php +++ b/database/migrations/20190513085755_admin_user_data.php @@ -1,10 +1,9 @@ table('admin_user_data', [ 'comment' => '管理员数据表' diff --git a/database/migrations/20190513155519_ini_admin_menu.php b/database/migrations/20190513155519_ini_admin_menu.php index 6bad843..bc838d6 100644 --- a/database/migrations/20190513155519_ini_admin_menu.php +++ b/database/migrations/20190513155519_ini_admin_menu.php @@ -3,6 +3,7 @@ use think\migration\Migrator; class IniAdminMenu extends Migrator { + /** * 初始化数据 * @author zhaoxiang diff --git a/database/migrations/20190514034923_ini_admin_group.php b/database/migrations/20190514034923_ini_admin_group.php index dcaba81..9f9bd5d 100644 --- a/database/migrations/20190514034923_ini_admin_group.php +++ b/database/migrations/20190514034923_ini_admin_group.php @@ -1,9 +1,9 @@ '默认分组', @@ -40,7 +39,7 @@ class IniAdminGroup extends Migrator { 'create_time' => time(), 'update_time' => time(), 'image' => '', - 'hot' => 0, + 'hot' => 0 ]; $this->table('admin_group')->insert($data)->saveData(); diff --git a/database/migrations/20190515031308_ini_admin_user.php b/database/migrations/20190515031308_ini_admin_user.php index dd382f9..6e525b6 100644 --- a/database/migrations/20190515031308_ini_admin_user.php +++ b/database/migrations/20190515031308_ini_admin_user.php @@ -6,6 +6,7 @@ use \app\util\Strs; use \app\util\Tools; class IniAdminUser extends Migrator { + /** * Change Method. * @@ -27,7 +28,6 @@ class IniAdminUser extends Migrator { * Remember to call "create()" or "update()" and NOT "save()" when working * with the Table class. */ - public function up() { $pass = Strs::randString(8); $data = [