diff --git a/composer.json b/composer.json index 4f42256..5477dc4 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ }, "require": { "php": ">=5.6.0", - "topthink/framework": "~5.0.0", "php-curl-class/php-curl-class": "^8.0" }, "extra": { diff --git a/composer.lock b/composer.lock index 5f7877d..f75684d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6d6e9a23ce221d217fca0657ab1b54a2", - "content-hash": "de8523ca5915d4eb4e43fe8d2a1a4d27", + "content-hash": "c38a84a081b633a51738b670cdfef2fd", "packages": [ { "name": "php-curl-class/php-curl-class", - "version": "8.0.1", + "version": "8.0.2", "source": { "type": "git", "url": "https://github.com/php-curl-class/php-curl-class.git", - "reference": "bdfe1fcca0c32562050c84e01e3a4cbdc31e22fd" + "reference": "75597b28c454acd9767e6182371376916cdb8531" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/php-curl-class/php-curl-class/bdfe1fcca0c32562050c84e01e3a4cbdc31e22fd.zip", - "reference": "bdfe1fcca0c32562050c84e01e3a4cbdc31e22fd", + "url": "https://files.phpcomposer.com/files/php-curl-class/php-curl-class/75597b28c454acd9767e6182371376916cdb8531.zip", + "reference": "75597b28c454acd9767e6182371376916cdb8531", "shasum": "" }, "require": { @@ -62,99 +61,7 @@ "web service", "xml" ], - "time": "2018-01-27 15:40:39" - }, - { - "name": "topthink/framework", - "version": "v5.0.15", - "source": { - "type": "git", - "url": "https://github.com/top-think/framework.git", - "reference": "7c1375791fe8772e33282ee8611ea465dc215fca" - }, - "dist": { - "type": "zip", - "url": "https://files.phpcomposer.com/files/top-think/framework/7c1375791fe8772e33282ee8611ea465dc215fca.zip", - "reference": "7c1375791fe8772e33282ee8611ea465dc215fca", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "topthink/think-installer": "~1.0" - }, - "require-dev": { - "johnkary/phpunit-speedtrap": "^1.0", - "mikey179/vfsstream": "~1.6", - "phpdocumentor/reflection-docblock": "^2.0", - "phploc/phploc": "2.*", - "phpunit/phpunit": "4.8.*", - "sebastian/phpcpd": "2.*" - }, - "type": "think-framework", - "autoload": { - "psr-4": { - "think\\": "library/think" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - } - ], - "description": "the new thinkphp framework", - "homepage": "http://thinkphp.cn/", - "keywords": [ - "framework", - "orm", - "thinkphp" - ], - "time": "2018-01-31 08:40:10" - }, - { - "name": "topthink/think-installer", - "version": "v1.0.12", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-installer.git", - "reference": "1be326e68f63de4e95977ed50f46ae75f017556d" - }, - "dist": { - "type": "zip", - "url": "https://files.phpcomposer.com/files/top-think/think-installer/1be326e68f63de4e95977ed50f46ae75f017556d.zip", - "reference": "1be326e68f63de4e95977ed50f46ae75f017556d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0" - }, - "require-dev": { - "composer/composer": "1.0.*@dev" - }, - "type": "composer-plugin", - "extra": { - "class": "think\\composer\\Plugin" - }, - "autoload": { - "psr-4": { - "think\\composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ], - "time": "2017-05-27 06:58:09" + "time": "2018-04-09T08:28:13+00:00" } ], "packages-dev": [], diff --git a/data/apiadmin_3.0.4.sql b/data/apiadmin_3.0.6.sql similarity index 92% rename from data/apiadmin_3.0.4.sql rename to data/apiadmin_3.0.6.sql index 3e59f6f..7b7e388 100644 --- a/data/apiadmin_3.0.4.sql +++ b/data/apiadmin_3.0.6.sql @@ -6,8 +6,8 @@ # https://github.com/sequelpro/sequelpro # # Host: 127.0.0.1 (MySQL 5.5.5-10.2.12-MariaDB) -# Database: a -# Generation Time: 2018-03-04 15:18:46 +0000 +# Database: demo +# Generation Time: 2018-04-11 01:21:30 +0000 # ************************************************************ @@ -38,7 +38,7 @@ CREATE TABLE `admin_app` ( `app_api_show` text DEFAULT NULL COMMENT '前台样式显示所需数据格式', PRIMARY KEY (`id`), UNIQUE KEY `app_id` (`app_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='appId和appSecret表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='appId和appSecret表'; @@ -65,11 +65,11 @@ DROP TABLE IF EXISTS `admin_auth_group`; CREATE TABLE `admin_auth_group` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL COMMENT '组名称', + `name` varchar(50) NOT NULL DEFAULT '' COMMENT '组名称', `description` varchar(50) DEFAULT '' COMMENT '组描述', `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '组状态：为1正常，为0禁用', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限组'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限组'; @@ -84,7 +84,7 @@ CREATE TABLE `admin_auth_group_access` ( `groupId` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户和组的对应关系'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和组的对应关系'; @@ -100,7 +100,7 @@ CREATE TABLE `admin_auth_rule` ( `auth` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '权限数值', `status` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '状态：为1正常，为0禁用', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限细节'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限细节'; @@ -122,7 +122,7 @@ CREATE TABLE `admin_fields` ( `showName` varchar(50) NOT NULL DEFAULT '' COMMENT 'wiki显示用字段', PRIMARY KEY (`id`), KEY `hash` (`hash`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用于保存各个API的字段规则'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用于保存各个API的字段规则'; @@ -144,15 +144,6 @@ CREATE TABLE `admin_group` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='接口组管理'; -LOCK TABLES `admin_group` WRITE; -/*!40000 ALTER TABLE `admin_group` DISABLE KEYS */; - -INSERT INTO `admin_group` (`id`, `name`, `description`, `status`, `hash`, `addTime`, `updateTime`, `image`, `hot`) -VALUES - (1,'默认分组','',1,'default',0,0,NULL,0); - -/*!40000 ALTER TABLE `admin_group` ENABLE KEYS */; -UNLOCK TABLES; # Dump of table admin_list @@ -174,7 +165,7 @@ CREATE TABLE `admin_list` ( `groupHash` varchar(64) NOT NULL DEFAULT 'default' COMMENT '当前接口所属的接口分组', PRIMARY KEY (`id`), UNIQUE KEY `hash` (`hash`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用于维护接口信息'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用于维护接口信息'; @@ -194,7 +185,7 @@ CREATE TABLE `admin_menu` ( `icon` varchar(50) NOT NULL DEFAULT '' COMMENT '菜单图标', `level` tinyint(2) NOT NULL DEFAULT 0 COMMENT '菜单认证等级', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='目录信息'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='目录信息'; LOCK TABLES `admin_menu` WRITE; /*!40000 ALTER TABLE `admin_menu` DISABLE KEYS */; @@ -287,16 +278,16 @@ CREATE TABLE `admin_user` ( `regIp` bigint(11) NOT NULL COMMENT '注册IP', `updateTime` int(10) NOT NULL DEFAULT 0 COMMENT '更新时间', `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '账号状态 0封号 1正常', - `openId` varchar(100) DEFAULT NULL COMMENT '微信唯一ID', + `openId` varchar(100) DEFAULT NULL COMMENT '三方登录唯一ID', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='管理员认证信息'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管理员认证信息'; LOCK TABLES `admin_user` WRITE; /*!40000 ALTER TABLE `admin_user` DISABLE KEYS */; INSERT INTO `admin_user` (`id`, `username`, `nickname`, `password`, `regTime`, `regIp`, `updateTime`, `status`, `openId`) VALUES - (1,'root','root','912601e4ad1b308c9ae41877cf6ca754',1519453594,3663623043,1492236545,1,NULL); + (1,'root','root','953dbb5a8a45ae6000e30f29d78dcc68',1519453594,3663623043,1520173599,1,NULL); /*!40000 ALTER TABLE `admin_user` ENABLE KEYS */; UNLOCK TABLES; @@ -316,7 +307,7 @@ CREATE TABLE `admin_user_action` ( `data` text DEFAULT NULL COMMENT '用户提交的数据', `url` varchar(200) NOT NULL DEFAULT '' COMMENT '操作URL', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户操作日志'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户操作日志'; @@ -335,6 +326,15 @@ CREATE TABLE `admin_user_data` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管理员数据表'; +LOCK TABLES `admin_user_data` WRITE; +/*!40000 ALTER TABLE `admin_user_data` DISABLE KEYS */; + +INSERT INTO `admin_user_data` (`id`, `loginTimes`, `lastLoginIp`, `lastLoginTime`, `uid`, `headImg`) +VALUES + (1,0,0,0,'1',''); + +/*!40000 ALTER TABLE `admin_user_data` ENABLE KEYS */; +UNLOCK TABLES;