diff --git a/README.md b/README.md index 10802d1c..55061464 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,9 @@ FastAdmin是一款基于ThinkPHP5+Bootstrap的极速后台开发框架。 * 基于`Bower`进行前端组件包管理 * 数据库表一键生成`CRUD`,包括控制器、模型、视图、JS、语言包 * 一键压缩打包JS和CSS文件 +* 强大的插件扩展功能，在线安装卸载插件 * 多语言支持，服务端及客户端支持 -* 无缝整合又拍云上传功能 +* 无缝整合又拍云、七牛上传等云存储功能 * 第三方登录(QQ、微信、微博)整合 * Ucenter整合 diff --git a/application/admin/command/Addon.php b/application/admin/command/Addon.php new file mode 100644 index 00000000..240606f4 --- /dev/null +++ b/application/admin/command/Addon.php @@ -0,0 +1,226 @@ +setName('addon') + ->addOption('name', 'a', Option::VALUE_REQUIRED, 'addon name', null) + ->addOption('action', 'c', Option::VALUE_REQUIRED, 'action(create/enable/disable/install/uninstall/refresh)', 'create') + ->addOption('force', 'f', Option::VALUE_OPTIONAL, 'force override', null) + ->setDescription('Addon manager'); + } + + protected function execute(Input $input, Output $output) + { + $name = $input->getOption('name') ?: ''; + $action = $input->getOption('action') ?: ''; + //强制覆盖 + $force = $input->getOption('force'); + + include dirname(__DIR__) . DS . 'common.php'; + + if (!$name) + { + throw new Exception('Addon name could not be empty'); + } + if (!$action || !in_array($action, ['create', 'disable', 'enable', 'install', 'uninstall', 'refresh'])) + { + throw new Exception('Please input correct action name'); + } + + $addonDir = ADDON_PATH . $name; + switch ($action) + { + case 'create': + //非覆盖模式时如果存在则报错 + if (is_dir($addonDir) && !$force) + { + throw new Exception("addon already exists!\nIf you need to create again, use the parameter --force=true "); + } + //如果存在先移除 + if (is_dir($addonDir)) + { + rmdirs($addonDir); + } + mkdir($addonDir); + $data = [ + 'name' => $name, + 'addon' => $name, + 'addonClassName' => ucfirst($name) + ]; + $this->writeToFile("addon", $data, $addonDir . DS . ucfirst($name) . '.php'); + $this->writeToFile("config", $data, $addonDir . DS . 'config.php'); + $this->writeToFile("info", $data, $addonDir . DS . 'info.ini'); + $output->info("Create Successed!"); + break; + case 'disable': + case 'enable': + try + { + //调用启用、禁用的方法 + Service::$action($name, 0); + } + catch (AddonException $e) + { + if ($e->getCode() != -3) + { + throw new Exception($e->getMessage()); + } + //如果有冲突文件则提醒 + $data = $e->getData(); + foreach ($data['conflictlist'] as $k => $v) + { + $output->warning($v); + } + $output->info("Are you sure you want to " . ($action == 'enable' ? 'override' : 'delete') . " all those files? Type 'yes' to continue: "); + $line = fgets(STDIN); + if (trim($line) != 'yes') + { + throw new Exception("Operation is aborted!"); + } + //调用启用、禁用的方法 + Service::$action($name, 1); + } + catch (Exception $e) + { + throw new Exception($e->getMessage()); + } + $output->info(ucfirst($action) . " Successed!"); + break; + case 'install': + //非覆盖模式时如果存在则报错 + if (is_dir($addonDir) && !$force) + { + throw new Exception("addon already exists!\nIf you need to install again, use the parameter --force=true "); + } + //如果存在先移除 + if (is_dir($addonDir)) + { + rmdirs($addonDir); + } + try + { + Service::install($name, 0); + } + catch (AddonException $e) + { + if ($e->getCode() != -3) + { + throw new Exception($e->getMessage()); + } + //如果有冲突文件则提醒 + $data = $e->getData(); + foreach ($data['conflictlist'] as $k => $v) + { + $output->warning($v); + } + $output->info("Are you sure you want to override all those files? Type 'yes' to continue: "); + $line = fgets(STDIN); + if (trim($line) != 'yes') + { + throw new Exception("Operation is aborted!"); + } + Service::install($name, 1); + } + catch (Exception $e) + { + throw new Exception($e->getMessage()); + } + + $output->info("Install Successed!"); + break; + case 'uninstall': + //非覆盖模式时如果存在则报错 + if (!$force) + { + throw new Exception("If you need to uninstall addon, use the parameter --force=true "); + } + try + { + Service::uninstall($name, 0); + } + catch (AddonException $e) + { + if ($e->getCode() != -3) + { + throw new Exception($e->getMessage()); + } + //如果有冲突文件则提醒 + $data = $e->getData(); + foreach ($data['conflictlist'] as $k => $v) + { + $output->warning($v); + } + $output->info("Are you sure you want to delete all those files? Type 'yes' to continue: "); + $line = fgets(STDIN); + if (trim($line) != 'yes') + { + throw new Exception("Operation is aborted!"); + } + Service::uninstall($name, 1); + } + catch (Exception $e) + { + throw new Exception($e->getMessage()); + } + + $output->info("Uninstall Successed!"); + break; + case 'refresh': + Service::refresh(); + $output->info("Refresh Successed!"); + break; + default : + break; + } + } + + /** + * 写入到文件 + * @param string $name + * @param array $data + * @param string $pathname + * @return mixed + */ + protected function writeToFile($name, $data, $pathname) + { + $search = $replace = []; + foreach ($data as $k => $v) + { + $search[] = "{%{$k}%}"; + $replace[] = $v; + } + $stub = file_get_contents($this->getStub($name)); + $content = str_replace($search, $replace, $stub); + + if (!is_dir(dirname($pathname))) + { + mkdir(strtolower(dirname($pathname)), 0755, true); + } + return file_put_contents($pathname, $content); + } + + /** + * 获取基础模板 + * @param string $name + * @return string + */ + protected function getStub($name) + { + return __DIR__ . '/Addon/stubs/' . $name . '.stub'; + } + +} diff --git a/application/admin/command/Addon/stubs/addon.stub b/application/admin/command/Addon/stubs/addon.stub new file mode 100644 index 00000000..22567a43 --- /dev/null +++ b/application/admin/command/Addon/stubs/addon.stub @@ -0,0 +1,45 @@ +getConfig()); + // 可以返回模板，模板文件默认读取的为插件目录中的文件。模板名不能为空！ + //return $this->fetch('view/info'); + } + +} diff --git a/application/admin/command/Addon/stubs/config.stub b/application/admin/command/Addon/stubs/config.stub new file mode 100644 index 00000000..4ad20dcc --- /dev/null +++ b/application/admin/command/Addon/stubs/config.stub @@ -0,0 +1,40 @@ + 'usernmae', + //显示的标题 + 'title' => '用户名', + //类型 + 'type' => 'string', + //数据字典 + 'content' => [ + ], + //值 + 'value' => '', + //验证规则 + 'rule' => 'required', + //错误消息 + 'msg' => '', + //提示消息 + 'tip' => '', + //成功消息 + 'ok' => '', + //扩展信息 + 'extend' => '' + ], + [ + 'name' => 'password', + 'title' => '密码', + 'type' => 'string', + 'content' => [ + ], + 'value' => '', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '' + ], +]; diff --git a/application/admin/command/Addon/stubs/info.stub b/application/admin/command/Addon/stubs/info.stub new file mode 100644 index 00000000..27570c3c --- /dev/null +++ b/application/admin/command/Addon/stubs/info.stub @@ -0,0 +1,7 @@ +name = {%name%} +title = 插件名称 +intro = FastAdmin插件 +author = yourname +website = http://www.fastadmin.net +version = 1.0.0 +state = 1 \ No newline at end of file diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 7f81d964..3b96bde9 100644 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -44,6 +44,11 @@ class Crud extends Command */ protected $switchSuffix = ['switch']; + /** + * 城市后缀 + */ + protected $citySuffix = ['city']; + /** * Selectpage对应的后缀 */ @@ -114,6 +119,7 @@ class Crud extends Command ->addOption('filefield', null, Option::VALUE_OPTIONAL | Option::VALUE_IS_ARRAY, 'automatically generate file component with suffix', null) ->addOption('intdatesuffix', null, Option::VALUE_OPTIONAL | Option::VALUE_IS_ARRAY, 'automatically generate date component with suffix', null) ->addOption('switchsuffix', null, Option::VALUE_OPTIONAL | Option::VALUE_IS_ARRAY, 'automatically generate switch component with suffix', null) + ->addOption('citysuffix', null, Option::VALUE_OPTIONAL | Option::VALUE_IS_ARRAY, 'automatically generate citypicker component with suffix', null) ->addOption('selectpagesuffix', null, Option::VALUE_OPTIONAL | Option::VALUE_IS_ARRAY, 'automatically generate selectpage component with suffix', null) ->addOption('selectpagessuffix', null, Option::VALUE_OPTIONAL | Option::VALUE_IS_ARRAY, 'automatically generate multiple selectpage component with suffix', null) ->addOption('sortfield', null, Option::VALUE_OPTIONAL, 'sort field', null) @@ -162,6 +168,8 @@ class Crud extends Command $intdatesuffix = $input->getOption('intdatesuffix'); //开关后缀 $switchsuffix = $input->getOption('switchsuffix'); + //城市后缀 + $citysuffix = $input->getOption('citysuffix'); //selectpage后缀 $selectpagesuffix = $input->getOption('selectpagesuffix'); //selectpage多选后缀 @@ -182,6 +190,8 @@ class Crud extends Command $this->intDateSuffix = $intdatesuffix; if ($switchsuffix) $this->switchSuffix = $switchsuffix; + if ($citysuffix) + $this->citySuffix = $citysuffix; if ($selectpagesuffix) $this->selectpageSuffix = $selectpagesuffix; if ($selectpagessuffix) @@ -447,7 +457,7 @@ class Crud extends Command $defaultValue = $v['COLUMN_DEFAULT']; $editValue = "{\$row.{$field}}"; // 如果默认值非null,则是一个必选项 - if (!is_null($v['COLUMN_DEFAULT'])) + if ($v['IS_NULLABLE'] == 'NO') { $attrArr['data-rule'] = 'required'; } @@ -556,6 +566,13 @@ class Crud extends Command $formEditElement .= sprintf(Form::label("{$attrArr['id']}", "%s abcdefg"), Form::checkbox($fieldName, $yes, 0, $attrArr)); $formEditElement = str_replace('type="checkbox"', 'type="checkbox" {in name="' . "\$row.{$field}" . '" value="' . $yes . '"}checked{/in}', $formEditElement); } + else if ($inputType == 'citypicker') + { + $attrArr['class'] = implode(' ', $cssClassArr); + $attrArr['data-toggle'] = "city-picker"; + $formAddElement = sprintf("
%s
", Form::input('text', $fieldName, $defaultValue, $attrArr)); + $formEditElement = sprintf("
%s
", Form::input('text', $fieldName, $editValue, $attrArr)); + } else { $search = $replace = ''; @@ -1077,6 +1094,11 @@ EOD; { $inputType = "switch"; } + // 指定后缀结尾城市选择框 + if ($this->isMatchSuffix($fieldsName, $this->citySuffix) && ($v['DATA_TYPE'] == 'varchar' || $v['DATA_TYPE'] == 'char')) + { + $inputType = "citypicker"; + } return $inputType; } @@ -1126,19 +1148,20 @@ EOD; */ protected function getImageUpload($field, $content) { - $filter = ''; + $uploadfilter = $selectfilter = ''; if ($this->isMatchSuffix($field, $this->imageField)) { - $filter = ' data-mimetype="image/*"'; + $uploadfilter = ' data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp"'; + $selectfilter = ' data-mimetype="image/*"'; } $multiple = substr($field, -1) == 's' ? ' data-multiple="true"' : ' data-multiple="false"'; - $preview = $filter ? ' data-preview-id="p-' . $field . '"' : ''; + $preview = $uploadfilter ? ' data-preview-id="p-' . $field . '"' : ''; $previewcontainer = $preview ? '' : ''; return << {$content} - - + + {$previewcontainer} EOD; diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 5823a760..99711b17 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -4,7 +4,7 @@ 官网: http://www.fastadmin.net 演示: http://demo.fastadmin.net - Date: 07/11/2017 23:52:44 PM + Date: 08/08/2017 23:19:44 PM */ SET FOREIGN_KEY_CHECKS = 0; @@ -35,7 +35,7 @@ CREATE TABLE `fa_admin` ( -- Records of `fa_admin` -- ---------------------------- BEGIN; -INSERT INTO `fa_admin` VALUES ('1', 'admin', 'Admin', '075eaec83636846f51c152f29b98a2fd', 's4f3', '/assets/img/avatar.png', 'admin@fastadmin.net', '0', '1497070325', '1492186163', '1497070325', 'c586728f-0687-4e1a-84c0-c3b9f9003850', 'normal'), ('2', 'admin2', 'admin2', '9a28ce07ce875fbd14172a9ca5357d3c', '2dHDmj', '/assets/img/avatar.png', 'admin2@fastadmin.net', '0', '0', '1492186163', '1492186163', '', 'normal'), ('3', 'admin3', 'admin3', '1c11f945dfcd808a130a8c2a8753fe62', 'WOKJEn', '/assets/img/avatar.png', 'admin3@fastadmin.net', '0', '0', '1492186201', '1492186201', '', 'normal'), ('4', 'admin22', 'admin22', '1c1a0aa0c3c56a8c1a908aab94519648', 'Aybcn5', '/assets/img/avatar.png', 'admin22@fastadmin.net', '0', '0', '1492186240', '1492186240', '', 'normal'), ('5', 'admin32', 'admin32', 'ade94d5d7a7033afa7d84ac3066d0a02', 'FvYK0u', '/assets/img/avatar.png', 'admin32@fastadmin.net', '0', '0', '1492186263', '1492186263', '', 'normal'), ('6', 'test123', 'test', '2a9020e6ef15245399f00d5cda5fb1e6', 'unbBZH', '', 'test@163.com', '0', '1497062737', '1497062728', '1497070313', '', 'normal'); +INSERT INTO `fa_admin` VALUES ('1', 'admin', 'Admin', '075eaec83636846f51c152f29b98a2fd', 's4f3', '/assets/img/avatar.png', 'admin@fastadmin.net', '0', '1502029281', '1492186163', '1502029281', 'd3992c3b-5ecc-4ecb-9dc2-8997780fcadc', 'normal'), ('2', 'admin2', 'admin2', '9a28ce07ce875fbd14172a9ca5357d3c', '2dHDmj', '/assets/img/avatar.png', 'admin2@fastadmin.net', '0', '1502015003', '1492186163', '1502029266', '', 'normal'), ('3', 'admin3', 'admin3', '1c11f945dfcd808a130a8c2a8753fe62', 'WOKJEn', '/assets/img/avatar.png', 'admin3@fastadmin.net', '0', '1501980868', '1492186201', '1501982377', '', 'normal'), ('4', 'admin22', 'admin22', '1c1a0aa0c3c56a8c1a908aab94519648', 'Aybcn5', '/assets/img/avatar.png', 'admin22@fastadmin.net', '0', '0', '1492186240', '1492186240', '', 'normal'), ('5', 'admin32', 'admin32', 'ade94d5d7a7033afa7d84ac3066d0a02', 'FvYK0u', '/assets/img/avatar.png', 'admin32@fastadmin.net', '0', '0', '1492186263', '1492186263', '', 'normal'); COMMIT; -- ---------------------------- @@ -54,36 +54,7 @@ CREATE TABLE `fa_admin_log` ( `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '操作时间', PRIMARY KEY (`id`), KEY `name` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表'; - --- ---------------------------- --- Records of `fa_admin_log` --- ---------------------------- -BEGIN; -INSERT INTO `fa_admin_log` VALUES ('1', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"phone-bg.png\",\"signature\":\"e6afb5fb65947ba639810670d67535f2\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499768230\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499681848'), ('2', '1', 'admin', '/public/admin.php/category/edit/ids/5?dialog=1', '分类管理 编辑', '{\"dialog\":\"1\",\"row\":{\"type\":\"page\",\"pid\":\"0\",\"name\":\"\\u8f6f\\u4ef6\\u4ea7\\u54c1\",\"nickname\":\"software\",\"flag\":[\"recommend\"],\"image\":\"\\/uploads\\/20170710\\/52ecad420fc9bb113e588de3b3593b90.png\",\"keywords\":\"\",\"description\":\"\",\"weigh\":\"0\",\"status\":\"normal\"},\"ids\":\"5\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499681850'), ('3', '1', 'admin', '/public/admin.php/test/add/ids?dialog=1', '测试管理 添加', '{\"dialog\":\"1\",\"row_category_id_text\":\"\\u6d4b\\u8bd51\",\"row\":{\"category_id\":\"12\",\"category_ids\":\"12,13\",\"user_id\":\"3\",\"user_ids\":\"3\",\"week\":\"monday\",\"flag\":[\"hot\",\"index\"],\"genderdata\":\"male\",\"hobbydata\":[\"music\",\"reading\"],\"title\":\"\\u6211\\u662f\\u4e00\\u7bc7\\u6d4b\\u8bd5\\u6587\\u7ae0\",\"content\":\"

\\u6211\\u662f\\u6d4b\\u8bd5\\u5185\\u5bb9<\\/p>\",\"image\":\"\\/assets\\/img\\/avatar.png\",\"images\":\"\\/assets\\/img\\/avatar.png,\\/assets\\/img\\/qrcode.png\",\"attachfile\":\"\\/assets\\/img\\/avatar.png\",\"keywords\":\"\\u5173\\u952e\\u5b57\",\"description\":\"\\u63cf\\u8ff0\",\"price\":\"0.00\",\"views\":\"0\",\"startdate\":\"2017-07-10\",\"activitytime\":\"2017-07-10 18:24:45\",\"year\":\"2017\",\"times\":\"18:24:45\",\"refreshtime\":\"2017-07-10 18:24:45\",\"weigh\":\"0\",\"status\":\"normal\",\"state\":\"1\"},\"row_category_ids_text\":\"\",\"row_user_id_text\":\"admin\",\"row_user_ids_text\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499682526'), ('4', '1', 'admin', '/public/admin/test/add/ids?dialog=1', '测试管理 添加', '{\"dialog\":\"1\",\"row_category_id_text\":\"\\u6d4b\\u8bd52\",\"row\":{\"category_id\":\"13\",\"category_ids\":\"13\",\"user_id\":\"3\",\"user_ids\":\"3\",\"week\":\"monday\",\"flag\":[\"hot\",\"index\"],\"genderdata\":\"male\",\"hobbydata\":[\"music\",\"reading\"],\"title\":\"tes\",\"content\":\"

test<\\/p>\",\"image\":\"a\",\"images\":\"b\",\"attachfile\":\"c\",\"keywords\":\"a\",\"description\":\"a\",\"price\":\"0.00\",\"views\":\"0\",\"startdate\":\"2017-07-11\",\"activitytime\":\"2017-07-11 16:12:03\",\"year\":\"2017\",\"times\":\"16:12:03\",\"refreshtime\":\"2017-07-11 16:12:03\",\"weigh\":\"0\",\"status\":\"normal\",\"state\":\"1\"},\"row_category_ids_text\":\"\",\"row_user_id_text\":\"admin\",\"row_user_ids_text\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499760748'), ('5', '1', 'admin', '/public/admin/ajax/upload', '', '{\"name\":\"qrcode.png\",\"signature\":\"45fd8c9bd10632cabd23ba0ce7070533\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499847826\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499761445'), ('6', '1', 'admin', '/public/admin/auth/rule/edit/ids/11291?dialog=1', '权限管理 规则管理 编辑', '{\"dialog\":\"1\",\"row\":{\"ismenu\":\"1\",\"pid\":\"11290\",\"name\":\"\\/admin\\/wechat\\/autoreply\",\"title\":\"\\u5fae\\u4fe1\\u81ea\\u52a8\\u56de\\u590d\\u7ba1\\u7406\",\"icon\":\"fa fa-reply-all\",\"weigh\":\"26\",\"condition\":\"\\u7528\\u6237\\u5728\\u5fae\\u4fe1\\u516c\\u4f17\\u53f7\\u4e2d\\u8f93\\u5165\\u7279\\u5b9a\\u7684\\u6587\\u5b57\\u540e\\uff0c\\u670d\\u52a1\\u5668\\u54cd\\u5e94\\u4e0d\\u540c\\u7684\\u4e8b\\u4ef6\",\"remark\":\"\",\"status\":\"normal\"},\"ids\":\"11291\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499761628'), ('7', '1', 'admin', '/public/admin/auth/group/del/ids/1', '权限管理 角色组 删除', '{\"action\":\"del\",\"ids\":\"1\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499762290'), ('8', '1', 'admin', '/public/admin/auth/group/del/ids/1', '权限管理 角色组 删除', '{\"action\":\"del\",\"ids\":\"1\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499762464'), ('9', '1', 'admin', '/public/admin/auth/group/del/ids/1', '权限管理 角色组 删除', '{\"action\":\"del\",\"ids\":\"1\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499762761'), ('10', '1', 'admin', '/public/admin/auth/group/del/ids/1', '权限管理 角色组 删除', '{\"action\":\"del\",\"ids\":\"1\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499762770'), ('11', '1', 'admin', '/public/admin/auth/group/del/ids/1', '权限管理 角色组 删除', '{\"action\":\"del\",\"ids\":\"1\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499762943'), ('12', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795288.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764194'), ('13', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795290.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764194'), ('14', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795282.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764194'), ('15', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795283.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764194'), ('16', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795292.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764194'), ('17', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795286.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764195'), ('18', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795293.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764245'), ('19', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795277.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764259'), ('20', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795284.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764270'), ('21', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795287.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764281'), ('22', '1', 'admin', '/public/admin.php/ajax/upload', '', '{\"name\":\"14558668_1350878795289.jpg\",\"signature\":\"99d25cbae44dab9ed570f7db53ef28fb\",\"bucket\":\"yourbucketname\",\"save-key\":\"\\/uploads\\/{year}{mon}{day}\\/{filemd5}{.suffix}\",\"expiration\":\"1499850578\",\"notify-url\":\"http:\\/\\/www.yoursite.com\\/upyun\\/notify\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499764291'), ('23', '1', 'admin', '/public/admin.php/general/crontab/get_schedule_future', '', '{\"schedule\":\"* * * * *\",\"days\":\"7\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765449'), ('24', '1', 'admin', '/public/admin.php/general/crontab/check_schedule', '', '{\"row\":{\"schedule\":\"* * * * *\"}}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765451'), ('25', '1', 'admin', '/public/admin.php/general/crontab/get_schedule_future', '', '{\"schedule\":\"* * * * *\",\"days\":\"7\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765451'), ('26', '1', 'admin', '/public/admin.php/general/crontab/edit/ids/1?dialog=1', '常规管理 定时任务 编辑', '{\"dialog\":\"1\",\"row\":{\"title\":\"\\u8bf7\\u6c42FastAdmin\",\"type\":\"url\",\"content\":\"http:\\/\\/www.fastadmin.net\",\"schedule\":\"* * * * *\",\"maximums\":\"0\",\"begintime\":\"2017-01-01 00:00:00\",\"endtime\":\"2019-01-01 00:00:00\",\"weigh\":\"1\",\"status\":\"normal\"},\"ids\":\"1\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765451'), ('27', '1', 'admin', '/public/admin.php/general/crontab/get_schedule_future', '', '{\"schedule\":\"* * * * *\",\"days\":\"7\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765453'), ('28', '1', 'admin', '/public/admin.php/general/crontab/check_schedule', '', '{\"row\":{\"schedule\":\"* * * * *\"}}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765456'), ('29', '1', 'admin', '/public/admin.php/general/crontab/get_schedule_future', '', '{\"schedule\":\"* * * * *\",\"days\":\"7\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765456'), ('30', '1', 'admin', '/public/admin.php/general/crontab/edit/ids/2?dialog=1', '常规管理 定时任务 编辑', '{\"dialog\":\"1\",\"row\":{\"title\":\"\\u67e5\\u8be2\\u4e00\\u6761SQL\",\"type\":\"sql\",\"content\":\"SELECT 1;\",\"schedule\":\"* * * * *\",\"maximums\":\"0\",\"begintime\":\"2017-01-01 00:00:00\",\"endtime\":\"2019-01-01 00:00:00\",\"weigh\":\"2\",\"status\":\"normal\"},\"ids\":\"2\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765456'), ('31', '1', 'admin', '/public/admin.php/general/crontab/get_schedule_future', '', '{\"schedule\":\"* * * * *\",\"days\":\"7\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499765460'), ('32', '1', 'admin', '/public/admin.php/page/add/ids?dialog=1', '单页管理 添加', '{\"dialog\":\"1\",\"row_category_id_text\":\"Android\\u5f00\\u53d1\",\"row\":{\"category_id\":\"4\",\"title\":\"test\",\"keywords\":\"test\",\"flag\":\"recommend\",\"image\":\"\\/assets\\/img\\/qrcode.png\",\"content\":\"

test<\\/p>\",\"icon\":\"\",\"views\":\"0\",\"comments\":\"0\",\"weigh\":\"0\",\"status\":\"normal\"}}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499769482'), ('33', '1', 'admin', '/public/admin.php/example/bootstraptable/change/ids/31', '', '{\"action\":\"\",\"ids\":\"31\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499769813'), ('34', '1', 'admin', '/public/admin.php/example/bootstraptable/change/ids/31', '', '{\"action\":\"\",\"ids\":\"31\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499769814'), ('35', '1', 'admin', '/public/admin.php/example/bootstraptable/change/ids/33', '', '{\"action\":\"\",\"ids\":\"33\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499769815'), ('36', '1', 'admin', '/public/admin.php/example/bootstraptable/change/ids/35', '', '{\"action\":\"\",\"ids\":\"35\",\"params\":\"\"}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36', '1499769816'); -COMMIT; - --- ---------------------------- --- Table structure for `fa_article` --- ---------------------------- -DROP TABLE IF EXISTS `fa_article`; -CREATE TABLE `fa_article` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `category_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '分类ID', - `flag` set('h','i','r') NOT NULL DEFAULT '' COMMENT '标志', - `title` varchar(50) NOT NULL DEFAULT '' COMMENT '标题', - `content` text NOT NULL COMMENT '内容', - `image` varchar(100) NOT NULL DEFAULT '' COMMENT '图片', - `keywords` varchar(255) NOT NULL DEFAULT '' COMMENT '关键字', - `description` varchar(255) NOT NULL DEFAULT '' COMMENT '描述', - `views` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '点击', - `comments` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '评论数', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `weigh` int(10) NOT NULL DEFAULT '0' COMMENT '权重', - `status` enum('normal','hidden') NOT NULL DEFAULT 'normal' COMMENT '状态', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='文章表'; +) ENGINE=InnoDB AUTO_INCREMENT=1218 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表'; -- ---------------------------- -- Table structure for `fa_attachment` @@ -104,9 +75,8 @@ CREATE TABLE `fa_attachment` ( `uploadtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '上传时间', `storage` enum('local','upyun') NOT NULL DEFAULT 'local' COMMENT '存储位置', `sha1` varchar(40) NOT NULL DEFAULT '' COMMENT '文件 sha1编码', - PRIMARY KEY (`id`), - UNIQUE KEY `sha1` (`sha1`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='附件表'; + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='附件表'; -- ---------------------------- -- Records of `fa_attachment` @@ -134,7 +104,7 @@ CREATE TABLE `fa_auth_group` ( -- Records of `fa_auth_group` -- ---------------------------- BEGIN; -INSERT INTO `fa_auth_group` VALUES ('1', '0', '超级管理员', '*', '1490883540', '1490883540', 'normal'), ('2', '1', '二级管理员', '11180,11181,11182,11183,11184,11185,11198,11199,11200,11201,11202,11203,11204,11205,11206,11207,11208,11209,11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225,11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241,11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288,11289', '1490883540', '1497431170', 'normal'), ('3', '2', '三级管理员', '11180,11181,11182,11183,11184,11185,11198,11199,11200,11201,11202,11203,11204,11205,11206,11207,11208,11209,11210,11211,11212,11213,11214,11215,11216,11217', '1490883540', '1497431183', 'normal'), ('4', '1', '二级管理员2', '11174,11175,11176,11177,11178,11179,11180,11181,11182,11183,11184,11185,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304,11305,11306,11307,11308,11309,11310,11311,11312,11313,11314,11315,11316', '1490883540', '1497431177', 'normal'), ('5', '2', '三级管理员2', '11180,11181,11182,11183,11184,11185,11218,11219,11220,11221,11222,11223,11224,11225,11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241,11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288,11289', '1490883540', '1497431190', 'normal'); +INSERT INTO `fa_auth_group` VALUES ('1', '0', '超级管理员', '*', '1490883540', '149088354', 'normal'), ('2', '1', '二级管理员', '1,2,4,6,7,8,9,10,11,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,40,41,42,43,44,45,46,47,48,49,50,55,56,57,58,59,60,61,62,63,64,65,5', '1490883540', '1502205308', 'normal'), ('3', '2', '三级管理员', '1,4,9,10,11,13,14,15,16,17,40,41,42,43,44,45,46,47,48,49,50,55,56,57,58,59,60,61,62,63,64,65,5', '1490883540', '1502205322', 'normal'), ('4', '1', '二级管理员2', '1,4,13,14,15,16,17,55,56,57,58,59,60,61,62,63,64,65', '1490883540', '1502205350', 'normal'), ('5', '2', '三级管理员2', '1,2,6,7,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34', '1490883540', '1502205344', 'normal'); COMMIT; -- ---------------------------- @@ -153,7 +123,7 @@ CREATE TABLE `fa_auth_group_access` ( -- Records of `fa_auth_group_access` -- ---------------------------- BEGIN; -INSERT INTO `fa_auth_group_access` VALUES ('1', '1'), ('2', '2'), ('3', '3'), ('4', '5'), ('5', '5'), ('6', '2'); +INSERT INTO `fa_auth_group_access` VALUES ('1', '1'), ('2', '2'), ('3', '3'), ('4', '5'), ('5', '5'); COMMIT; -- ---------------------------- @@ -178,13 +148,13 @@ CREATE TABLE `fa_auth_rule` ( UNIQUE KEY `name` (`name`) USING BTREE, KEY `pid` (`pid`), KEY `weigh` (`weigh`) -) ENGINE=InnoDB AUTO_INCREMENT=11324 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='节点表'; +) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='节点表'; -- ---------------------------- -- Records of `fa_auth_rule` -- ---------------------------- BEGIN; -INSERT INTO `fa_auth_rule` VALUES ('11174', 'file', '0', '/admin/category', '分类管理', 'fa fa-list\r', '', '用于统一管理网站的所有分类,分类可进行无限级分类\r', '1', '1497429920', '1497429920', '119', 'normal'), ('11175', 'file', '11174', '/admin/category/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '142', 'normal'), ('11176', 'file', '11174', '/admin/category/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '141', 'normal'), ('11177', 'file', '11174', '/admin/category/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '140', 'normal'), ('11178', 'file', '11174', '/admin/category/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '139', 'normal'), ('11179', 'file', '11174', '/admin/category/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '138', 'normal'), ('11180', 'file', '0', '/admin/dashboard', '控制台', 'fa fa-dashboard\r', '', '用于展示当前系统中的统计数据、统计报表及重要实时数据\r', '1', '1497429920', '1497429920', '143', 'normal'), ('11181', 'file', '11180', '/admin/dashboard/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '136', 'normal'), ('11182', 'file', '11180', '/admin/dashboard/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '135', 'normal'), ('11183', 'file', '11180', '/admin/dashboard/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '134', 'normal'), ('11184', 'file', '11180', '/admin/dashboard/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '133', 'normal'), ('11185', 'file', '11180', '/admin/dashboard/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '132', 'normal'), ('11186', 'file', '0', '/admin/page', '单页管理', 'fa fa-tags', '', '用于管理普通的单页面,通常用于关于我们、联系我们、商务合作等单一页面\r\n', '1', '1497429920', '1497430149', '125', 'normal'), ('11187', 'file', '11186', '/admin/page/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '130', 'normal'), ('11188', 'file', '11186', '/admin/page/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '129', 'normal'), ('11189', 'file', '11186', '/admin/page/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '128', 'normal'), ('11190', 'file', '11186', '/admin/page/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '127', 'normal'), ('11191', 'file', '11186', '/admin/page/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '126', 'normal'), ('11192', 'file', '0', '/admin/version', '版本管理', 'fa fa-file-text-o', '', '', '1', '1497429920', '1497430600', '27', 'normal'), ('11193', 'file', '11192', '/admin/version/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '124', 'normal'), ('11194', 'file', '11192', '/admin/version/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '123', 'normal'), ('11195', 'file', '11192', '/admin/version/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '122', 'normal'), ('11196', 'file', '11192', '/admin/version/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '121', 'normal'), ('11197', 'file', '11192', '/admin/version/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '120', 'normal'), ('11198', 'file', '0', '/admin/auth', '权限管理', 'fa fa-group', '', '', '1', '1497429920', '1497430092', '99', 'normal'), ('11199', 'file', '11198', '/admin/auth/admin', '管理员管理', 'fa fa-user', '', '一个管理员可以有多个角色组,左侧的菜单根据管理员所拥有的权限进行生成', '1', '1497429920', '1497430320', '118', 'normal'), ('11200', 'file', '11199', '/admin/auth/admin/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '117', 'normal'), ('11201', 'file', '11199', '/admin/auth/admin/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '116', 'normal'), ('11202', 'file', '11199', '/admin/auth/admin/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '115', 'normal'), ('11203', 'file', '11199', '/admin/auth/admin/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '114', 'normal'), ('11204', 'file', '11198', '/admin/auth/adminlog', '管理员日志', 'fa fa-list-alt', '', '管理员可以查看自己所拥有的权限的管理员日志', '1', '1497429920', '1497430307', '113', 'normal'), ('11205', 'file', '11204', '/admin/auth/adminlog/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '112', 'normal'), ('11206', 'file', '11204', '/admin/auth/adminlog/detail', '详情', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '111', 'normal'), ('11207', 'file', '11204', '/admin/auth/adminlog/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '110', 'normal'), ('11208', 'file', '11198', '/admin/auth/group', '角色组', 'fa fa-group', '', '角色组可以有多个,角色有上下级层级关系,如果子角色有角色组和管理员的权限则可以派生属于自己组别下级的角色组或管理员', '1', '1497429920', '1497429920', '109', 'normal'), ('11209', 'file', '11208', '/admin/auth/group/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '108', 'normal'), ('11210', 'file', '11208', '/admin/auth/group/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '107', 'normal'), ('11211', 'file', '11208', '/admin/auth/group/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '106', 'normal'), ('11212', 'file', '11208', '/admin/auth/group/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '105', 'normal'), ('11213', 'file', '11198', '/admin/auth/rule', '规则管理', 'fa fa-bars', '', '规则通常对应一个控制器的方法,同时左侧的菜单栏数据也从规则中体现,通常建议通过控制台进行生成规则节点', '1', '1497429920', '1497430581', '104', 'normal'), ('11214', 'file', '11213', '/admin/auth/rule/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '103', 'normal'), ('11215', 'file', '11213', '/admin/auth/rule/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '102', 'normal'), ('11216', 'file', '11213', '/admin/auth/rule/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '101', 'normal'), ('11217', 'file', '11213', '/admin/auth/rule/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '100', 'normal'), ('11218', 'file', '0', '/admin/example', '示例管理', 'fa fa-magic', '', '', '1', '1497429920', '1497430123', '131', 'normal'), ('11219', 'file', '11218', '/admin/example/bootstraptable', '表格完整示例', 'fa fa-table', '', '在使用Bootstrap-table中的常用方式,更多使用方式可查看:http://bootstrap-table.wenzhixin.net.cn/zh-cn/', '1', '1497429920', '1497429920', '98', 'normal'), ('11220', 'file', '11219', '/admin/example/bootstraptable/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '97', 'normal'), ('11221', 'file', '11219', '/admin/example/bootstraptable/detail', '详情', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '96', 'normal'), ('11222', 'file', '11219', '/admin/example/bootstraptable/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '95', 'normal'), ('11223', 'file', '11219', '/admin/example/bootstraptable/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '94', 'normal'), ('11224', 'file', '11219', '/admin/example/bootstraptable/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '93', 'normal'), ('11225', 'file', '11219', '/admin/example/bootstraptable/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '92', 'normal'), ('11226', 'file', '11218', '/admin/example/colorbadge', '彩色角标', 'fa fa-table', '', '在JS端控制角标的显示与隐藏,请注意左侧菜单栏角标的数值变化', '1', '1497429920', '1497429920', '91', 'normal'), ('11227', 'file', '11226', '/admin/example/colorbadge/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '90', 'normal'), ('11228', 'file', '11226', '/admin/example/colorbadge/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '89', 'normal'), ('11229', 'file', '11226', '/admin/example/colorbadge/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '88', 'normal'), ('11230', 'file', '11226', '/admin/example/colorbadge/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '87', 'normal'), ('11231', 'file', '11226', '/admin/example/colorbadge/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '86', 'normal'), ('11232', 'file', '11218', '/admin/example/controllerjump', '控制器间跳转', 'fa fa-table', '', 'FastAdmin支持在控制器间跳转,点击后将切换到另外一个TAB中,无需刷新当前页面', '1', '1497429920', '1497429920', '85', 'normal'), ('11233', 'file', '11232', '/admin/example/controllerjump/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '84', 'normal'), ('11234', 'file', '11232', '/admin/example/controllerjump/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '83', 'normal'), ('11235', 'file', '11232', '/admin/example/controllerjump/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '82', 'normal'), ('11236', 'file', '11232', '/admin/example/controllerjump/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '81', 'normal'), ('11237', 'file', '11232', '/admin/example/controllerjump/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '80', 'normal'), ('11238', 'file', '11218', '/admin/example/cxselect', '多级联动', 'fa fa-table', '', 'FastAdmin使用了jQuery-cxselect实现多级联动,更多文档请参考https://github.com/karsonzhang/cxSelect', '1', '1497429920', '1497429920', '79', 'normal'), ('11239', 'file', '11238', '/admin/example/cxselect/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '78', 'normal'), ('11240', 'file', '11238', '/admin/example/cxselect/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '77', 'normal'), ('11241', 'file', '11238', '/admin/example/cxselect/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '76', 'normal'), ('11242', 'file', '11238', '/admin/example/cxselect/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '75', 'normal'), ('11243', 'file', '11238', '/admin/example/cxselect/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '74', 'normal'), ('11244', 'file', '11218', '/admin/example/multitable', '多表格示例', 'fa fa-table', '', '当一个页面上存在多个Bootstrap-table时该如何控制按钮和表格', '1', '1497429920', '1497429920', '73', 'normal'), ('11245', 'file', '11244', '/admin/example/multitable/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '72', 'normal'), ('11246', 'file', '11244', '/admin/example/multitable/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '71', 'normal'), ('11247', 'file', '11244', '/admin/example/multitable/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '70', 'normal'), ('11248', 'file', '11244', '/admin/example/multitable/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '69', 'normal'), ('11249', 'file', '11244', '/admin/example/multitable/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '68', 'normal'), ('11250', 'file', '11218', '/admin/example/relationmodel', '多模型关联', 'fa fa-table', '', '当使用到关联模型时需要重载index方法', '1', '1497429920', '1497429920', '67', 'normal'), ('11251', 'file', '11250', '/admin/example/relationmodel/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '66', 'normal'), ('11252', 'file', '11250', '/admin/example/relationmodel/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '65', 'normal'), ('11253', 'file', '11250', '/admin/example/relationmodel/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '64', 'normal'), ('11254', 'file', '11250', '/admin/example/relationmodel/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '63', 'normal'), ('11255', 'file', '11250', '/admin/example/relationmodel/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '62', 'normal'), ('11256', 'file', '0', '/admin/general', '常规管理', 'fa fa-cogs', '', '', '1', '1497429920', '1497430169', '137', 'normal'), ('11257', 'file', '11256', '/admin/general/attachment', '附件管理', 'fa fa-file-image-o', '', '主要用于管理上传到又拍云的数据或上传至本服务的上传数据\r\n', '1', '1497429920', '1497430699', '53', 'normal'), ('11258', 'file', '11257', '/admin/general/attachment/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '59', 'normal'), ('11259', 'file', '11257', '/admin/general/attachment/select', '选择附件', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '58', 'normal'), ('11260', 'file', '11257', '/admin/general/attachment/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '57', 'normal'), ('11261', 'file', '11257', '/admin/general/attachment/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '56', 'normal'), ('11262', 'file', '11257', '/admin/general/attachment/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '55', 'normal'), ('11263', 'file', '11257', '/admin/general/attachment/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '54', 'normal'), ('11264', 'file', '11256', '/admin/general/config', '系统配置', 'fa fa-cog', '', '', '1', '1497429920', '1497430683', '60', 'normal'), ('11265', 'file', '11264', '/admin/general/config/index', 'index', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '52', 'normal'), ('11266', 'file', '11264', '/admin/general/config/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '51', 'normal'), ('11267', 'file', '11264', '/admin/general/config/edit', 'edit', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '50', 'normal'), ('11268', 'file', '11264', '/admin/general/config/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '49', 'normal'), ('11269', 'file', '11264', '/admin/general/config/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '48', 'normal'), ('11270', 'file', '11256', '/admin/general/crontab', '定时任务', 'fa fa-tasks', '', '类似于Linux的Crontab定时任务,可以按照设定的时间进行任务的执行,目前仅支持三种任务:请求URL、执行SQL、执行Shell', '1', '1497429920', '1497429920', '47', 'normal'), ('11271', 'file', '11270', '/admin/general/crontab/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '46', 'normal'), ('11272', 'file', '11270', '/admin/general/crontab/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '45', 'normal'), ('11273', 'file', '11270', '/admin/general/crontab/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '44', 'normal'), ('11274', 'file', '11270', '/admin/general/crontab/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '43', 'normal'), ('11275', 'file', '11270', '/admin/general/crontab/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '42', 'normal'), ('11276', 'file', '11256', '/admin/general/database', '数据库管理', 'fa fa-database', '', '可在线进行一些简单的数据库表优化或修复,查看表结构和数据。也可以进行SQL语句的操作', '1', '1497429920', '1497429920', '41', 'normal'), ('11277', 'file', '11276', '/admin/general/database/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '40', 'normal'), ('11278', 'file', '11276', '/admin/general/database/query', 'SQL查询', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '39', 'normal'), ('11279', 'file', '11276', '/admin/general/database/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '38', 'normal'), ('11280', 'file', '11276', '/admin/general/database/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '37', 'normal'), ('11281', 'file', '11276', '/admin/general/database/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '36', 'normal'), ('11282', 'file', '11276', '/admin/general/database/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '35', 'normal'), ('11283', 'file', '11256', '/admin/general/profile', '个人配置', 'fa fa-user\r', '', '', '1', '1497429920', '1497429920', '34', 'normal'), ('11284', 'file', '11283', '/admin/general/profile/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '33', 'normal'), ('11285', 'file', '11283', '/admin/general/profile/update', '更新个人信息', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '32', 'normal'), ('11286', 'file', '11283', '/admin/general/profile/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '31', 'normal'), ('11287', 'file', '11283', '/admin/general/profile/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '30', 'normal'), ('11288', 'file', '11283', '/admin/general/profile/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '29', 'normal'), ('11289', 'file', '11283', '/admin/general/profile/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '28', 'normal'), ('11290', 'file', '0', '/admin/wechat', '微信管理', 'fa fa-wechat', '', '', '1', '1497429920', '1497430064', '61', 'normal'), ('11291', 'file', '11290', '/admin/wechat/autoreply', '微信自动回复管理', 'fa fa-reply-all', '用户在微信公众号中输入特定的文字后，服务器响应不同的事件', '', '1', '1497429920', '1499761628', '26', 'normal'), ('11292', 'file', '11291', '/admin/wechat/autoreply/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '25', 'normal'), ('11293', 'file', '11291', '/admin/wechat/autoreply/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '24', 'normal'), ('11294', 'file', '11291', '/admin/wechat/autoreply/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '23', 'normal'), ('11295', 'file', '11291', '/admin/wechat/autoreply/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '22', 'normal'), ('11296', 'file', '11291', '/admin/wechat/autoreply/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '21', 'normal'), ('11297', 'file', '11290', '/admin/wechat/config', '微信配置管理', 'fa fa-cog', '', '', '1', '1497429920', '1497430632', '20', 'normal'), ('11298', 'file', '11297', '/admin/wechat/config/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '19', 'normal'), ('11299', 'file', '11297', '/admin/wechat/config/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '18', 'normal'), ('11300', 'file', '11297', '/admin/wechat/config/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '17', 'normal'), ('11301', 'file', '11297', '/admin/wechat/config/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '16', 'normal'), ('11302', 'file', '11297', '/admin/wechat/config/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '15', 'normal'), ('11303', 'file', '11290', '/admin/wechat/menu', '菜单管理', 'fa fa-bars', '', '', '1', '1497429920', '1497430652', '14', 'normal'), ('11304', 'file', '11303', '/admin/wechat/menu/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '13', 'normal'), ('11305', 'file', '11303', '/admin/wechat/menu/edit', '修改', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '12', 'normal'), ('11306', 'file', '11303', '/admin/wechat/menu/sync', '同步', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '11', 'normal'), ('11307', 'file', '11303', '/admin/wechat/menu/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '10', 'normal'), ('11308', 'file', '11303', '/admin/wechat/menu/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '9', 'normal'), ('11309', 'file', '11303', '/admin/wechat/menu/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '8', 'normal'), ('11310', 'file', '11290', '/admin/wechat/response', '资源管理', 'fa fa-list-alt', '', '', '1', '1497429920', '1497429920', '7', 'normal'), ('11311', 'file', '11310', '/admin/wechat/response/select', '选择素材', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '6', 'normal'), ('11312', 'file', '11310', '/admin/wechat/response/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '5', 'normal'), ('11313', 'file', '11310', '/admin/wechat/response/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '4', 'normal'), ('11314', 'file', '11310', '/admin/wechat/response/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '3', 'normal'), ('11315', 'file', '11310', '/admin/wechat/response/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '2', 'normal'), ('11316', 'file', '11310', '/admin/wechat/response/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '1', 'normal'), ('11317', 'file', '11218', '/admin/example/tabletemplate', '表格模板示例', 'fa fa-table', '', '可以通过使用表格模板将表格中的行渲染成一样的展现方式，基于此功能可以任意定制自己想要的展示列表', '1', '1497968508', '1497968508', '0', 'normal'), ('11318', 'file', '11317', '/admin/example/tabletemplate/index', '查看', 'fa fa-circle-o', '', '', '0', '1497968508', '1497968508', '0', 'normal'), ('11319', 'file', '11317', '/admin/example/tabletemplate/detail', '详情', 'fa fa-circle-o', '', '', '0', '1497968508', '1497968508', '0', 'normal'), ('11320', 'file', '11317', '/admin/example/tabletemplate/add', '添加', 'fa fa-circle-o', '', '', '0', '1497968508', '1497968508', '0', 'normal'), ('11321', 'file', '11317', '/admin/example/tabletemplate/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497968508', '1497968508', '0', 'normal'), ('11322', 'file', '11317', '/admin/example/tabletemplate/del', '删除', 'fa fa-circle-o', '', '', '0', '1497968508', '1497968508', '0', 'normal'), ('11323', 'file', '11317', '/admin/example/tabletemplate/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497968508', '1497968508', '0', 'normal'); +INSERT INTO `fa_auth_rule` VALUES ('1', 'file', '0', 'dashboard', '控制台', 'fa fa-dashboard\r', '', '用于展示当前系统中的统计数据、统计报表及重要实时数据\r', '1', '1497429920', '1497429920', '143', 'normal'), ('2', 'file', '0', 'general', '常规管理', 'fa fa-cogs', '', '', '1', '1497429920', '1497430169', '137', 'normal'), ('3', 'file', '0', 'category', '分类管理', 'fa fa-list\r', '', '用于统一管理网站的所有分类,分类可进行无限级分类\r', '1', '1497429920', '1497429920', '119', 'normal'), ('4', 'file', '0', 'addon', '插件管理', 'fa fa-rocket', '', '可在线安装、卸载、禁用、启用插件，同时支持添加本地插件', '1', '1502035509', '1502035509', '0', 'normal'), ('5', 'file', '0', 'auth', '权限管理', 'fa fa-group', '', '', '1', '1497429920', '1497430092', '99', 'normal'), ('6', 'file', '2', 'general/config', '系统配置', 'fa fa-cog', '', '', '1', '1497429920', '1497430683', '60', 'normal'), ('7', 'file', '2', 'general/attachment', '附件管理', 'fa fa-file-image-o', '', '主要用于管理上传到又拍云的数据或上传至本服务的上传数据\r\n', '1', '1497429920', '1497430699', '53', 'normal'), ('8', 'file', '2', 'general/profile', '个人配置', 'fa fa-user\r', '', '', '1', '1497429920', '1497429920', '34', 'normal'), ('9', 'file', '5', 'auth/admin', '管理员管理', 'fa fa-user', '', '一个管理员可以有多个角色组,左侧的菜单根据管理员所拥有的权限进行生成', '1', '1497429920', '1497430320', '118', 'normal'), ('10', 'file', '5', 'auth/adminlog', '管理员日志', 'fa fa-list-alt', '', '管理员可以查看自己所拥有的权限的管理员日志', '1', '1497429920', '1497430307', '113', 'normal'), ('11', 'file', '5', 'auth/group', '角色组', 'fa fa-group', '', '角色组可以有多个,角色有上下级层级关系,如果子角色有角色组和管理员的权限则可以派生属于自己组别下级的角色组或管理员', '1', '1497429920', '1497429920', '109', 'normal'), ('12', 'file', '5', 'auth/rule', '规则管理', 'fa fa-bars', '', '规则通常对应一个控制器的方法,同时左侧的菜单栏数据也从规则中体现,通常建议通过控制台进行生成规则节点', '1', '1497429920', '1497430581', '104', 'normal'), ('13', 'file', '1', 'dashboard/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '136', 'normal'), ('14', 'file', '1', 'dashboard/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '135', 'normal'), ('15', 'file', '1', 'dashboard/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '133', 'normal'), ('16', 'file', '1', 'dashboard/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '134', 'normal'), ('17', 'file', '1', 'dashboard/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '132', 'normal'), ('18', 'file', '6', 'general/config/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '52', 'normal'), ('19', 'file', '6', 'general/config/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '51', 'normal'), ('20', 'file', '6', 'general/config/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '50', 'normal'), ('21', 'file', '6', 'general/config/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '49', 'normal'), ('22', 'file', '6', 'general/config/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '48', 'normal'), ('23', 'file', '7', 'general/attachment/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '59', 'normal'), ('24', 'file', '7', 'general/attachment/select', '选择附件', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '58', 'normal'), ('25', 'file', '7', 'general/attachment/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '57', 'normal'), ('26', 'file', '7', 'general/attachment/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '56', 'normal'), ('27', 'file', '7', 'general/attachment/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '55', 'normal'), ('28', 'file', '7', 'general/attachment/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '54', 'normal'), ('29', 'file', '8', 'general/profile/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '33', 'normal'), ('30', 'file', '8', 'general/profile/update', '更新个人信息', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '32', 'normal'), ('31', 'file', '8', 'general/profile/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '31', 'normal'), ('32', 'file', '8', 'general/profile/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '30', 'normal'), ('33', 'file', '8', 'general/profile/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '29', 'normal'), ('34', 'file', '8', 'general/profile/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '28', 'normal'), ('35', 'file', '3', 'category/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '142', 'normal'), ('36', 'file', '3', 'category/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '141', 'normal'), ('37', 'file', '3', 'category/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '140', 'normal'), ('38', 'file', '3', 'category/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '139', 'normal'), ('39', 'file', '3', 'category/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '138', 'normal'), ('40', 'file', '9', 'auth/admin/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '117', 'normal'), ('41', 'file', '9', 'auth/admin/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '116', 'normal'), ('42', 'file', '9', 'auth/admin/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '115', 'normal'), ('43', 'file', '9', 'auth/admin/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '114', 'normal'), ('44', 'file', '10', 'auth/adminlog/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '112', 'normal'), ('45', 'file', '10', 'auth/adminlog/detail', '详情', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '111', 'normal'), ('46', 'file', '10', 'auth/adminlog/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '110', 'normal'), ('47', 'file', '11', 'auth/group/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '108', 'normal'), ('48', 'file', '11', 'auth/group/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '107', 'normal'), ('49', 'file', '11', 'auth/group/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '106', 'normal'), ('50', 'file', '11', 'auth/group/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '105', 'normal'), ('51', 'file', '12', 'auth/rule/index', '查看', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '103', 'normal'), ('52', 'file', '12', 'auth/rule/add', '添加', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '102', 'normal'), ('53', 'file', '12', 'auth/rule/edit', '编辑', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '101', 'normal'), ('54', 'file', '12', 'auth/rule/del', '删除', 'fa fa-circle-o', '', '', '0', '1497429920', '1497429920', '100', 'normal'), ('55', 'file', '4', 'addon/index', '查看', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('56', 'file', '4', 'addon/add', '添加', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('57', 'file', '4', 'addon/edit', '修改', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('58', 'file', '4', 'addon/del', '删除', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('59', 'file', '4', 'addon/local', '本地安装', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('60', 'file', '4', 'addon/state', '禁用启用', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('61', 'file', '4', 'addon/install', '安装', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('62', 'file', '4', 'addon/uninstall', '卸载', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('63', 'file', '4', 'addon/config', '配置', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('64', 'file', '4', 'addon/refresh', '刷新', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'), ('65', 'file', '4', 'addon/multi', '批量更新', 'fa fa-circle-o', '', '', '0', '1502035509', '1502035509', '0', 'normal'); COMMIT; -- ---------------------------- @@ -209,13 +179,13 @@ CREATE TABLE `fa_category` ( PRIMARY KEY (`id`), KEY `weigh` (`weigh`,`id`), KEY `pid` (`pid`) -) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='分类表'; +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='分类表'; -- ---------------------------- -- Records of `fa_category` -- ---------------------------- BEGIN; -INSERT INTO `fa_category` VALUES ('1', '0', 'page', '官方新闻', 'news', 'recommend', '/assets/img/qrcode.png', '', '', 'news', '1495262190', '1495262190', '1', 'normal'), ('2', '0', 'page', '移动应用', 'mobileapp', 'hot', '/assets/img/qrcode.png', '', '', 'mobileapp', '1495262244', '1495262244', '2', 'normal'), ('3', '2', 'page', '微信公众号', 'wechatpublic', 'index', '/assets/img/qrcode.png', '', '', 'wechatpublic', '1495262288', '1495262288', '3', 'normal'), ('4', '2', 'page', 'Android开发', 'android', 'recommend', '/assets/img/qrcode.png', '', '', 'android', '1495262317', '1495262317', '4', 'normal'), ('5', '0', 'page', '软件产品', 'software', 'recommend', '/assets/img/qrcode.png', '', '', 'software', '1495262336', '1499681850', '5', 'normal'), ('6', '5', 'page', '网站建站', 'website', 'recommend', '/assets/img/qrcode.png', '', '', 'website', '1495262357', '1495262357', '6', 'normal'), ('7', '5', 'page', '企业管理软件', 'company', 'index', '/assets/img/qrcode.png', '', '', 'company', '1495262391', '1495262391', '7', 'normal'), ('8', '6', 'page', 'PC端', 'website-pc', 'recommend', '/assets/img/qrcode.png', '', '', 'website-pc', '1495262424', '1495262424', '8', 'normal'), ('9', '6', 'page', '移动端', 'website-mobile', 'recommend', '/assets/img/qrcode.png', '', '', 'website-mobile', '1495262456', '1495262456', '9', 'normal'), ('10', '7', 'page', 'CRM系统 ', 'company-crm', 'recommend', '/assets/img/qrcode.png', '', '', 'company-crm', '1495262487', '1495262487', '10', 'normal'), ('11', '7', 'page', 'SASS平台软件', 'company-sass', 'recommend', '/assets/img/qrcode.png', '', '', 'company-sass', '1495262515', '1495262515', '11', 'normal'), ('12', '0', 'test', '测试1', 'test1', 'recommend', '/assets/img/qrcode.png', '', '', 'test1', '1497015727', '1497015727', '12', 'normal'), ('13', '0', 'test', '测试2', 'test2', 'recommend', '/assets/img/qrcode.png', '', '', 'test2', '1497015738', '1497015738', '13', 'normal'); +INSERT INTO `fa_category` VALUES ('1', '0', 'page', '官方新闻', 'news', 'recommend', '/assets/img/qrcode.png', '', '', 'news', '1495262190', '1495262190', '1', 'normal'), ('2', '0', 'page', '移动应用', 'mobileapp', 'hot', '/assets/img/qrcode.png', '', '', 'mobileapp', '1495262244', '1495262244', '2', 'normal'), ('3', '2', 'page', '微信公众号', 'wechatpublic', 'index', '/assets/img/qrcode.png', '', '', 'wechatpublic', '1495262288', '1495262288', '3', 'normal'), ('4', '2', 'page', 'Android开发', 'android', 'recommend', '/assets/img/qrcode.png', '', '', 'android', '1495262317', '1495262317', '4', 'normal'), ('5', '0', 'page', '软件产品', 'software', 'recommend', '/assets/img/qrcode.png', '', '', 'software', '1495262336', '1499681850', '5', 'normal'), ('6', '5', 'page', '网站建站', 'website', 'recommend', '/assets/img/qrcode.png', '', '', 'website', '1495262357', '1495262357', '6', 'normal'), ('7', '5', 'page', '企业管理软件', 'company', 'index', '/assets/img/qrcode.png', '', '', 'company', '1495262391', '1495262391', '7', 'normal'), ('8', '6', 'page', 'PC端', 'website-pc', 'recommend', '/assets/img/qrcode.png', '', '', 'website-pc', '1495262424', '1495262424', '8', 'normal'), ('9', '6', 'page', '移动端', 'website-mobile', 'recommend', '/assets/img/qrcode.png', '', '', 'website-mobile', '1495262456', '1495262456', '9', 'normal'), ('10', '7', 'page', 'CRM系统 ', 'company-crm', 'recommend', '/assets/img/qrcode.png', '', '', 'company-crm', '1495262487', '1495262487', '10', 'normal'), ('11', '7', 'page', 'SASS平台软件', 'company-sass', 'recommend', '/assets/img/qrcode.png', '', '', 'company-sass', '1495262515', '1495262515', '11', 'normal'), ('12', '0', 'test', '测试1', 'test1', 'recommend', '/assets/img/qrcode.png', '', '', 'test1', '1497015727', '1497015727', '12', 'normal'), ('13', '0', 'test', '测试2', 'test2', 'recommend', '/assets/img/qrcode.png', '', '', 'test2', '1497015738', '1497015738', '13', 'normal'), ('14', '0', 'page', '官方新闻', 'news', 'recommend', '/assets/img/qrcode.png', '', '', 'news', '1495262190', '1495262190', '1', 'normal'), ('15', '0', 'page', '移动应用', 'mobileapp', 'hot', '/assets/img/qrcode.png', '', '', 'mobileapp', '1495262244', '1495262244', '2', 'normal'), ('16', '2', 'page', '微信公众号', 'wechatpublic', 'index', '/assets/img/qrcode.png', '', '', 'wechatpublic', '1495262288', '1495262288', '3', 'normal'), ('17', '2', 'page', 'Android开发', 'android', 'recommend', '/assets/img/qrcode.png', '', '', 'android', '1495262317', '1495262317', '4', 'normal'), ('18', '0', 'page', '软件产品', 'software', 'recommend', '/assets/img/qrcode.png', '', '', 'software', '1495262336', '1499681850', '5', 'normal'), ('19', '5', 'page', '网站建站', 'website', 'recommend', '/assets/img/qrcode.png', '', '', 'website', '1495262357', '1495262357', '6', 'normal'), ('20', '5', 'page', '企业管理软件', 'company', 'index', '/assets/img/qrcode.png', '', '', 'company', '1495262391', '1495262391', '7', 'normal'), ('21', '6', 'page', 'PC端', 'website-pc', 'recommend', '/assets/img/qrcode.png', '', '', 'website-pc', '1495262424', '1495262424', '8', 'normal'), ('22', '6', 'page', '移动端', 'website-mobile', 'recommend', '/assets/img/qrcode.png', '', '', 'website-mobile', '1495262456', '1495262456', '9', 'normal'), ('23', '7', 'page', 'CRM系统 ', 'company-crm', 'recommend', '/assets/img/qrcode.png', '', '', 'company-crm', '1495262487', '1495262487', '10', 'normal'), ('24', '7', 'page', 'SASS平台软件', 'company-sass', 'recommend', '/assets/img/qrcode.png', '', '', 'company-sass', '1495262515', '1495262515', '11', 'normal'), ('25', '0', 'test', '测试1', 'test1', 'recommend', '/assets/img/qrcode.png', '', '', 'test1', '1497015727', '1497015727', '12', 'normal'), ('26', '0', 'test', '测试2', 'test2', 'recommend', '/assets/img/qrcode.png', '', '', 'test2', '1497015738', '1497015738', '13', 'normal'); COMMIT; -- ---------------------------- @@ -244,65 +214,6 @@ BEGIN; INSERT INTO `fa_config` VALUES ('1', 'name', 'basic', '站点名称', '请填写站点名称', 'string', 'FastAdmin', '', 'required', ''), ('2', 'beian', 'basic', '备案号', '粤ICP备15054802号-4', 'string', '', '', '', ''), ('3', 'cdnurl', 'basic', 'CDN地址', '如果使用CDN云储存请配置该值', 'string', '', '', '', ''), ('4', 'version', 'basic', '版本号', '如果静态资源有变动请重新配置该值', 'string', '1.0.1', '', 'required', ''), ('5', 'timezone', 'basic', '时区', '', 'string', 'Asia/Shanghai', '', 'required', ''), ('6', 'forbiddenip', 'basic', '禁止访问IP', '一行一条记录', 'text', '', '', '', ''), ('7', 'languages', 'basic', '模块语言', '', 'array', '{\"backend\":\"zh-cn\",\"frontend\":\"zh-cn\"}', '', 'required', ''), ('8', 'fixedpage', 'basic', '后台默认页', '请尽量输入左侧菜单栏存在的链接', 'string', 'dashboard', '', 'required', ''), ('9', 'categorytype', 'dictionary', '分类类型', '', 'array', '{\"default\":\"默认\",\"page\":\"单页\",\"article\":\"文章\",\"test\":\"测试\"}', '', '', ''), ('10', 'configgroup', 'dictionary', '配置分组', '', 'array', '{\"basic\":\"基础配置\",\"email\":\"邮件配置\",\"dictionary\":\"字典配置\",\"user\":\"会员配置\",\"example\":\"示例分组\"}', '', '', ''), ('11', 'mail_type', 'email', '邮件发送方式', '选择邮件发送方式', 'select', '1', '[\"请选择\",\"SMTP\",\"mail()函数\"]', '', ''), ('12', 'mail_smtp_host', 'email', 'SMTP[服务器]', '错误的配置发送邮件会导致服务器超时', 'string', 'smtp.qq.com', '', '', ''), ('13', 'mail_smtp_port', 'email', 'SMTP[端口]', '(不加密默认25,SSL默认465,TLS默认587)', 'string', '465', '', '', ''), ('14', 'mail_smtp_user', 'email', 'SMTP[用户名]', '（填写完整用户名）', 'string', '10000', '', '', ''), ('15', 'mail_smtp_pass', 'email', 'SMTP[密码]', '（填写您的密码）', 'string', 'password', '', '', ''), ('16', 'mail_verify_type', 'email', 'SMTP验证方式', '（SMTP验证方式[推荐SSL]）', 'select', '2', '[\"无\",\"TLS\",\"SSL\"]', '', ''), ('17', 'mail_from', 'email', '发件人邮箱', '', 'string', '10000@qq.com', '', '', ''); COMMIT; --- ---------------------------- --- Table structure for `fa_crontab` --- ---------------------------- -DROP TABLE IF EXISTS `fa_crontab`; -CREATE TABLE `fa_crontab` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `type` varchar(10) NOT NULL DEFAULT '' COMMENT '事件类型', - `title` varchar(100) NOT NULL DEFAULT '' COMMENT '事件标题', - `content` text NOT NULL COMMENT '事件内容', - `schedule` varchar(100) NOT NULL DEFAULT '' COMMENT 'Crontab格式', - `sleep` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '延迟秒数执行', - `maximums` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大执行次数 0为不限', - `executes` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '已经执行的次数', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `begintime` int(10) NOT NULL DEFAULT '0' COMMENT '开始时间', - `endtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '结束时间', - `executetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最后执行时间', - `weigh` int(10) NOT NULL DEFAULT '0' COMMENT '权重', - `status` enum('completed','expired','hidden','normal') NOT NULL DEFAULT 'normal' COMMENT '状态', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='定时任务表'; - --- ---------------------------- --- Records of `fa_crontab` --- ---------------------------- -BEGIN; -INSERT INTO `fa_crontab` VALUES ('1', 'url', '请求FastAdmin', 'http://www.fastadmin.net', '* * * * *', '0', '0', '1063', '1497070825', '1499788320', '1483200000', '1546272000', '1499788320', '1', 'normal'), ('2', 'sql', '查询一条SQL', 'SELECT 1;', '* * * * *', '0', '0', '1063', '1497071095', '1499788320', '1483200000', '1546272000', '1499788320', '2', 'normal'); -COMMIT; - --- ---------------------------- --- Table structure for `fa_page` --- ---------------------------- -DROP TABLE IF EXISTS `fa_page`; -CREATE TABLE `fa_page` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `category_id` int(10) NOT NULL DEFAULT '0' COMMENT '分类ID', - `title` varchar(50) NOT NULL DEFAULT '' COMMENT '标题', - `keywords` varchar(255) NOT NULL DEFAULT '' COMMENT '关键字', - `flag` set('hot','index','recommend') NOT NULL DEFAULT '' COMMENT '标志', - `image` varchar(255) NOT NULL DEFAULT '' COMMENT '头像', - `content` text NOT NULL COMMENT '内容', - `icon` varchar(50) NOT NULL DEFAULT '' COMMENT '图标', - `views` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '点击', - `comments` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '评论', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `weigh` int(10) NOT NULL DEFAULT '0' COMMENT '权重', - `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='单页表'; - --- ---------------------------- --- Records of `fa_page` --- ---------------------------- -BEGIN; -INSERT INTO `fa_page` VALUES ('1', '4', 'test', 'test', 'recommend', '/assets/img/qrcode.png', '

test

', '', '0', '0', '1499769482', '1499769482', '0', 'normal'); -COMMIT; - -- ---------------------------- -- Table structure for `fa_test` -- ---------------------------- @@ -311,8 +222,6 @@ CREATE TABLE `fa_test` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', `category_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '分类ID(单选)', `category_ids` varchar(100) NOT NULL COMMENT '分类ID(多选)', - `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID', - `user_ids` varchar(100) NOT NULL DEFAULT '' COMMENT '多会员ID', `week` enum('monday','tuesday','wednesday') NOT NULL COMMENT '星期(单选):monday=星期一,tuesday=星期二,wednesday=星期三', `flag` set('hot','index','recommend') NOT NULL DEFAULT '' COMMENT '标志(多选):hot=热门,index=首页,recommend=推荐', `genderdata` enum('male','female') NOT NULL DEFAULT 'male' COMMENT '性别(单选):male=男,female=女', @@ -324,6 +233,7 @@ CREATE TABLE `fa_test` ( `attachfile` varchar(100) NOT NULL DEFAULT '' COMMENT '附件', `keywords` varchar(100) NOT NULL DEFAULT '' COMMENT '关键字', `description` varchar(255) NOT NULL DEFAULT '' COMMENT '描述', + `city` varchar(100) NOT NULL DEFAULT '' COMMENT '省市', `price` float(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '价格', `views` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '点击', `startdate` date DEFAULT NULL COMMENT '开始日期', @@ -334,6 +244,7 @@ CREATE TABLE `fa_test` ( `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', `weigh` int(10) NOT NULL DEFAULT '0' COMMENT '权重', + `switch` tinyint(1) NOT NULL DEFAULT '0' COMMENT '开关', `status` enum('normal','hidden') NOT NULL DEFAULT 'normal' COMMENT '状态', `state` enum('0','1','2') NOT NULL DEFAULT '1' COMMENT '状态值:0=禁用,1=正常,2=推荐', PRIMARY KEY (`id`) @@ -343,193 +254,7 @@ CREATE TABLE `fa_test` ( -- Records of `fa_test` -- ---------------------------- BEGIN; -INSERT INTO `fa_test` VALUES ('1', '12', '12,13', '3', '3', 'monday', 'hot,index', 'male', 'music,reading', '我是一篇测试文章', '

我是测试内容

', '/assets/img/avatar.png', '/assets/img/avatar.png,/assets/img/qrcode.png', '/assets/img/avatar.png', '关键字', '描述', '0.00', '0', '2017-07-10', '2017-07-10 18:24:45', '2017', '18:24:45', '1499682285', '1499682526', '1499682526', '0', 'normal', '1'); +INSERT INTO `fa_test` VALUES ('1', '12', '12,13', 'monday', 'hot,index', 'male', 'music,reading', '我是一篇测试文章', '

我是测试内容

', '/assets/img/avatar.png', '/assets/img/avatar.png,/assets/img/qrcode.png', '/assets/img/avatar.png', '关键字', '描述', '广西壮族自治区/百色市/平果县', '0.00', '0', '2017-07-10', '2017-07-10 18:24:45', '2017', '18:24:45', '1499682285', '1499682526', '1499682526', '0', '1', 'normal', '1'); COMMIT; --- ---------------------------- --- Table structure for `fa_user` --- ---------------------------- -DROP TABLE IF EXISTS `fa_user`; -CREATE TABLE `fa_user` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `username` varchar(32) NOT NULL DEFAULT '' COMMENT '用户名', - `nickname` varchar(50) NOT NULL DEFAULT '' COMMENT '昵称', - `password` varchar(32) NOT NULL DEFAULT '' COMMENT '密码', - `salt` varchar(30) NOT NULL DEFAULT '' COMMENT '密码盐', - `email` varchar(100) NOT NULL DEFAULT '' COMMENT '电子邮箱', - `mobile` varchar(11) NOT NULL DEFAULT '' COMMENT '手机号', - `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '头像', - `level` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '等级', - `gender` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '性别', - `birthday` date NOT NULL COMMENT '生日', - `score` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '积分', - `prevtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '上次登录时间', - `loginfailure` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '失败次数', - `logintime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '登录时间', - `loginip` varchar(50) NOT NULL DEFAULT '' COMMENT '登录IP', - `joinip` varchar(50) NOT NULL DEFAULT '' COMMENT '加入时间', - `jointime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '加入时间', - `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态', - PRIMARY KEY (`id`), - KEY `username` (`username`), - KEY `email` (`email`), - KEY `mobile` (`mobile`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='会员表'; - --- ---------------------------- --- Records of `fa_user` --- ---------------------------- -BEGIN; -INSERT INTO `fa_user` VALUES ('3', 'admin', 'admin', 'c13f62012fd6a8fdf06b3452a94430e5', 'rpR6Bv', 'admin@163.com', '13888888888', '/assets/img/avatar.png', '0', '0', '2017-04-15', '0', '1491822015', '0', '1491822038', '127.0.0.1', '127.0.0.1', '1491461418', 'normal'); -COMMIT; - --- ---------------------------- --- Table structure for `fa_user_signin` --- ---------------------------- -DROP TABLE IF EXISTS `fa_user_signin`; -CREATE TABLE `fa_user_signin` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID', - `successions` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '连续签到次数', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - PRIMARY KEY (`id`), - KEY `user_id` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='会员签到表'; - --- ---------------------------- --- Table structure for `fa_user_third` --- ---------------------------- -DROP TABLE IF EXISTS `fa_user_third`; -CREATE TABLE `fa_user_third` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID', - `platform` enum('weibo','wechat','qq') NOT NULL COMMENT '第三方应用', - `openid` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方唯一ID', - `openname` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方会员昵称', - `access_token` varchar(100) NOT NULL DEFAULT '', - `refresh_token` varchar(100) NOT NULL DEFAULT '', - `expires_in` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '有效期', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `logintime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '登录时间', - `expiretime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '过期时间', - PRIMARY KEY (`id`), - UNIQUE KEY `platform` (`platform`,`openid`), - KEY `user_id` (`user_id`,`platform`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='会员连接表'; - --- ---------------------------- --- Table structure for `fa_version` --- ---------------------------- -DROP TABLE IF EXISTS `fa_version`; -CREATE TABLE `fa_version` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `oldversion` varchar(30) NOT NULL DEFAULT '' COMMENT '旧版本号', - `newversion` varchar(30) NOT NULL DEFAULT '' COMMENT '新版本号', - `packagesize` varchar(30) NOT NULL DEFAULT '' COMMENT '包大小', - `content` varchar(500) NOT NULL DEFAULT '' COMMENT '升级内容', - `downloadurl` varchar(255) NOT NULL DEFAULT '' COMMENT '下载地址', - `enforce` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '强制更新', - `createtime` int(10) NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `weigh` int(10) NOT NULL DEFAULT '0' COMMENT '权重', - `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='版本表'; - --- ---------------------------- --- Records of `fa_version` --- ---------------------------- -BEGIN; -INSERT INTO `fa_version` VALUES ('1', '1.1.1,2', '1.2.1', '20M', '更新内容', 'http://www.downloadurl.com', '1', '1400000000', '0', '0', 'normal'); -COMMIT; - --- ---------------------------- --- Table structure for `fa_wechat_autoreply` --- ---------------------------- -DROP TABLE IF EXISTS `fa_wechat_autoreply`; -CREATE TABLE `fa_wechat_autoreply` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(100) NOT NULL DEFAULT '' COMMENT '标题', - `text` varchar(100) NOT NULL DEFAULT '' COMMENT '触发文本', - `eventkey` varchar(50) NOT NULL DEFAULT '' COMMENT '响应事件', - `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='微信自动回复表'; - --- ---------------------------- --- Records of `fa_wechat_autoreply` --- ---------------------------- -BEGIN; -INSERT INTO `fa_wechat_autoreply` VALUES ('1', '输入hello', 'hello', '58c7d908c4570', '123', '1493366855', '1493366855', 'normal'), ('2', '输入你好', '你好', '58fdfaa9e1965', 'sad', '1493704976', '1493704976', 'normal'); -COMMIT; - --- ---------------------------- --- Table structure for `fa_wechat_config` --- ---------------------------- -DROP TABLE IF EXISTS `fa_wechat_config`; -CREATE TABLE `fa_wechat_config` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '配置名称', - `title` varchar(50) NOT NULL DEFAULT '' COMMENT '配置标题', - `value` text NOT NULL COMMENT '配置值', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - PRIMARY KEY (`id`), - UNIQUE KEY `name` (`name`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='微信配置表'; - --- ---------------------------- --- Records of `fa_wechat_config` --- ---------------------------- -BEGIN; -INSERT INTO `fa_wechat_config` VALUES ('1', 'menu', '微信菜单', '[{\"name\":\"FastAdmin\",\"sub_button\":[{\"name\":\"官网\",\"type\":\"view\",\"url\":\"http:\\/\\/www.fastadmin.net\"},{\"name\":\"在线演示\",\"type\":\"view\",\"url\":\"http:\\/\\/demo.fastadmin.net\"},{\"name\":\"文档\",\"type\":\"view\",\"url\":\"http:\\/\\/doc.fastadmin.net\"}]},{\"name\":\"在线客服\",\"type\":\"click\",\"key\":\"58cb852984970\"},{\"name\":\"关于我们\",\"type\":\"click\",\"key\":\"58bf944aa0777\"}]', '1497398820', '1497422985'), ('2', 'service', '客服配置', '{\"onlinetime\":\"09:00-18:00\",\"offlinemsg\":\"请在工作时间联系客服！\",\"nosessionmsg\":\"当前没有客服在线！请稍后重试！\",\"waitformsg\":\"请问有什么可以帮到您？\"}', '1497429674', '1497429674'), ('3', 'signin', '连续登录配置', '{\"s1\":\"100\",\"s2\":\"200\",\"s3\":\"300\",\"sn\":\"500\"}', '1497429711', '1497429711'); -COMMIT; - --- ---------------------------- --- Table structure for `fa_wechat_context` --- ---------------------------- -DROP TABLE IF EXISTS `fa_wechat_context`; -CREATE TABLE `fa_wechat_context` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `openid` varchar(64) NOT NULL DEFAULT '', - `type` varchar(30) NOT NULL DEFAULT '' COMMENT '类型', - `eventkey` varchar(64) NOT NULL DEFAULT '', - `command` varchar(64) NOT NULL DEFAULT '', - `message` varchar(255) NOT NULL DEFAULT '' COMMENT '内容', - `refreshtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最后刷新时间', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - PRIMARY KEY (`id`), - KEY `openid` (`openid`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='微信上下文表'; - --- ---------------------------- --- Table structure for `fa_wechat_response` --- ---------------------------- -DROP TABLE IF EXISTS `fa_wechat_response`; -CREATE TABLE `fa_wechat_response` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(100) NOT NULL DEFAULT '' COMMENT '资源名', - `eventkey` varchar(128) NOT NULL DEFAULT '' COMMENT '事件', - `type` enum('text','image','news','voice','video','music','link','app') NOT NULL DEFAULT 'text' COMMENT '类型', - `content` text NOT NULL COMMENT '内容', - `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', - `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', - `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', - `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态', - PRIMARY KEY (`id`), - UNIQUE KEY `event` (`eventkey`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='微信资源表'; - --- ---------------------------- --- Records of `fa_wechat_response` --- ---------------------------- -BEGIN; -INSERT INTO `fa_wechat_response` VALUES ('1', '签到送积分', '58adaf7876aab', 'app', '{\"app\":\"signin\"}', '', '1487777656', '1487777656', 'normal'), ('2', '关于我们', '58bf944aa0777', 'app', '{\"app\":\"page\",\"id\":\"1\"}', '', '1488950346', '1488950346', 'normal'), ('3', '自动回复1', '58c7d908c4570', 'text', '{\"content\":\"world\"}', '', '1489492232', '1489492232', 'normal'), ('4', '联系客服', '58cb852984970', 'app', '{\"app\":\"service\"}', '', '1489732905', '1489732905', 'normal'), ('5', '自动回复2', '58fdfaa9e1965', 'text', '{\"content\":\"我是FastAdmin!\"}', '', '1493039785', '1493039785', 'normal'); -COMMIT; - -SET FOREIGN_KEY_CHECKS = 1; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/application/admin/command/Menu.php b/application/admin/command/Menu.php index 751abadf..04164673 100644 --- a/application/admin/command/Menu.php +++ b/application/admin/command/Menu.php @@ -219,13 +219,13 @@ class Menu extends Command //先定入菜单的数据 $pid = 0; - $name = "/admin"; - foreach (explode('/', $controller) as $k => $v) + foreach ($controllerArr as $k => $v) { - $name .= '/' . strtolower($v); - $title = (!isset($controllerArr[$k + 1]) ? $controllerTitle : ''); - $icon = (!isset($controllerArr[$k + 1]) ? $controllerIcon : 'fa fa-list'); - $remark = (!isset($controllerArr[$k + 1]) ? $controllerRemark : ''); + $key = $k + 1; + $name = strtolower(implode('/', array_slice($controllerArr, 0, $key))); + $title = (!isset($controllerArr[$key]) ? $controllerTitle : ''); + $icon = (!isset($controllerArr[$key]) ? $controllerIcon : 'fa fa-list'); + $remark = (!isset($controllerArr[$key]) ? $controllerRemark : ''); $title = $title ? $title : __(ucfirst($v) . ' manager'); $rulemodel = $this->model->get(['name' => $name]); if (!$rulemodel) diff --git a/application/admin/command/Min.php b/application/admin/command/Min.php index 8f8a458c..e3385346 100644 --- a/application/admin/command/Min.php +++ b/application/admin/command/Min.php @@ -32,8 +32,8 @@ class Min extends Command protected function execute(Input $input, Output $output) { - $module = $input->getOption('module') ? : ''; - $resource = $input->getOption('resource') ? : ''; + $module = $input->getOption('module') ?: ''; + $resource = $input->getOption('resource') ?: ''; if (!$module || !in_array($module, ['frontend', 'backend', 'all'])) { @@ -85,8 +85,8 @@ class Min extends Command 'jsBaseUrl' => $this->options['jsBaseUrl'], 'cssBaseName' => str_replace('{module}', $mod, $this->options['cssBaseName']), 'cssBaseUrl' => $this->options['cssBaseUrl'], - 'jsBasePath' => ROOT_PATH . $this->options['jsBaseUrl'], - 'cssBasePath' => ROOT_PATH . $this->options['cssBaseUrl'], + 'jsBasePath' => str_replace('\\', '/', ROOT_PATH) . $this->options['jsBaseUrl'], + 'cssBasePath' => str_replace('\\', '/', ROOT_PATH) . $this->options['cssBaseUrl'], 'ds' => DS, ]; diff --git a/application/admin/common.php b/application/admin/common.php index 86800c8d..00c2f315 100644 --- a/application/admin/common.php +++ b/application/admin/common.php @@ -135,3 +135,87 @@ function build_heading($title = NULL, $content = NULL) return ''; return '
' . $title . '' . $content . '
'; } + +/** + * 判断文件或文件夹是否可写 + * @param string + * @return bool + */ +function is_really_writable($file) +{ + if (DIRECTORY_SEPARATOR === '/') + { + return is_writable($file); + } + if (is_dir($file)) + { + $file = rtrim($file, '/') . '/' . md5(mt_rand()); + if (($fp = @fopen($file, 'ab')) === FALSE) + { + return FALSE; + } + fclose($fp); + @chmod($file, 0777); + @unlink($file); + return TRUE; + } + elseif (!is_file($file) OR ( $fp = @fopen($file, 'ab')) === FALSE) + { + return FALSE; + } + fclose($fp); + return TRUE; +} + +/** + * 删除文件夹 + * @param string $dirname + * @return boolean + */ +function rmdirs($dirname) +{ + if (!is_dir($dirname)) + return false; + $files = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($dirname, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::CHILD_FIRST + ); + + foreach ($files as $fileinfo) + { + $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink'); + $todo($fileinfo->getRealPath()); + } + @rmdir($dirname); + return true; +} + +/** + * 复制文件夹 + * @param string $source 源文件夹 + * @param string $dest 目标文件夹 + */ +function copydirs($source, $dest) +{ + if (!is_dir($dest)) + { + mkdir($dest, 0755); + } + foreach ( + $iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST) as $item + ) + { + if ($item->isDir()) + { + $sontDir = $dest . DS . $iterator->getSubPathName(); + if (!is_dir($sontDir)) + { + mkdir($sontDir); + } + } + else + { + copy($item, $dest . DS . $iterator->getSubPathName()); + } + } +} diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php new file mode 100644 index 00000000..0526109b --- /dev/null +++ b/application/admin/controller/Addon.php @@ -0,0 +1,293 @@ + &$v) + { + $config = get_addon_config($v['name']); + $v['config'] = $config ? 1 : 0; + } + $this->assignconfig(['addons' => $addons]); + return $this->view->fetch(); + } + + /** + * 配置 + */ + public function config($ids = NULL) + { + $name = $this->request->get("name"); + if (!$name) + { + $this->error(__('Parameter %s can not be empty', $id ? 'id' : 'name')); + } + if (!is_dir(ADDON_PATH . $name)) + { + $this->error(__('Directory not found')); + } + $info = get_addon_info($name); + $config = get_addon_fullconfig($name); + if (!$info) + $this->error(__('No Results were found')); + if ($this->request->isPost()) + { + $params = $this->request->post("row/a"); + if ($params) + { + $configList = []; + foreach ($config as $k => &$v) + { + if (isset($params[$v['name']])) + { + if ($v['type'] == 'array') + { + $fieldarr = $valuearr = []; + $field = $params[$v['name']]['field']; + $value = $params[$v['name']]['value']; + + foreach ($field as $m => $n) + { + if ($n != '') + { + $fieldarr[] = $field[$m]; + $valuearr[] = $value[$m]; + } + } + $params[$v['name']] = array_combine($fieldarr, $valuearr); + $value = $params[$v['name']]; + } + else + { + $value = is_array($params[$v['name']]) ? implode(',', $params[$v['name']]) : $params[$v['name']]; + } + + $v['value'] = $value; + } + } + try + { + //更新配置文件 + set_addon_fullconfig($name, $config); + $this->success(); + } + catch (Exception $e) + { + $this->error($e->getMessage()); + } + } + $this->error(__('Parameter %s can not be empty', '')); + } + $this->view->assign("addon", ['info' => $info, 'config' => $config]); + return $this->view->fetch(); + } + + /** + * 安装 + */ + public function install() + { + $name = $this->request->post("name"); + $force = (int) $this->request->post("force"); + if (!$name) + { + $this->error(__('Parameter %s can not be empty', 'name')); + } + try + { + Service::install($name, $force); + $this->success("安装成功", null, ['addon' => get_addon_info($name)]); + } + catch (AddonException $e) + { + $this->result($e->getData(), $e->getCode(), $e->getMessage()); + } + catch (Exception $e) + { + $this->error($e->getMessage(), $e->getCode()); + } + } + + /** + * 卸载 + */ + public function uninstall() + { + $name = $this->request->post("name"); + $force = (int) $this->request->post("force"); + if (!$name) + { + $this->error(__('Parameter %s can not be empty', 'name')); + } + try + { + Service::uninstall($name, $force); + $this->success("卸载成功"); + } + catch (AddonException $e) + { + $this->result($e->getData(), $e->getCode(), $e->getMessage()); + } + catch (Exception $e) + { + $this->error($e->getMessage()); + } + } + + /** + * 禁用启用 + */ + public function state() + { + $name = $this->request->post("name"); + $action = $this->request->post("action"); + $force = (int) $this->request->post("force"); + if (!$name) + { + $this->error(__('Parameter %s can not be empty', 'name')); + } + try + { + $action = $action == 'enable' ? $action : 'disable'; + //调用启用、禁用的方法 + Service::$action($name, $force); + $this->success("操作成功"); + } + catch (AddonException $e) + { + $this->result($e->getData(), $e->getCode(), $e->getMessage()); + } + catch (Exception $e) + { + $this->error($e->getMessage()); + } + } + + /** + * 本地上传 + */ + public function local() + { + $file = $this->request->file('file'); + $addonTmpDir = RUNTIME_PATH . 'addons' . DS; + if (!is_dir($addonTmpDir)) + { + @mkdir($addonTmpDir, 0755, true); + } + $info = $file->rule('uniqid')->validate(['size' => 10240000, 'ext' => 'zip'])->move($addonTmpDir); + if ($info) + { + $tmpName = substr($info->getFilename(), 0, stripos($info->getFilename(), '.')); + $tmpAddonDir = ADDON_PATH . $tmpName . DS; + $tmpFile = $addonTmpDir . $info->getSaveName(); + try + { + Service::unzip($tmpName); + @unlink($tmpFile); + $infoFile = $tmpAddonDir . 'info.ini'; + if (!is_file($infoFile)) + { + throw new Exception("插件配置文件未找到"); + } + + $config = Config::parse($infoFile, '', $tmpName); + $name = isset($config['name']) ? $config['name'] : ''; + if (!$name) + { + throw new Exception("插件配置信息不正确"); + } + + $newAddonDir = ADDON_PATH . $name . DS; + if (is_dir($newAddonDir)) + { + throw new Exception("上传的插件已经存在"); + } + + //重命名插件文件夹 + rename($tmpAddonDir, $newAddonDir); + try + { + //默认禁用该插件 + $info = get_addon_info($name); + if ($info['state']) + { + $info['state'] = 0; + set_addon_info($name, $info); + } + + //执行插件的安装方法 + $class = get_addon_class($name); + if (class_exists($class)) + { + $addon = new $class(); + $addon->install(); + } + + //导入SQL + Service::importsql($name); + + $this->success("插件安装成功，你需要手动启用该插件，使之生效", null, ['addon' => $info]); + } + catch (Exception $e) + { + @rmdirs($newAddonDir); + throw new Exception($e->getMessage()); + } + } + catch (Exception $e) + { + @unlink($tmpFile); + @rmdirs($tmpAddonDir); + $this->error($e->getMessage()); + } + } + else + { + // 上传失败获取错误信息 + $this->error($file->getError()); + } + } + + /** + * 刷新缓存 + */ + public function refresh() + { + try + { + Service::refresh(); + $this->success("操作成功"); + } + catch (Exception $e) + { + $this->error($e->getMessage()); + } + } + +} diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index 8a1ac5f5..0bf244ab 100644 --- a/application/admin/controller/Ajax.php +++ b/application/admin/controller/Ajax.php @@ -4,8 +4,6 @@ namespace app\admin\controller; use app\common\controller\Backend; use fast\Random; -use RecursiveDirectoryIterator; -use RecursiveIteratorIterator; use think\Cache; use think\Config; use think\Db; @@ -38,6 +36,7 @@ class Ajax extends Backend header('Content-Type: application/javascript'); $callback = $this->request->get('callback'); $controllername = input("controllername"); + //默认只加载了控制器对应的语言名，你还根据控制器名来加载额外的语言包 $this->loadlang($controllername); //强制输出JSON Object $result = 'define(' . json_encode(Lang::get(), JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . ');'; @@ -49,25 +48,14 @@ class Ajax extends Backend */ public function upload() { - $this->code = -1; $file = $this->request->file('file'); if (empty($file)) { - $this->msg = "未上传文件或超出服务器上传限制"; - return; + $this->error("未上传文件或超出服务器上传限制"); } //判断是否已经存在附件 $sha1 = $file->hash(); - $uploaded = model("attachment")->where('sha1', $sha1)->find(); - if ($uploaded) - { - $this->code = 1; - $this->data = [ - 'url' => $uploaded['url'] - ]; - return; - } $upload = Config::get('upload'); @@ -120,16 +108,17 @@ class Ajax extends Backend 'storage' => 'local', 'sha1' => $sha1, ); - model("attachment")->create(array_filter($params)); - $this->code = 1; - $this->data = [ + $attachment = model("attachment"); + $attachment->create(array_filter($params)); + \think\Hook::listen("upload_after", $attachment); + $this->success('上传成功', null, [ 'url' => $uploadDir . $splInfo->getSaveName() - ]; + ]); } else { // 上传失败获取错误信息 - $this->data = $file->getError(); + $this->error($file->getError()); } } @@ -177,7 +166,7 @@ class Ajax extends Backend { Db::name($table)->where($prikey, $v[$prikey])->update([$field => $k + 1]); } - $this->code = 1; + $this->success(); } else { @@ -216,7 +205,7 @@ class Ajax extends Backend $weighids[$n] = $weighdata[$offset]; Db::name($table)->where($prikey, $n)->update([$field => $weighdata[$offset]]); } - $this->code = 1; + $this->success(); } } @@ -231,20 +220,11 @@ class Ajax extends Backend $dir = constant($item); if (!is_dir($dir)) continue; - $files = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::CHILD_FIRST - ); - - foreach ($files as $fileinfo) - { - $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink'); - $todo($fileinfo->getRealPath()); - } - - //rmdir($dir); + rmdirs($dir); } Cache::clear(); - $this->code = 1; + \think\Hook::listen("wipecache_after"); + $this->success(); } /** @@ -269,9 +249,7 @@ class Ajax extends Backend $categorylist = Db::name('category')->where($where)->field('id as value,name')->order('weigh desc,id desc')->select(); } - $this->code = 1; - $this->data = $categorylist; - return; + $this->success('', null, $categorylist); } /** @@ -300,9 +278,7 @@ class Ajax extends Backend $provincelist = Db::name('area')->where($where)->field('id as value,name')->select(); } } - $this->code = 1; - $this->data = $provincelist; - return; + $this->success('', null, $provincelist); } } diff --git a/application/admin/controller/Category.php b/application/admin/controller/Category.php index c1cb54d2..8336e3e5 100644 --- a/application/admin/controller/Category.php +++ b/application/admin/controller/Category.php @@ -28,10 +28,10 @@ class Category extends Backend $tree = Tree::instance(); $tree->init($this->model->order('weigh desc,id desc')->select(), 'pid'); $this->categorylist = $tree->getTreeList($tree->getTreeArray(0), 'name'); - $categorydata = [0 => __('None')]; + $categorydata = [0 => ['type'=>'all', 'name'=>__('None')]]; foreach ($this->categorylist as $k => $v) { - $categorydata[$v['id']] = $v['name']; + $categorydata[$v['id']] = $v; } $this->view->assign("flagList", $this->model->getFlagList()); $this->view->assign("typeList", CategoryModel::getTypeList()); diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index b2f2048f..b624f4ef 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -29,9 +29,8 @@ class Index extends Backend // $menulist = $this->auth->getSidebar([ 'dashboard' => 'hot', - 'auth' => ['new', 'red', 'badge'], - 'auth/admin' => 12, - 'auth/rule' => 4, + 'addon' => ['new', 'red', 'badge'], + 'auth/rule' => 'side', 'general' => ['18', 'purple'], ], $this->view->site['fixedpage']); $this->view->assign('menulist', $menulist); @@ -48,7 +47,6 @@ class Index extends Backend if ($this->auth->isLogin()) { $this->error(__("You've logged in, do not login again"), $url); - return; } if ($this->request->isPost()) { @@ -71,20 +69,17 @@ class Index extends Backend if (!$result) { $this->error($validate->getError(), $url, ['token' => $this->request->token()]); - return; } \app\admin\model\AdminLog::setTitle(__('Login')); $result = $this->auth->login($username, $password, $keeplogin ? 86400 : 0); if ($result === true) { $this->success(__('Login successful'), $url, ['url' => $url, 'id' => $this->auth->id, 'username' => $username, 'avatar' => $this->auth->avatar]); - return; } else { $this->error(__('Username or password is incorrect'), $url, ['token' => $this->request->token()]); } - return; } // 根据客户端的cookie,判断是否可以自动登录 @@ -92,7 +87,9 @@ class Index extends Backend { $this->redirect($url); } - $this->view->assign('title', __('Login')); + $background = cdnurl("/assets/img/loginbg.jpg"); + $this->view->assign('background', $background); + \think\Hook::listen("login_init", $this->request); return $this->view->fetch(); } @@ -103,7 +100,6 @@ class Index extends Backend { $this->auth->logout(); $this->success(__('Logout successful'), 'index/login'); - return; } } diff --git a/application/admin/controller/Page.php b/application/admin/controller/Page.php deleted file mode 100644 index aeacb90b..00000000 --- a/application/admin/controller/Page.php +++ /dev/null @@ -1,51 +0,0 @@ -model = model('Page'); - } - - /** - * 查看 - */ - public function index() - { - if ($this->request->isAjax()) - { - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); - $total = $this->model - ->with("category") - ->where($where) - ->order($sort, $order) - ->count(); - $list = $this->model - ->with("category") - ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) - ->select(); - $result = array("total" => $total, "rows" => $list); - - return json($result); - } - return $this->view->fetch(); - } - -} diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php deleted file mode 100644 index cd7748a2..00000000 --- a/application/admin/controller/User.php +++ /dev/null @@ -1,27 +0,0 @@ -model = model('User'); - } - -} diff --git a/application/admin/controller/Version.php b/application/admin/controller/Version.php deleted file mode 100644 index e0360f7c..00000000 --- a/application/admin/controller/Version.php +++ /dev/null @@ -1,26 +0,0 @@ -model = model('Version'); - } - -} diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php index f4a54872..06c7177d 100644 --- a/application/admin/controller/auth/Admin.php +++ b/application/admin/controller/auth/Admin.php @@ -101,7 +101,6 @@ class Admin extends Backend { if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a"); if ($params) { @@ -120,10 +119,9 @@ class Admin extends Backend $dataset[] = ['uid' => $admin->id, 'group_id' => $value]; } model('AuthGroupAccess')->saveAll($dataset); - $this->code = 1; + $this->success(); } - - return; + $this->error(); } return $this->view->fetch(); } @@ -138,7 +136,6 @@ class Admin extends Backend $this->error(__('No Results were found')); if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a"); if ($params) { @@ -167,10 +164,9 @@ class Admin extends Backend $dataset[] = ['uid' => $row->id, 'group_id' => $value]; } model('AuthGroupAccess')->saveAll($dataset); - $this->code = 1; + $this->success(); } - - return; + $this->error(); } $grouplist = $this->auth->getGroups($row['id']); $groupids = []; @@ -188,7 +184,6 @@ class Admin extends Backend */ public function del($ids = "") { - $this->code = -1; if ($ids) { // 避免越权删除管理员 @@ -208,12 +203,11 @@ class Admin extends Backend { $this->model->destroy($deleteIds); model('AuthGroupAccess')->where('uid', 'in', $deleteIds)->delete(); - $this->code = 1; + $this->success(); } } } - - return; + $this->error(); } /** @@ -223,7 +217,7 @@ class Admin extends Backend public function multi($ids = "") { // 管理员禁止批量操作 - $this->code = -1; + $this->error(); } } diff --git a/application/admin/controller/auth/Adminlog.php b/application/admin/controller/auth/Adminlog.php index d33cff88..a8898466 100644 --- a/application/admin/controller/auth/Adminlog.php +++ b/application/admin/controller/auth/Adminlog.php @@ -74,7 +74,7 @@ class Adminlog extends Backend } return $this->view->fetch(); } - + /** * 详情 */ @@ -93,7 +93,7 @@ class Adminlog extends Backend */ public function add() { - $this->code = -1; + $this->error(); } /** @@ -102,7 +102,7 @@ class Adminlog extends Backend */ public function edit($ids = NULL) { - $this->code = -1; + $this->error(); } /** @@ -110,7 +110,6 @@ class Adminlog extends Backend */ public function del($ids = "") { - $this->code = -1; if ($ids) { $childrenGroupIds = $this->childrenIds; @@ -127,12 +126,11 @@ class Adminlog extends Backend if ($deleteIds) { $this->model->destroy($deleteIds); - $this->code = 1; + $this->success(); } } } - - return; + $this->error(); } /** @@ -142,7 +140,7 @@ class Adminlog extends Backend public function multi($ids = "") { // 管理员禁止批量操作 - $this->code = -1; + $this->error(); } } diff --git a/application/admin/controller/auth/Group.php b/application/admin/controller/auth/Group.php index 744f8ced..e1b78900 100644 --- a/application/admin/controller/auth/Group.php +++ b/application/admin/controller/auth/Group.php @@ -79,26 +79,21 @@ class Group extends Backend { if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a", [], 'strip_tags'); $params['rules'] = explode(',', $params['rules']); if (!in_array($params['pid'], $this->childrenIds)) { - $this->code = -1; - $this->msg = __(''); - return; + $this->error(__('The parent group can not be its own child')); } $parentmodel = model("AuthGroup")->get($params['pid']); if (!$parentmodel) { - $this->msg = __('The parent group can not found'); - return; + $this->error(__('The parent group can not found')); } // 父级别的规则节点 $parentrules = explode(',', $parentmodel->rules); // 当前组别的规则节点 $currentrules = $this->auth->getRuleIds(); - $rules = $params['rules']; // 如果父组不是超级管理员则需要过滤规则节点,不能超过父组别的权限 $rules = in_array('*', $parentrules) ? $rules : array_intersect($parentrules, $rules); // 如果当前组别不是超级管理员则需要过滤规则节点,不能超当前组别的权限 @@ -107,10 +102,9 @@ class Group extends Backend if ($params) { $this->model->create($params); - $this->code = 1; + $this->success(); } - - return; + $this->error(); } return $this->view->fetch(); } @@ -125,27 +119,25 @@ class Group extends Backend $this->error(__('No Results were found')); if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a", [], 'strip_tags'); // 父节点不能是它自身的子节点 if (!in_array($params['pid'], $this->childrenIds)) { - $this->msg = __('The parent group can not be its own child'); - return; + $this->error(__('The parent group can not be its own child')); } $params['rules'] = explode(',', $params['rules']); $parentmodel = model("AuthGroup")->get($params['pid']); if (!$parentmodel) { - $this->msg = __('The parent group can not found'); - return; + $this->error(__('The parent group can not found')); } // 父级别的规则节点 $parentrules = explode(',', $parentmodel->rules); // 当前组别的规则节点 $currentrules = $this->auth->getRuleIds(); $rules = $params['rules']; + $rules = $params['rules']; // 如果父组不是超级管理员则需要过滤规则节点,不能超过父组别的权限 $rules = in_array('*', $parentrules) ? $rules : array_intersect($parentrules, $rules); // 如果当前组别不是超级管理员则需要过滤规则节点,不能超当前组别的权限 @@ -154,9 +146,9 @@ class Group extends Backend if ($params) { $row->save($params); - $this->code = 1; + $this->success(); } - + $this->error(); return; } $this->view->assign("row", $row); @@ -168,7 +160,6 @@ class Group extends Backend */ public function del($ids = "") { - $this->code = -1; if ($ids) { $ids = explode(',', $ids); @@ -201,16 +192,15 @@ class Group extends Backend } if (!$ids) { - $this->msg = __('You can not delete group that contain child group and administrators'); - return; + $this->error(__('You can not delete group that contain child group and administrators')); } $count = $this->model->where('id', 'in', $ids)->delete(); if ($count) { - $this->code = 1; + $this->success(); } } - return; + $this->error(); } /** @@ -220,8 +210,7 @@ class Group extends Backend public function multi($ids = "") { // 组别禁止批量操作 - $this->code = -1; - return; + $this->error(); } /** @@ -291,19 +280,16 @@ class Group extends Backend $state = array('selected' => in_array($v['id'], $current_rule_ids) && !in_array($v['id'], $hasChildrens)); $nodelist[] = array('id' => $v['id'], 'parent' => $v['pid'] ? $v['pid'] : '#', 'text' => $v['title'], 'type' => 'menu', 'state' => $state); } - $this->code = 1; - $this->data = $nodelist; + $this->success('',null,$nodelist); } else { - $this->code = -1; - $this->data = __('Can not change the parent to child'); + $this->error(__('Can not change the parent to child')); } } else { - $this->code = -1; - $this->data = __('Group not found'); + $this->error(__('Group not found')); } } diff --git a/application/admin/controller/auth/Rule.php b/application/admin/controller/auth/Rule.php index a77c9c97..48a51ace 100644 --- a/application/admin/controller/auth/Rule.php +++ b/application/admin/controller/auth/Rule.php @@ -60,21 +60,18 @@ class Rule extends Backend { if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a", [], 'strip_tags'); if ($params) { if (!$params['ismenu'] && !$params['pid']) { - $this->msg = __('The non-menu rule must have parent'); - return; + $this->error(__('The non-menu rule must have parent')); } $this->model->create($params); Cache::rm('__menu__'); - $this->code = 1; + $this->success(); } - - return; + $this->error(); } return $this->view->fetch(); } @@ -89,21 +86,18 @@ class Rule extends Backend $this->error(__('No Results were found')); if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a", [], 'strip_tags'); if ($params) { if (!$params['ismenu'] && !$params['pid']) { - $this->msg = __('The non-menu rule must have parent'); - return; + $this->error(__('The non-menu rule must have parent')); } $row->save($params); Cache::rm('__menu__'); - $this->code = 1; + $this->success(); } - - return; + $this->error(); } $this->view->assign("row", $row); return $this->view->fetch(); @@ -114,7 +108,6 @@ class Rule extends Backend */ public function del($ids = "") { - $this->code = -1; if ($ids) { $delIds = []; @@ -127,11 +120,10 @@ class Rule extends Backend if ($count) { Cache::rm('__menu__'); - $this->code = 1; + $this->success(); } } - - return; + $this->error(); } } diff --git a/application/admin/controller/example/Bootstraptable.php b/application/admin/controller/example/Bootstraptable.php deleted file mode 100644 index 914c84e1..00000000 --- a/application/admin/controller/example/Bootstraptable.php +++ /dev/null @@ -1,70 +0,0 @@ -model = model('AdminLog'); - } - - /** - * 查看 - */ - public function index() - { - if ($this->request->isAjax()) - { - list($where, $sort, $order, $offset, $limit) = $this->buildparams(NULL); - $total = $this->model - ->where($where) - ->order($sort, $order) - ->count(); - $list = $this->model - ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) - ->select(); - $result = array("total" => $total, "rows" => $list); - - return json($result); - } - return $this->view->fetch(); - } - - /** - * 详情 - */ - public function detail($ids) - { - $row = $this->model->get(['id' => $ids]); - if (!$row) - $this->error(__('No Results were found')); - $this->view->assign("row", $row->toArray()); - return $this->view->fetch(); - } - - /** - * 变更 - * @internal - */ - public function change() - { - $this->code = 1; - } - -} diff --git a/application/admin/controller/example/Colorbadge.php b/application/admin/controller/example/Colorbadge.php deleted file mode 100644 index 4d0bc213..00000000 --- a/application/admin/controller/example/Colorbadge.php +++ /dev/null @@ -1,24 +0,0 @@ -model = model('AdminLog'); - } - -} diff --git a/application/admin/controller/example/Controllerjump.php b/application/admin/controller/example/Controllerjump.php deleted file mode 100644 index 2bd1540e..00000000 --- a/application/admin/controller/example/Controllerjump.php +++ /dev/null @@ -1,24 +0,0 @@ -model = model('AdminLog'); - } - -} diff --git a/application/admin/controller/example/Cxselect.php b/application/admin/controller/example/Cxselect.php deleted file mode 100644 index 391c0977..00000000 --- a/application/admin/controller/example/Cxselect.php +++ /dev/null @@ -1,23 +0,0 @@ -loadlang('general/attachment'); - $this->loadlang('general/crontab'); - return $this->view->fetch(); - } - -} diff --git a/application/admin/controller/example/Relationmodel.php b/application/admin/controller/example/Relationmodel.php deleted file mode 100644 index ae42b769..00000000 --- a/application/admin/controller/example/Relationmodel.php +++ /dev/null @@ -1,52 +0,0 @@ -model = model('AdminLog'); - } - - /** - * 查看 - */ - public function index() - { - $this->relationSearch = true; - $this->searchFields = "admin.username,id"; - if ($this->request->isAjax()) - { - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); - $total = $this->model - ->with("admin") - ->where($where) - ->order($sort, $order) - ->count(); - $list = $this->model - ->with("admin") - ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) - ->select(); - $result = array("total" => $total, "rows" => $list); - - return json($result); - } - return $this->view->fetch(); - } - -} diff --git a/application/admin/controller/example/Tabletemplate.php b/application/admin/controller/example/Tabletemplate.php deleted file mode 100644 index fcc5c35f..00000000 --- a/application/admin/controller/example/Tabletemplate.php +++ /dev/null @@ -1,60 +0,0 @@ -model = model('AdminLog'); - } - - /** - * 查看 - */ - public function index() - { - if ($this->request->isAjax()) - { - list($where, $sort, $order, $offset, $limit) = $this->buildparams(NULL); - $total = $this->model - ->where($where) - ->order($sort, $order) - ->count(); - $list = $this->model - ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) - ->select(); - $result = array("total" => $total, "rows" => $list); - - return json($result); - } - return $this->view->fetch(); - } - - /** - * 详情 - */ - public function detail($ids) - { - $row = $this->model->get(['id' => $ids]); - if (!$row) - $this->error(__('No Results were found')); - $this->view->assign("row", $row->toArray()); - return $this->view->fetch(); - } - -} diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index cb549ffd..6f5a1696 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -71,9 +71,23 @@ class Attachment extends Backend { if ($this->request->isAjax()) { - $this->code = -1; + $this->error(); } return $this->view->fetch(); } + public function del($ids = "") + { + if ($ids) + { + $count = $this->model->destroy($ids); + if ($count) + { + \think\Hook::listen("upload_after", $this); + $this->success(); + } + } + $this->error(__('Parameter %s can not be empty', 'ids')); + } + } diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php index ef634058..16c367d3 100644 --- a/application/admin/controller/general/Config.php +++ b/application/admin/controller/general/Config.php @@ -72,7 +72,6 @@ class Config extends Backend { if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a"); if ($params) { @@ -106,36 +105,30 @@ class Config extends Backend try { $this->refreshFile(); - $this->code = 1; + $this->success(); } catch (Exception $e) { - $this->msg = $e->getMessage(); + $this->error($e->getMessage()); } } else { - $this->msg = $this->model->getError(); + $this->error($this->model->getError()); } } catch (Exception $e) { - $this->msg = $e->getMessage(); + $this->error($e->getMessage()); } } - else - { - $this->msg = __('Parameter %s can not be empty', ''); - } - - return; + $this->error(__('Parameter %s can not be empty', '')); } return $this->view->fetch(); } public function edit($ids = NULL) { - $this->code = -1; if ($this->request->isPost()) { $params = $this->request->post("row/a"); @@ -175,19 +168,14 @@ class Config extends Backend try { $this->refreshFile(); - $this->code = 1; + $this->success(); } catch (Exception $e) { - $this->msg = $e->getMessage(); + $this->error($e->getMessage()); } } - else - { - $this->msg = __('Parameter %s can not be empty', ''); - } - - return; + $this->error(__('Parameter %s can not be empty', '')); } } @@ -251,12 +239,11 @@ class Config extends Backend ->send(); if ($result) { - $this->code = 1; + $this->success(); } else { - $this->code = -1; - $this->msg = $email->getError(); + $this->error($email->getError()); } } diff --git a/application/admin/controller/general/Crontab.php b/application/admin/controller/general/Crontab.php deleted file mode 100644 index 73dfdd08..00000000 --- a/application/admin/controller/general/Crontab.php +++ /dev/null @@ -1,100 +0,0 @@ -model = model('Crontab'); - $this->view->assign('typedata', \app\common\model\Crontab::getTypeList()); - } - - /** - * 查看 - */ - public function index() - { - if ($this->request->isAjax()) - { - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); - $total = $this->model - ->where($where) - ->order($sort, $order) - ->count(); - - $list = $this->model - ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) - ->select(); - foreach ($list as $k => &$v) - { - $cron = CronExpression::factory($v['schedule']); - $v['nexttime'] = $cron->getNextRunDate()->getTimestamp(); - } - $result = array("total" => $total, "rows" => $list); - - return json($result); - } - return $this->view->fetch(); - } - - /** - * 判断Crontab格式是否正确 - * @internal - */ - public function check_schedule() - { - $row = $this->request->post("row/a"); - $schedule = isset($row['schedule']) ? $row['schedule'] : ''; - if (CronExpression::isValidExpression($schedule)) - { - return json(['ok' => '']); - } - else - { - return json(['error' => __('Crontab format invalid')]); - } - } - - /** - * 根据Crontab表达式读取未来七次的时间 - * @internal - */ - public function get_schedule_future() - { - $time = []; - $schedule = $this->request->post('schedule'); - $days = (int) $this->request->post('days'); - try - { - $cron = CronExpression::factory($schedule); - for ($i = 0; $i < $days; $i++) - { - $time[] = $cron->getNextRunDate(null, $i)->format('Y-m-d H:i:s'); - } - } - catch (\Exception $e) - { - - } - - return json(['futuretime' => $time]); - } - -} diff --git a/application/admin/controller/general/Database.php b/application/admin/controller/general/Database.php deleted file mode 100644 index 2d31a014..00000000 --- a/application/admin/controller/general/Database.php +++ /dev/null @@ -1,211 +0,0 @@ - $row) - { - $tables[] = ['name' => reset($row), 'rows' => 0]; - } - $data['tables'] = $tables; - $data['saved_sql'] = []; - $this->view->assign($data); - return $this->view->fetch(); - } - - /** - * SQL查询 - */ - public function query() - { - $do_action = $this->request->post('do_action'); - - echo ''; - if ($do_action == '') - exit(__('Invalid parameters')); - - $tablename = $this->request->post("tablename/a"); - - if (in_array($do_action, array('doquery', 'optimizeall', 'repairall'))) - { - $this->$do_action(); - } - else if (count($tablename) == 0) - { - exit(__('Invalid parameters')); - } - else - { - foreach ($tablename as $table) - { - $this->$do_action($table); - echo "
"; - } - } - } - - private function viewinfo($name) - { - $row = Db::query("SHOW CREATE TABLE `{$name}`"); - $row = array_values($row[0]); - $info = $row[1]; - echo "{$info};"; - } - - private function viewdata($name = '') - { - $sqlquery = "SELECT * FROM `{$name}`"; - $this->doquery($sqlquery); - } - - private function optimize($name = '') - { - if (Db::execute("OPTIMIZE TABLE `{$name}`")) - { - echo __('Optimize table %s done', $name); - } - else - { - echo __('Optimize table %s fail', $name); - } - } - - private function optimizeall($name = '') - { - $list = Db::query("SHOW TABLES"); - foreach ($list as $key => $row) - { - $name = reset($row); - if (Db::execute("OPTIMIZE TABLE {$name}")) - { - echo __('Optimize table %s done', $name); - } - else - { - echo __('Optimize table %s fail', $name); - } - echo "
"; - } - } - - private function repair($name = '') - { - if (Db::execute("REPAIR TABLE `{$name}`")) - { - echo __('Repair table %s done', $name); - } - else - { - echo __('Repair table %s fail', $name); - } - } - - private function repairall($name = '') - { - $list = Db::query("SHOW TABLES"); - foreach ($list as $key => $row) - { - $name = reset($row); - if (Db::execute("REPAIR TABLE {$name}")) - { - echo __('Repair table %s done', $name); - } - else - { - echo __('Repair table %s fail', $name); - } - echo "
"; - } - } - - private function doquery($sql = null) - { - $sqlquery = $sql ? $sql : $this->request->post('sqlquery'); - if ($sqlquery == '') - exit(__('SQL can not be empty')); - $sqlquery = str_replace("\r", "", $sqlquery); - $sqls = preg_split("/;[ \t]{0,}\n/i", $sqlquery); - $maxreturn = 100; - $r = ''; - foreach ($sqls as $key => $val) - { - if (trim($val) == '') - continue; - $val = rtrim($val, ';'); - $r .= "SQL：{$val} "; - if (preg_match("/^(select|explain)(.*)/i ", $val)) - { - Debug::remark("begin"); - $limit = stripos(strtolower($val), "limit") !== false ? true : false; - $count = Db::execute($val); - if ($count > 0) - { - $resultlist = Db::query($val . (!$limit && $count > $maxreturn ? ' LIMIT ' . $maxreturn : '')); - } - else - { - $resultlist = []; - } - Debug::remark("end"); - $time = Debug::getRangeTime('begin', 'end', 4); - - $usedseconds = __('Query took %s seconds', $time) . "
"; - if ($count <= 0) - { - $r .= __('Query returned an empty result'); - } - else - { - $r .= (__('Total:%s', $count) . (!$limit && $count > $maxreturn ? ',' . __('Max output:%s', $maxreturn) : "")); - } - $r = $r . ',' . $usedseconds; - $j = 0; - foreach ($resultlist as $m => $n) - { - $j++; - if (!$limit && $j > $maxreturn) - break; - $r .= "
"; - $r .= "" . __('Row:%s', $j) . "
"; - foreach ($n as $k => $v) - { - $r .= "{$k}：{$v}
\r\n"; - } - } - } - else - { - Debug::remark("begin"); - $count = Db::execute($val); - Debug::remark("end"); - $time = Debug::getRangeTime('begin', 'end', 4); - $r .= __('Query affected %s rows and took %s seconds', $count, $time) . "
"; - } - } - echo $r; - } - -} diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php index 39344b19..3189d7c8 100644 --- a/application/admin/controller/general/Profile.php +++ b/application/admin/controller/general/Profile.php @@ -52,7 +52,6 @@ class Profile extends Backend { if ($this->request->isPost()) { - $this->code = -1; $params = $this->request->post("row/a"); $params = array_filter(array_intersect_key($params, array_flip(array('email', 'nickname', 'password', 'avatar')))); unset($v); @@ -71,8 +70,9 @@ class Profile extends Backend $admin = model('admin')->get(['id' => $admin_id]); Session::set("admin", $admin); } - $this->code = 1; + $this->success(); } + $this->error(); } return; } diff --git a/application/admin/controller/wechat/Autoreply.php b/application/admin/controller/wechat/Autoreply.php deleted file mode 100644 index 0de21275..00000000 --- a/application/admin/controller/wechat/Autoreply.php +++ /dev/null @@ -1,74 +0,0 @@ -model = model('WechatAutoreply'); - } - - /** - * 编辑 - */ - public function edit($ids = NULL) - { - $row = $this->model->get(['id' => $ids]); - if (!$row) - $this->error(__('No Results were found')); - if ($this->request->isPost()) - { - $this->code = -1; - $params = $this->request->post("row/a"); - if ($params) - { - $row->save($params); - $this->code = 1; - } - return; - } - $response = WechatResponse::get(['eventkey' => $row['eventkey']]); - $this->view->assign("response", $response); - $this->view->assign("row", $row); - return $this->view->fetch(); - } - - /** - * 判断文本是否唯一 - * @internal - */ - public function check_text_unique() - { - $row = $this->request->post("row/a"); - $except = $this->request->post("except"); - $text = isset($row['text']) ? $row['text'] : ''; - if ($this->model->where('text', $text)->where(function($query) use($except) { - if ($except) - { - $query->where('text', '<>', $except); - } - })->count() == 0) - { - return json(['ok' => '']); - } - else - { - return json(['error' => __('Text already exists')]); - } - } - -} diff --git a/application/admin/controller/wechat/Config.php b/application/admin/controller/wechat/Config.php deleted file mode 100644 index bf9af55d..00000000 --- a/application/admin/controller/wechat/Config.php +++ /dev/null @@ -1,164 +0,0 @@ -model = model('WechatConfig'); - } - - /** - * 添加 - */ - public function add() - { - if ($this->request->isPost()) - { - $this->code = -1; - $params = $this->request->post("row/a"); - if ($params) - { - foreach ($params as $k => &$v) - { - $v = is_array($v) ? implode(',', $v) : $v; - } - - if ($params['mode'] == 'json') - { - //JSON字段 - $fieldarr = $valuearr = []; - $field = $this->request->post('field/a'); - $value = $this->request->post('value/a'); - foreach ($field as $k => $v) - { - if ($v != '') - { - $fieldarr[] = $field[$k]; - $valuearr[] = $value[$k]; - } - } - $params['value'] = json_encode(array_combine($fieldarr, $valuearr), JSON_UNESCAPED_UNICODE); - } - unset($params['mode']); - try - { - //是否采用模型验证 - if ($this->modelValidate) - { - $name = basename(str_replace('\\', '/', get_class($this->model))); - $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : true) : $this->modelValidate; - $this->model->validate($validate); - } - $result = $this->model->save($params); - if ($result !== false) - { - $this->code = 1; - } - else - { - $this->msg = $this->model->getError(); - } - } - catch (\think\exception\PDOException $e) - { - $this->msg = $e->getMessage(); - } - } - else - { - $this->msg = __('Parameter %s can not be empty', ''); - } - - return; - } - return $this->view->fetch(); - } - - /** - * 编辑 - */ - public function edit($ids = NULL) - { - $row = $this->model->get($ids); - if (!$row) - $this->error(__('No Results were found')); - if ($this->request->isPost()) - { - $this->code = -1; - $params = $this->request->post("row/a"); - if ($params) - { - foreach ($params as $k => &$v) - { - $v = is_array($v) ? implode(',', $v) : $v; - } - - if ($params['mode'] == 'json') - { - //JSON字段 - $fieldarr = $valuearr = []; - $field = $this->request->post('field/a'); - $value = $this->request->post('value/a'); - foreach ($field as $k => $v) - { - if ($v != '') - { - $fieldarr[] = $field[$k]; - $valuearr[] = $value[$k]; - } - } - $params['value'] = json_encode(array_combine($fieldarr, $valuearr), JSON_UNESCAPED_UNICODE); - } - unset($params['mode']); - try - { - //是否采用模型验证 - if ($this->modelValidate) - { - $name = basename(str_replace('\\', '/', get_class($this->model))); - $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : true) : $this->modelValidate; - $row->validate($validate); - } - $result = $row->save($params); - if ($result !== false) - { - $this->code = 1; - } - else - { - $this->msg = $row->getError(); - } - } - catch (think\exception\PDOException $e) - { - $this->msg = $e->getMessage(); - } - } - else - { - $this->msg = __('Parameter %s can not be empty', ''); - } - - return; - } - $this->view->assign("row", $row); - $this->view->assign("value", (array) json_decode($row->value, true)); - return $this->view->fetch(); - } - -} diff --git a/application/admin/controller/wechat/Menu.php b/application/admin/controller/wechat/Menu.php deleted file mode 100644 index 1a1b7132..00000000 --- a/application/admin/controller/wechat/Menu.php +++ /dev/null @@ -1,111 +0,0 @@ -wechatcfg = \app\common\model\WechatConfig::get(['name' => 'menu']); - } - - /** - * 查看 - */ - public function index() - { - $responselist = array(); - $all = WechatResponse::all(); - foreach ($all as $k => $v) - { - $responselist[$v['eventkey']] = $v['title']; - } - $this->view->assign('responselist', $responselist); - $this->view->assign('menu', (array) json_decode($this->wechatcfg->value, TRUE)); - return $this->view->fetch(); - } - - /** - * 修改 - */ - public function edit($ids = NULL) - { - $menu = $this->request->post("menu"); - $menu = (array) json_decode($menu, TRUE); - $this->wechatcfg->value = json_encode($menu, JSON_UNESCAPED_UNICODE); - $this->wechatcfg->save(); - $this->code = 1; - return; - } - - /** - * 同步 - */ - public function sync($ids = NULL) - { - $this->code = -1; - $app = new Application(Config::get('wechat')); - - try - { - $hasError = false; - $menu = json_decode($this->wechatcfg->value, TRUE); - foreach ($menu as $k => $v) - { - if (isset($v['sub_button'])) - { - foreach ($v['sub_button'] as $m => $n) - { - if (isset($n['key']) && !$n['key']) - { - $hasError = true; - break 2; - } - } - } - else if (isset($v['key']) && !$v['key']) - { - $hasError = true; - break; - } - } - if (!$hasError) - { - $ret = $app->menu->add($menu); - if ($ret->errcode == 0) - { - $this->code = 1; - } - else - { - $this->msg = $ret->errmsg; - } - } - else - { - $this->msg = __('Invalid parameters'); - } - } - catch (Exception $e) - { - $this->msg = $e->getMessage(); - } - return; - } - -} diff --git a/application/admin/controller/wechat/Response.php b/application/admin/controller/wechat/Response.php deleted file mode 100644 index d1bbb1a7..00000000 --- a/application/admin/controller/wechat/Response.php +++ /dev/null @@ -1,86 +0,0 @@ -model = model('WechatResponse'); - } - - /** - * 选择素材 - */ - public function select() - { - return $this->view->fetch(); - } - - /** - * 添加 - */ - public function add() - { - if ($this->request->isPost()) - { - $this->code = -1; - $params = $this->request->post("row/a"); - $params['eventkey'] = isset($params['eventkey']) && $params['eventkey'] ? $params['eventkey'] : uniqid(); - $params['content'] = json_encode($params['content']); - $params['createtime'] = time(); - if ($params) - { - $this->model->save($params); - $this->code = 1; - $this->content = $params; - } - - return; - } - $appConfig = Wechat::appConfig(); - $this->view->applist = $appConfig; - return $this->view->fetch(); - } - - /** - * 编辑 - */ - public function edit($ids = NULL) - { - $row = $this->model->get($ids); - if (!$row) - $this->error(__('No Results were found')); - if ($this->request->isPost()) - { - $this->code = -1; - $params = $this->request->post("row/a"); - $params['eventkey'] = isset($params['eventkey']) && $params['eventkey'] ? $params['eventkey'] : uniqid(); - $params['content'] = json_encode($params['content']); - if ($params) - { - $row->save($params); - $this->code = 1; - } - return; - } - $this->view->assign("row", $row); - $appConfig = Wechat::appConfig(); - $this->view->applist = $appConfig; - return $this->view->fetch(); - } - -} diff --git a/application/admin/lang/zh-cn/addon.php b/application/admin/lang/zh-cn/addon.php new file mode 100644 index 00000000..8a438075 --- /dev/null +++ b/application/admin/lang/zh-cn/addon.php @@ -0,0 +1,9 @@ + 'ID', + 'Title' => '标题', + 'Value' => '配置值', + 'Array key' => '键', + 'Array value' => '值', +]; diff --git a/application/admin/lang/zh-cn/general/crontab.php b/application/admin/lang/zh-cn/general/crontab.php deleted file mode 100644 index 041aab78..00000000 --- a/application/admin/lang/zh-cn/general/crontab.php +++ /dev/null @@ -1,16 +0,0 @@ - '任务标题', - 'Maximums' => '最多执行', - 'Sleep' => '延迟秒数', - 'Schedule' => '执行周期', - 'Executes' => '执行次数', - 'Execute time' => '最后执行时间', - 'Request Url' => '请求URL', - 'Execute Sql Script' => '执行SQL', - 'Execute Shell' => '执行Shell', - 'Crontab format invalid' => 'Crontab格式错误', - 'Next execute time' => '下次预计时间', - 'The next %s times the execution time' => '接下来 %s 次的执行时间', -]; diff --git a/application/admin/lang/zh-cn/general/database.php b/application/admin/lang/zh-cn/general/database.php deleted file mode 100644 index 1defa653..00000000 --- a/application/admin/lang/zh-cn/general/database.php +++ /dev/null @@ -1,30 +0,0 @@ - '查询结果', - 'Basic query' => '基础查询', - 'View structure' => '查看表结构', - 'View data' => '查看表数据', - 'Optimize' => '优化表', - 'Repair' => '修复表', - 'Optimize all' => '优化全部表', - 'Repair all' => '修复全部表', - 'Table:%s' => '总计：%s个表', - 'Record:%s' => '记录：%s条', - 'Data:%s' => '占用：%s', - 'Index:%s' => '索引：%s', - 'SQL Result:' => '查询结果：', - 'SQL can not be empty' => 'SQL语句不能为空', - 'Max output:%s' => '最大返回%s条', - 'Total:%s' => '共有%s条记录! ', - 'Row:%s' => '记录：%s', - 'Executes one or multiple queries which are concatenated by a semicolon' => '请输入SQL语句，支持批量查询，多条SQL以分号(;)分格', - 'Query affected %s rows and took %s seconds' => '共影响%s条记录! 耗时：%s秒!', - 'Query returned an empty result' => '返回结果为空!', - 'Query took %s seconds' => '耗时%s秒!', - 'Optimize table %s done' => '优化表[%s]成功', - 'Repair table %s done' => '修复表[%s]成功', - 'Optimize table %s fail' => '优化表[%s]失败', - 'Repair table %s fail' => '修复表[%s]失败' -]; - diff --git a/application/admin/lang/zh-cn/index.php b/application/admin/lang/zh-cn/index.php index c4b76fd9..9bba7d10 100644 --- a/application/admin/lang/zh-cn/index.php +++ b/application/admin/lang/zh-cn/index.php @@ -31,4 +31,8 @@ return [ 'Verification code is incorrect' => '验证码不正确', 'Wipe cache completed' => '清除缓存成功', 'Wipe cache failed' => '清除缓存失败', + 'Wipe cache' => '清空缓存', + 'Check for updates' => '检测更新', + 'Latest news' => '最新消息', + 'View more' => '查看更多', ]; diff --git a/application/admin/lang/zh-cn/page.php b/application/admin/lang/zh-cn/page.php deleted file mode 100644 index 852303d0..00000000 --- a/application/admin/lang/zh-cn/page.php +++ /dev/null @@ -1,17 +0,0 @@ - 'ID', - 'category_id' => '分类ID', - 'category' => '分类', - 'title' => '标题', - 'keywords' => '关键字', - 'flag' => '标志', - 'image' => '头像', - 'content' => '内容', - 'icon' => '图标', - 'views' => '点击', - 'comments' => '评论', - 'weigh' => '权重', - 'status' => '状态' -]; diff --git a/application/admin/lang/zh-cn/version.php b/application/admin/lang/zh-cn/version.php deleted file mode 100644 index ce752693..00000000 --- a/application/admin/lang/zh-cn/version.php +++ /dev/null @@ -1,15 +0,0 @@ - 'ID', - 'oldversion' => '旧版本号', - 'newversion' => '新版本号', - 'packagesize' => '包大小', - 'content' => '升级内容', - 'downloadurl' => '下载地址', - 'enforce' => '强制更新', - 'createtime' => '创建时间', - 'updatetime' => '更新时间', - 'weigh' => '权重', - 'status' => '状态' -]; diff --git a/application/admin/lang/zh-cn/wechat/autoreply.php b/application/admin/lang/zh-cn/wechat/autoreply.php deleted file mode 100644 index 6ba7061c..00000000 --- a/application/admin/lang/zh-cn/wechat/autoreply.php +++ /dev/null @@ -1,8 +0,0 @@ - '文本', - 'Event key' => '响应标识', - 'Remark' => '备注', - 'Text already exists' => '文本已经存在', -]; diff --git a/application/admin/lang/zh-cn/wechat/config.php b/application/admin/lang/zh-cn/wechat/config.php deleted file mode 100644 index fbbd04a1..00000000 --- a/application/admin/lang/zh-cn/wechat/config.php +++ /dev/null @@ -1,10 +0,0 @@ - '配置名称', - 'value' => '配置值', - 'Json key' => '键', - 'Json value' => '值', - 'createtime' => '创建时间', - 'updatetime' => '更新时间' -]; diff --git a/application/admin/lang/zh-cn/wechat/response.php b/application/admin/lang/zh-cn/wechat/response.php deleted file mode 100644 index 37bb3bd7..00000000 --- a/application/admin/lang/zh-cn/wechat/response.php +++ /dev/null @@ -1,8 +0,0 @@ - '资源标题', - 'Event key' => '事件标识', - 'Text' => '文本', - 'App' => '应用', -]; diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index 145298fc..0b1b299d 100644 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -244,14 +244,8 @@ class Auth extends \fast\Auth // 生成菜单的badge foreach ($params as $k => $v) { - if (stripos($k, '/') === false) - { - $url = '/' . $module . '/' . $k; - } - else - { - $url = url($k); - } + + $url = $k; if (is_array($v)) { @@ -275,7 +269,6 @@ class Auth extends \fast\Auth // 读取管理员当前拥有的权限节点 $userRule = $this->getRuleList(); $select_id = 0; - $activeUrl = '/' . $module . '/' . $fixedPage; // 必须将结果集转换为数组 $ruleList = collection(model('AuthRule')->where('ismenu', 1)->order('weigh', 'desc')->cache("__menu__")->select())->toArray(); foreach ($ruleList as $k => &$v) @@ -285,8 +278,8 @@ class Auth extends \fast\Auth unset($ruleList[$k]); continue; } - $select_id = $v['name'] == $activeUrl ? $v['id'] : $select_id; - $v['url'] = $v['name']; + $select_id = $v['name'] == $fixedPage ? $v['id'] : $select_id; + $v['url'] = '/' . $module . '/' . $v['name']; $v['badge'] = isset($badgeList[$v['name']]) ? $badgeList[$v['name']] : ''; $v['py'] = \fast\Pinyin::get($v['title'], true); $v['pinyin'] = \fast\Pinyin::get($v['title']); diff --git a/application/admin/model/Config.php b/application/admin/model/Config.php deleted file mode 100644 index cec8a769..00000000 --- a/application/admin/model/Config.php +++ /dev/null @@ -1,55 +0,0 @@ - __('String'), - 'text' => __('Text'), - 'number' => __('Number'), - 'datetime' => __('Datetime'), - 'select' => __('Select'), - 'selects' => __('Selects'), - 'image' => __('Image'), - 'images' => __('Images'), - 'file' => __('File'), - 'files' => __('Files'), - 'checkbox' => __('Checkbox'), - 'radio' => __('Radio'), - 'array' => __('Array'), - ]; - return $typeList; - } - - /** - * 读取分类分组列表 - * @return array - */ - public static function getGroupList() - { - $groupList = config('site.configgroup'); - return $groupList; - } - -} diff --git a/application/admin/view/add.html b/application/admin/view/add.html deleted file mode 100644 index 746d0090..00000000 --- a/application/admin/view/add.html +++ /dev/null @@ -1,203 +0,0 @@ -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - -
-
-
- -
- - - -
-
-
- -
- - {foreach name="genderdataList" item="vo"} - - {/foreach} - -
-
-
- -
- - {foreach name="hobbydataList" item="vo"} - - {/foreach} - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - - -
    -
    -
    -
    -
    - -
    -
    - - - -
      -
      -
      -
      -
      - -
      -
      - - - - -
      -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - - {foreach name="statusList" item="vo"} - - {/foreach} - -
      -
      -
      - -
      - - {foreach name="stateList" item="vo"} - - {/foreach} - -
      -
      -
      - -
      - - -
      -
      -
      diff --git a/application/admin/view/addon/add.html b/application/admin/view/addon/add.html new file mode 100644 index 00000000..6900e4fb --- /dev/null +++ b/application/admin/view/addon/add.html @@ -0,0 +1,22 @@ +
      + +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + + +
      +
      +
      diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html new file mode 100644 index 00000000..e780dc8a --- /dev/null +++ b/application/admin/view/addon/config.html @@ -0,0 +1,102 @@ +
      + + + + + + + + + {foreach $addon.config as $item} + + + + + {/foreach} + +
      {:__('Title')}{:__('Value')}
      {$item.title} +
      +
      + {switch $item.type} + {case string} + + {/case} + {case text} + + {/case} + {case array} +
      +
      + {:__('Array key')} + {:__('Array value')} +
      + {foreach $item.value as $key => $vo} +
      + + + + +
      + {/foreach} +
      {:__('Append')}
      +
      + {/case} + {case datetime} + + {/case} + {case number} + + {/case} + {case checkbox} + {foreach name="item.content" item="vo"} + + {/foreach} + {/case} + {case radio} + {foreach name="item.content" item="vo"} + + {/foreach} + {/case} + {case value="select" break="0"}{/case} + {case value="selects"} + + {/case} + {case value="image" break="0"}{/case} + {case value="images"} +
      + + + +
        +
        + {/case} + {case value="file" break="0"}{/case} + {case value="files"} +
        + + + +
        + {/case} + {case bool} + + + {/case} + {/switch} +
        +
        +
        + +
        +
        + +
        + + +
        +
        +
        \ No newline at end of file diff --git a/application/admin/view/addon/index.html b/application/admin/view/addon/index.html new file mode 100644 index 00000000..a4712ea7 --- /dev/null +++ b/application/admin/view/addon/index.html @@ -0,0 +1,120 @@ + +
        + {:build_heading()} + +
        +
        +
        +
        +
        + {:build_toolbar('refresh')} + + {:__('刷新插件缓存')} +
        + + +
        + +
        +
        + +
        +
        +
        + + + \ No newline at end of file diff --git a/application/admin/view/auth/admin/index.html b/application/admin/view/auth/admin/index.html index a44c5627..9e3f7940 100644 --- a/application/admin/view/auth/admin/index.html +++ b/application/admin/view/auth/admin/index.html @@ -6,7 +6,7 @@
        - {:build_toolbar()} + {:build_toolbar('refresh,add,delete')}
        diff --git a/application/admin/view/auth/group/add.html b/application/admin/view/auth/group/add.html index 5e2aa8b2..406a5b93 100644 --- a/application/admin/view/auth/group/add.html +++ b/application/admin/view/auth/group/add.html @@ -1,4 +1,4 @@ - +
        diff --git a/application/admin/view/auth/group/edit.html b/application/admin/view/auth/group/edit.html index e7b433b2..fbd76fe1 100644 --- a/application/admin/view/auth/group/edit.html +++ b/application/admin/view/auth/group/edit.html @@ -1,4 +1,4 @@ - +
        diff --git a/application/admin/view/auth/group/index.html b/application/admin/view/auth/group/index.html index 8832095f..327313d8 100644 --- a/application/admin/view/auth/group/index.html +++ b/application/admin/view/auth/group/index.html @@ -6,7 +6,7 @@
        - {:build_toolbar()} + {:build_toolbar('refresh,add,delete')}
        diff --git a/application/admin/view/category/add.html b/application/admin/view/category/add.html index 7ab24afa..f8ca6c42 100644 --- a/application/admin/view/category/add.html +++ b/application/admin/view/category/add.html @@ -3,10 +3,10 @@
        - - {foreach name="typeList" item="vo"} - + {/foreach} @@ -15,10 +15,10 @@
        - - {foreach name="parentList" item="vo"} - + {/foreach} @@ -39,10 +39,10 @@
        - + diff --git a/application/admin/view/category/edit.html b/application/admin/view/category/edit.html index eb9403e1..d0ae2750 100644 --- a/application/admin/view/category/edit.html +++ b/application/admin/view/category/edit.html @@ -3,10 +3,10 @@
        - - {foreach name="typeList" item="vo"} - + {/foreach} @@ -15,10 +15,10 @@
        - - {foreach name="parentList" item="vo"} - + {/foreach} @@ -39,10 +39,10 @@
        - + diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index da3e9dd8..49f8cebe 100644 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -38,28 +38,18 @@ -
      • {:__('View all')}
        • +
      • {:__('View more')}
        • - -
      • - - - - - -
        • - +
      • - + + + +
        • + +
      • +
        • @@ -113,10 +103,10 @@
      • - {:__('Profile')} + {:__('Profile')}
        - {:__('Logout')} + {:__('Logout')}
        • diff --git a/application/admin/view/common/menu.html b/application/admin/view/common/menu.html index 5874fb10..9f8b109f 100644 --- a/application/admin/view/common/menu.html +++ b/application/admin/view/common/menu.html @@ -29,6 +29,10 @@ \ No newline at end of file diff --git a/application/admin/view/edit.html b/application/admin/view/edit.html deleted file mode 100644 index 6e00ce6c..00000000 --- a/application/admin/view/edit.html +++ /dev/null @@ -1,203 +0,0 @@ - - -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - - - -
        -
        -
        - -
        - - - -
        -
        -
        - -
        - - {foreach name="genderdataList" item="vo"} - - {/foreach} - -
        -
        -
        - -
        - - {foreach name="hobbydataList" item="vo"} - - {/foreach} - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        -
        - - - -
          -
          -
          -
          -
          - -
          -
          - - - -
            -
            -
            -
            -
            - -
            -
            - - - - -
            -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - - {foreach name="statusList" item="vo"} - - {/foreach} - -
            -
            -
            - -
            - - {foreach name="stateList" item="vo"} - - {/foreach} - -
            -
            -
            - -
            - - -
            -
            - diff --git a/application/admin/view/example/bootstraptable/detail.html b/application/admin/view/example/bootstraptable/detail.html deleted file mode 100644 index 07c0ee51..00000000 --- a/application/admin/view/example/bootstraptable/detail.html +++ /dev/null @@ -1,22 +0,0 @@ -
            - - - - - - - - {volist name="row" id="vo" } - - - - - {/volist} - -
            {:__('Title')}{:__('Content')}
            {$key}{$vo}
            -
            - -
            - -
            -
            \ No newline at end of file diff --git a/application/admin/view/example/bootstraptable/index.html b/application/admin/view/example/bootstraptable/index.html deleted file mode 100644 index 81e78ec6..00000000 --- a/application/admin/view/example/bootstraptable/index.html +++ /dev/null @@ -1,31 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            - - - -
            - -
            -
            - -
            -
            -
            \ No newline at end of file diff --git a/application/admin/view/example/colorbadge/index.html b/application/admin/view/example/colorbadge/index.html deleted file mode 100644 index 8d61a3a5..00000000 --- a/application/admin/view/example/colorbadge/index.html +++ /dev/null @@ -1,21 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            -
            - {:build_toolbar('refresh,delete')} -
            - - -
            - - -
            -
            - -
            -
            -
            \ No newline at end of file diff --git a/application/admin/view/example/controllerjump/index.html b/application/admin/view/example/controllerjump/index.html deleted file mode 100644 index 8d61a3a5..00000000 --- a/application/admin/view/example/controllerjump/index.html +++ /dev/null @@ -1,21 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            -
            - {:build_toolbar('refresh,delete')} -
            - - -
            - - -
            -
            - -
            -
            -
            \ No newline at end of file diff --git a/application/admin/view/example/cxselect/index.html b/application/admin/view/example/cxselect/index.html deleted file mode 100644 index 478bf5a0..00000000 --- a/application/admin/view/example/cxselect/index.html +++ /dev/null @@ -1,160 +0,0 @@ - -
            - {:build_heading()} - -
            -
            -
            -
            -
            -
            -
            - -
            -
            省市区联动(通过AJAX读取数据)
            -
            -
            -
            -
            - - - -
            -
            -
            -
            -
            -
            - -
            -
            -
            -
            -
            - - - -
            -
            -
            -
            -
            -
            - -
            -
            -
            - -
            -
            -
            -
            -
            类别联动(Ajax读取数据)
            -
            -
            -
            -
            - - -
            -
            -
            -
            -
            -
            - -
            -
            -
            -
            -
            - - -
            -
            -
            -
            -
            -
            - -
            -
            - -
            -
            -
            -
            -
            -
            省市区联动(通过JSON渲染数据)
            -
            -
            -
            - -
            - - - -
            -
            -
            -
            -
            -
            - -
            -
            -
            -
            - -
            - - - -
            -
            -
            -
            -
            -
            - -
            -
            -
            - -
            -
            -
            -
            -
            -
            - -
            -
            -
            \ No newline at end of file diff --git a/application/admin/view/example/multitable/index.html b/application/admin/view/example/multitable/index.html deleted file mode 100644 index 3ada81e4..00000000 --- a/application/admin/view/example/multitable/index.html +++ /dev/null @@ -1,43 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            -
            -
            - - -
            -
            -
            - - -
            -
            -
            -
            -
            - -
            -
            -
            diff --git a/application/admin/view/example/relationmodel/index.html b/application/admin/view/example/relationmodel/index.html deleted file mode 100644 index c1f4483c..00000000 --- a/application/admin/view/example/relationmodel/index.html +++ /dev/null @@ -1,21 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            -
            - {:build_toolbar('delete')} -
            - - -
            - - -
            -
            - -
            -
            -
            \ No newline at end of file diff --git a/application/admin/view/example/tabletemplate/index.html b/application/admin/view/example/tabletemplate/index.html deleted file mode 100644 index 4d470e67..00000000 --- a/application/admin/view/example/tabletemplate/index.html +++ /dev/null @@ -1,67 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            -
            - {:build_toolbar('refresh,delete')} - 获取选中项 - 切换视图 -
            - - -
            - -
            -
            - -
            -
            -
            - - - \ No newline at end of file diff --git a/application/admin/view/general/configvalue/add.html b/application/admin/view/general/configvalue/add.html deleted file mode 100644 index 095a60e1..00000000 --- a/application/admin/view/general/configvalue/add.html +++ /dev/null @@ -1,52 +0,0 @@ -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            -
            -
            - {:__('Key')} - {:__('Value')} -
            -
            - - - - -
            -
            {:__('Append')}
            -
            -
            -
            -
            - -
            - -
            -
            -
            - -
            - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
            -
            - - -
            diff --git a/application/admin/view/general/configvalue/edit.html b/application/admin/view/general/configvalue/edit.html deleted file mode 100644 index dfd1e289..00000000 --- a/application/admin/view/general/configvalue/edit.html +++ /dev/null @@ -1,53 +0,0 @@ -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            -
            -
            - {:__('Key')} - {:__('Value')} -
            - {foreach $row.content as $key => $vo} -
            - - - - -
            - {/foreach} -
            {:__('Append')}
            -
            -
            -
            -
            - -
            - -
            -
            -
            - -
            - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
            -
            - -
            diff --git a/application/admin/view/general/configvalue/index.html b/application/admin/view/general/configvalue/index.html deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/general/configvalue/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            - - -
            -
            -
            - -
            -
            -
            diff --git a/application/admin/view/general/crontab/add.html b/application/admin/view/general/crontab/add.html deleted file mode 100644 index 826e56b2..00000000 --- a/application/admin/view/general/crontab/add.html +++ /dev/null @@ -1,81 +0,0 @@ - -
            -
            - -
            - -
            -
            -
            - -
            - {:build_select('row[type]', $typedata, null, ['class'=>'form-control', 'data-rule'=>'required'])} -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            - 
            *    *    *    *    *
--    -    -    -    -
-|    |    |    |    +--- day of week (0 - 7) (Sunday=0 or 7)
-|    |    |    +-------- month (1 - 12)
-|    |    +------------- day of month (1 - 31)
-|    +------------------ hour (0 - 23)
-+----------------------- min (0 - 59)
            -
            {:__('The next %s times the execution time', '')}
            -
              -
            -
            -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
            -
            -
            - -
            - - -
            -
            - -
            diff --git a/application/admin/view/general/crontab/edit.html b/application/admin/view/general/crontab/edit.html deleted file mode 100644 index caa2aea4..00000000 --- a/application/admin/view/general/crontab/edit.html +++ /dev/null @@ -1,81 +0,0 @@ - -
            -
            - -
            - -
            -
            -
            - -
            - {:build_select('row[type]', $typedata, $row['type'], ['class'=>'form-control', 'data-rule'=>'required'])} -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            - 
            *    *    *    *    *
--    -    -    -    -
-|    |    |    |    +--- day of week (0 - 7) (Sunday=0 or 7)
-|    |    |    +-------- month (1 - 12)
-|    |    +------------- day of month (1 - 31)
-|    +------------------ hour (0 - 23)
-+----------------------- min (0 - 59)
            -
            {:__('The next %s times the execution time', '')}
            -
              -
            -
            -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
            -
            -
            - -
            - - -
            -
            - -
            diff --git a/application/admin/view/general/crontab/index.html b/application/admin/view/general/crontab/index.html deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/general/crontab/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            - - -
            -
            -
            - -
            -
            -
            diff --git a/application/admin/view/general/database/index.html b/application/admin/view/general/database/index.html deleted file mode 100644 index aaabdd5a..00000000 --- a/application/admin/view/general/database/index.html +++ /dev/null @@ -1,81 +0,0 @@ - -
            - {:build_heading()} - -
            -
            -
            -
            - -
            -
            -

            {:__('SQL Result')}:

            -
            -
            -
            - - -
            - -
            -
            - -
            -
            -
              -
              • -
              • -
              • -
              • -
              • -
              • -
            -
            -
            -
            - -
            -
            -
            - -
            -
            - -
            -
            - -
            - -
            - - - -
            -
            -
            - -
            -
            -
            diff --git a/application/admin/view/index.html b/application/admin/view/index.html deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
            - {:build_heading()} - -
            -
            -
            -
            - - -
            -
            -
            - -
            -
            -
            diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html index d985f909..d0f2cc69 100644 --- a/application/admin/view/index/login.html +++ b/application/admin/view/index/login.html @@ -6,7 +6,7 @@ -
            diff --git a/application/admin/view/page/add.html b/application/admin/view/page/add.html deleted file mode 100644 index 3304c708..00000000 --- a/application/admin/view/page/add.html +++ /dev/null @@ -1,80 +0,0 @@ -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - -
            -
            -
            - -
            - {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], null, ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])} -
            -
            -
            - -
            -
            - - - -
              -
              -
              -
              -
              - -
              - -
              -
              -
              - -
              - -
              -
              -
              - -
              - -
              -
              -
              - -
              - -
              -
              -
              - -
              - -
              -
              -
              - -
              - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
              -
              -
              - -
              - - -
              -
              -
              diff --git a/application/admin/view/page/edit.html b/application/admin/view/page/edit.html deleted file mode 100644 index abb2647e..00000000 --- a/application/admin/view/page/edit.html +++ /dev/null @@ -1,81 +0,0 @@ -
              - -
              - -
              - -
              -
              -
              - -
              - -
              -
              -
              - -
              - -
              -
              -
              - -
              - {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])} -
              -
              -
              - -
              -
              - - - -
                -
                -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/page/index.html b/application/admin/view/page/index.html deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/page/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/user/third/add.phtml b/application/admin/view/user/third/add.phtml deleted file mode 100644 index b0b61890..00000000 --- a/application/admin/view/user/third/add.phtml +++ /dev/null @@ -1,64 +0,0 @@ -
                -
                - -
                - -
                -
                -
                - -
                - {:build_select("row[{'platform'}]", 'weibo,wechat,qq', "", ['id' => 'c-platform', 'class' => 'form-control selectpicker', 'multiple', 'required'])} -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - - -
                -
                - -
                diff --git a/application/admin/view/user/third/edit.phtml b/application/admin/view/user/third/edit.phtml deleted file mode 100644 index c89ccded..00000000 --- a/application/admin/view/user/third/edit.phtml +++ /dev/null @@ -1,64 +0,0 @@ -
                - -
                - -
                - -
                -
                -
                - -
                - {:build_select("row[platform]", 'weibo,wechat,qq', $row['platform'], ['id' => 'c-platform', 'class' => 'form-control selectpicker', 'multiple', 'required']);} -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/user/third/index.phtml b/application/admin/view/user/third/index.phtml deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/user/third/index.phtml +++ /dev/null @@ -1,25 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/user/user/add.phtml b/application/admin/view/user/user/add.phtml deleted file mode 100644 index a9803459..00000000 --- a/application/admin/view/user/user/add.phtml +++ /dev/null @@ -1,193 +0,0 @@ -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                -
                - - -
                -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
                -
                -
                - -
                - - -
                -
                - -
                diff --git a/application/admin/view/user/user/edit.phtml b/application/admin/view/user/user/edit.phtml deleted file mode 100644 index b4579aa1..00000000 --- a/application/admin/view/user/user/edit.phtml +++ /dev/null @@ -1,187 +0,0 @@ -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                -
                - - -
                -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/user/user/index.phtml b/application/admin/view/user/user/index.phtml deleted file mode 100644 index 43c6636e..00000000 --- a/application/admin/view/user/user/index.phtml +++ /dev/null @@ -1,25 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/version/add.html b/application/admin/view/version/add.html deleted file mode 100644 index 6887392c..00000000 --- a/application/admin/view/version/add.html +++ /dev/null @@ -1,64 +0,0 @@ - - -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[enforce]', [1=>__('Yes'), 0=>__('No')], 1)} -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/version/edit.html b/application/admin/view/version/edit.html deleted file mode 100644 index 34b1b73b..00000000 --- a/application/admin/view/version/edit.html +++ /dev/null @@ -1,58 +0,0 @@ -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[enforce]', [1=>__('Yes'), 0=>__('No')], $row['enforce'])} -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/version/index.html b/application/admin/view/version/index.html deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/version/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/wechat/autoreply/add.html b/application/admin/view/wechat/autoreply/add.html deleted file mode 100644 index bd31f5cd..00000000 --- a/application/admin/view/wechat/autoreply/add.html +++ /dev/null @@ -1,51 +0,0 @@ - - -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                - 选择现有资源 - 添加新资源 -
                -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
                -
                -
                - -
                - - -
                -
                - -
                diff --git a/application/admin/view/wechat/autoreply/edit.html b/application/admin/view/wechat/autoreply/edit.html deleted file mode 100644 index 9c74994e..00000000 --- a/application/admin/view/wechat/autoreply/edit.html +++ /dev/null @@ -1,51 +0,0 @@ - - -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                -
                - - 选择现有资源
                资源名:{:$response['title'] ?>
                 - 添加新资源 -
                -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/wechat/autoreply/index.html b/application/admin/view/wechat/autoreply/index.html deleted file mode 100644 index f1bdef1f..00000000 --- a/application/admin/view/wechat/autoreply/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                -
                - {:build_toolbar()} -
                - - -
                -
                - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/wechat/config/add.html b/application/admin/view/wechat/config/add.html deleted file mode 100644 index 015f524f..00000000 --- a/application/admin/view/wechat/config/add.html +++ /dev/null @@ -1,45 +0,0 @@ -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                -

                - {:__('Json editor')} - {:__('Insert link')} -

                - -
                -
                - {:__('Json key')} - {:__('Json value')} -
                -
                - - - - -
                -
                {:__('Append')}
                -
                -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/wechat/config/edit.html b/application/admin/view/wechat/config/edit.html deleted file mode 100644 index 334731cf..00000000 --- a/application/admin/view/wechat/config/edit.html +++ /dev/null @@ -1,47 +0,0 @@ -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                -

                - {:__('Json editor')} - {:__('Insert link')} -

                - -
                -
                - {:__('Json key')} - {:__('Json value')} -
                - {foreach $value as $key => $vo} -
                - - - - -
                - {/foreach} -
                {:__('Append')}
                -
                -
                -
                -
                - -
                - - -
                -
                -
                diff --git a/application/admin/view/wechat/config/index.html b/application/admin/view/wechat/config/index.html deleted file mode 100644 index d3eefa4f..00000000 --- a/application/admin/view/wechat/config/index.html +++ /dev/null @@ -1,25 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/wechat/menu/index.html b/application/admin/view/wechat/menu/index.html deleted file mode 100644 index ebc1fdfb..00000000 --- a/application/admin/view/wechat/menu/index.html +++ /dev/null @@ -1,84 +0,0 @@ - -
                - {:build_heading()} - -
                -
                -
                -
                -
                -
                -
                {$site.name}
                - -
                -
                - -
                - 点击左侧菜单进行编辑操作 -
                -
                -
                -
                -
                - 可直接拖动菜单排序 -
                -
                保存并发布
                -
                -
                -
                - -
                -
                -
                - diff --git a/application/admin/view/wechat/response/add.html b/application/admin/view/wechat/response/add.html deleted file mode 100644 index 6d718a5d..00000000 --- a/application/admin/view/wechat/response/add.html +++ /dev/null @@ -1,48 +0,0 @@ -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - - - - -
                -
                -
                - -
                -
                - -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} -
                -
                -
                -
                -
                - - -
                -
                - -
                - \ No newline at end of file diff --git a/application/admin/view/wechat/response/edit.html b/application/admin/view/wechat/response/edit.html deleted file mode 100644 index 9ee6d32a..00000000 --- a/application/admin/view/wechat/response/edit.html +++ /dev/null @@ -1,52 +0,0 @@ -
                - -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - -
                -
                -
                - -
                - {:build_radios('row[type]', ['text' => __('Text'), 'app' => __('App')], $row['type'])} -
                -
                -
                - -
                -
                -
                -
                - {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} -
                -
                - - -
                - \ No newline at end of file diff --git a/application/admin/view/wechat/response/index.html b/application/admin/view/wechat/response/index.html deleted file mode 100644 index ca4b5492..00000000 --- a/application/admin/view/wechat/response/index.html +++ /dev/null @@ -1,19 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                -
                - {:build_toolbar();} -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/admin/view/wechat/response/select.html b/application/admin/view/wechat/response/select.html deleted file mode 100644 index 6139835a..00000000 --- a/application/admin/view/wechat/response/select.html +++ /dev/null @@ -1,16 +0,0 @@ -
                - {:build_heading()} - -
                -
                -
                -
                - - -
                -
                -
                - -
                -
                -
                diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php deleted file mode 100644 index 52bd44c4..00000000 --- a/application/api/controller/Index.php +++ /dev/null @@ -1,15 +0,0 @@ - 0]); - } - -} diff --git a/application/command.php b/application/command.php index da724a9c..062fa2e8 100755 --- a/application/command.php +++ b/application/command.php @@ -15,4 +15,5 @@ return [ 'app\admin\command\Menu', 'app\admin\command\Install', 'app\admin\command\Min', + 'app\admin\command\Addon', ]; diff --git a/application/common.php b/application/common.php index 95d30fc6..7189c997 100755 --- a/application/common.php +++ b/application/common.php @@ -1,7 +1,5 @@ root()); // 如果未设置__CDN__则自动匹配得出 if (!Config::get('view_replace_str.__CDN__')) diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index 94868ff9..09c66120 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -5,35 +5,16 @@ namespace app\common\controller; use app\admin\library\Auth; use think\Config; use think\Controller; +use think\Hook; use think\Lang; use think\Session; -load_trait('library/traits/Backend'); - /** * 后台控制器基类 */ class Backend extends Controller { - /** - * 返回码,默认为null,当设置了该值后将输出json数据 - * @var int - */ - protected $code = null; - - /** - * 返回内容,默认为null,当设置了该值后将输出json数据 - * @var mixed - */ - protected $data = null; - - /** - * 返回文本,默认为空 - * @var mixed - */ - protected $msg = ''; - /** * 无需登录的方法,同时也就不需要鉴权了 * @var array @@ -94,7 +75,7 @@ class Backend extends Controller $controllername = strtolower($this->request->controller()); $actionname = strtolower($this->request->action()); - $path = '/' . $modulename . '/' . str_replace('.', '/', $controllername) . '/' . $actionname; + $path = str_replace('.', '/', $controllername) . '/' . $actionname; // 定义是否Addtabs请求 !defined('IS_ADDTABS') && define('IS_ADDTABS', input("addtabs") ? TRUE : FALSE); @@ -115,6 +96,7 @@ class Backend extends Controller //检测是否登录 if (!$this->auth->isLogin()) { + Hook::listen('admin_nologin', $this); $url = Session::get('referer'); $url = $url ? $url : $this->request->url(); $this->error(__('Please login first'), url('index/login', ['url' => $url])); @@ -125,7 +107,8 @@ class Backend extends Controller // 判断控制器和方法判断是否有对应权限 if (!$this->auth->check($path)) { - $this->error(__('You have no permission'), NULL); + Hook::listen('admin_nopermission', $this); + $this->error(__('You have no permission'), ''); } } } @@ -156,24 +139,33 @@ class Backend extends Controller $site = Config::get("site"); + $upload = \app\common\model\Config::upload(); + + // 上传信息配置后 + Hook::listen("upload_config_init", $upload); + // 配置信息 $config = [ 'site' => array_intersect_key($site, array_flip(['name', 'cdnurl', 'version', 'timezone', 'languages'])), - 'upload' => \app\common\model\Config::upload(), + 'upload' => $upload, 'modulename' => $modulename, 'controllername' => $controllername, 'actionname' => $actionname, 'jsname' => 'backend/' . str_replace('.', '/', $controllername), 'moduleurl' => rtrim(url("/{$modulename}", '', false), '/'), 'language' => $lang, + 'fastadmin' => Config::get('fastadmin'), 'referer' => Session::get("referer") ]; - + // 配置信息后 + Hook::listen("config_init", $config); + //加载当前控制器语言包 $this->loadlang($controllername); - + //渲染站点配置 $this->assign('site', $site); + //渲染配置信息 $this->assign('config', $config); - + //渲染管理员对象 $this->assign('admin', Session::get('admin')); } @@ -186,6 +178,16 @@ class Backend extends Controller Lang::load(APP_PATH . $this->request->module() . '/lang/' . Lang::detect() . '/' . str_replace('.', '/', $name) . '.php'); } + /** + * 渲染配置信息 + * @param mixed $name 键名或数组 + * @param mixed $value 值 + */ + protected function assignconfig($name, $value = '') + { + $this->view->config = array_merge($this->view->config ? $this->view->config : [], is_array($name) ? $name : [$name => $value]); + } + /** * 生成查询所需要的条件,排序方式 * @param mixed $searchfields 查询条件 @@ -207,37 +209,36 @@ class Backend extends Controller $op = json_decode($op, TRUE); $filter = $filter ? $filter : []; $where = []; - $modelName = ''; + $tableName = ''; if ($relationSearch) { if (!empty($this->model)) { $class = get_class($this->model); $name = basename(str_replace('\\', '/', $class)); - $name = strtolower(preg_replace('/(?model->getQuery()->getTable($name) . "."; } if (stripos($sort, ".") === false) { - $sort = $modelName . $sort; + $sort = $tableName . $sort; } } if ($search) { $searcharr = is_array($searchfields) ? $searchfields : explode(',', $searchfields); - $searchlist = []; - foreach ($searcharr as $k => $v) + foreach ($searcharr as $k => &$v) { - $searchlist[] = (stripos($v, ".") !== false ? $v : "{$modelName}`{$v}`") . " LIKE '%{$search}%'"; + $v = $tableName . $v; } - $where[] = "(" . implode(' OR ', $searchlist) . ")"; + unset($v); + $where[] = [implode("|", $searcharr), "LIKE", "%{$search}%"]; } foreach ($filter as $k => $v) { $sym = isset($op[$k]) ? $op[$k] : '='; if (stripos($k, ".") === false) { - $k = $modelName . $k; + $k = $tableName . $k; } $sym = isset($op[$k]) ? $op[$k] : $sym; switch ($sym) @@ -306,7 +307,7 @@ class Backend extends Controller //当前页 $page = $this->request->request("page"); //分页大小 - $pagesize = $this->request->request("page_size"); + $pagesize = $this->request->request("per_page"); //搜索条件 $andor = $this->request->request("and_or"); //排序方式 @@ -368,23 +369,4 @@ class Backend extends Controller return json(['list' => $list, 'total' => $total]); } - /** - * 析构方法 - * - */ - public function __destruct() - { - //判断是否设置code值,如果有则变动response对象的正文 - if (!is_null($this->code)) - { - $result = [ - 'code' => $this->code, - 'msg' => $this->msg, - 'time' => $_SERVER['REQUEST_TIME'], - 'data' => $this->data, - ]; - echo json_encode($result); - } - } - } diff --git a/application/common/controller/Frontend.php b/application/common/controller/Frontend.php index 8366b013..fe9dde0b 100644 --- a/application/common/controller/Frontend.php +++ b/application/common/controller/Frontend.php @@ -11,24 +11,6 @@ use think\Session; class Frontend extends Controller { - /** - * 返回码,默认为null,当设置了该值后将输出json数据 - * @var int - */ - protected $code = null; - - /** - * 返回内容,默认为null,当设置了该值后将输出json数据 - * @var mixed - */ - protected $data = null; - - /** - * 返回文本,默认为空 - * @var mixed - */ - protected $msg = ''; - /** * * @var Auth @@ -57,22 +39,6 @@ class Frontend extends Controller $path = '/' . $modulename . '/' . str_replace('.', '/', $controllername) . '/' . $actionname; - $this->user = Auth::instance(); - - // 设置当前请求的URI - $this->user->setRequestUri($path); - - // 检测当前是否登录并进行初始化 - $this->user->init(); - - // 检测是否需要验证登录 - if (!$this->user->match($this->noNeedLogin)) - { - $this->checkLogin(); - } - - // 将auth对象渲染至视图 - $this->view->assign("user", $this->user); // 如果有使用模板布局 if ($this->layout) { @@ -119,18 +85,15 @@ class Frontend extends Controller { Lang::load(APP_PATH . $this->request->module() . '/lang/' . Lang::detect() . '/' . str_replace('.', '/', $name) . '.php'); } - + /** - * 析构方法 - * + * 渲染配置信息 + * @param mixed $name 键名或数组 + * @param mixed $value 值 */ - public function __destruct() + protected function assignconfig($name, $value = '') { - //判断是否设置code值,如果有则变动response对象的正文 - if (!is_null($this->code)) - { - $this->result($this->data, $this->code, $this->msg, 'json'); - } + $this->view->config = array_merge($this->view->config ? $this->view->config : [], is_array($name) ? $name : [$name => $value]); } } diff --git a/application/common/controller/Uc.php b/application/common/controller/Uc.php deleted file mode 100644 index fb51f352..00000000 --- a/application/common/controller/Uc.php +++ /dev/null @@ -1,162 +0,0 @@ -request->module(); - $controllername = strtolower($this->request->controller()); - $actionname = strtolower($this->request->action()); - - $path = '/' . $modulename . '/' . str_replace('.', '/', $controllername) . '/' . $actionname; - - $this->user = Auth::instance(); - - // 设置当前请求的URI - $this->user->setRequestUri($path); - - // 检测当前是否登录并进行初始化 - //$this->user->init(); - // - //加载UC函数库 - //加载UC XML类库 - Loader::import('fast.ucenter.common.Functions'); - Loader::import('fast.ucenter.common.XML'); - $this->initConfig(); //初始化UC应用配置 - $this->initRequest(); //初始化请求 - } - - function initConfig() - { - if (!defined('UC_API')) - { - $this->error('未发现uc常量配置信息'); - } - } - - function _serialize($arr, $htmlon = 0) - { - return xml_serialize($arr, $htmlon); - } - - /** - * 解析请求 - * @return boolean - */ - public function initRequest() - { - $code = $this->request->get('code'); - parse_str(_uc_authcode($code, 'DECODE', UC_KEY), $get); - if (get_magic_quotes_gpc()) - { - $get = _uc_stripslashes($get); - } - if (empty($get) || !isset($get['time']) || !isset($get['action'])) - { - $this->error = '非法请求'; - return false; - } - $timestamp = time(); - if ($timestamp - $get['time'] > 3600) - { - $this->error = '请求有效期已过'; - return false; - } - - $requestdata = file_get_contents('php://input'); - $this->code = $code; - $this->action = strtolower(parse_name($get['action'], '1')); - $this->get = $get; - $this->post = @xml_unserialize($requestdata); - $this->appdir = EXTEND_PATH . 'fast/ucenter/client/'; - // 定义允许请求的接口 - $allowaction = ['test', 'adduser', 'deleteuser', 'gettag', 'synregister', 'synlogin', 'synlogout', 'updateinfo', 'updatebadwords', 'updatehosts', 'updateapps', 'updateclient', 'updatecredit', 'getcreditsettings', 'updatecreditsettings']; - if (!in_array($this->action, $allowaction)) - { - $this->error = '请求不允许'; - return false; - } - } - - /** - * 响应ucserver的通信请求，调用相应方法，输出最终结果并结束整个流程 - */ - public function response() - { - if ($this->_before_response()) - { - if ($this->error !== NULL) - { - exit($this->error); - } - $response = call_user_func(array($this, $this->action)); - } - if ($this->_after_response($response)) - { - exit($response); - } - exit('-1'); - } - - protected function _before_response() - { - return true; - } - - protected function _after_response($response = "") - { - return true; - } - - public function test() - { - return API_RETURN_SUCCEED; - } - -} diff --git a/application/common/library/Auth.php b/application/common/library/Auth.php deleted file mode 100644 index 8cf8661d..00000000 --- a/application/common/library/Auth.php +++ /dev/null @@ -1,650 +0,0 @@ -user = new User; - } - - /** - * 初始化 - * @param array $options 参数 - * @return Auth - */ - public static function instance($options = []) - { - if (is_null(self::$instance)) - { - self::$instance = new static($options); - } - - return self::$instance; - } - - /** - * - * @return User - */ - public function getModel() - { - return $this->user; - } - - public function __get($name) - { - return $this->check() ? $this->user->$name : NULL; - } - - public function __call($name, $arguments) - { - return call_user_func_array([$this->user, $name], $arguments); - } - - /** - * 注册用户 - * - * @param string $username 用户名 - * @param string $password 密码 - * @param string $email 邮箱 - * @param string $mobile 手机号 - * @param string $extend 扩展参数 - * @return boolean - */ - public function register($username, $password, $email = '', $mobile = '', $extend = [], $keeptime = 0, $sync = TRUE) - { - $rule = [ - 'username' => 'require|length:6,30', - 'password' => 'require|length:6,30', - 'email' => 'email', - 'mobile' => 'regex:/^1\d{10}$/', - ]; - - $msg = [ - 'username.require' => __('Username can not be empty'), - 'username.length' => __('Username must be 6 to 30 characters'), - 'password.require' => __('Password can not be empty'), - 'password.length' => __('Password must be 6 to 30 characters'), - 'email' => __('Email is incorrect'), - 'mobile' => __('Mobile is incorrect'), - ]; - $data = [ - 'username' => $username, - 'password' => $password, - 'email' => $email, - 'mobile' => $mobile, - ]; - $validate = new Validate($rule, $msg); - $result = $validate->check($data); - if (!$result) - { - $this->setError($validate->getError()); - return FALSE; - } - - // 检测用户名或邮箱、手机号是否存在 - if (User::getByUsername($username)) - { - $this->setError(__('Username already exist')); - return FALSE; - } - if ($email && User::getByEmail($email)) - { - $this->setError(__('Email already exist')); - return FALSE; - } - if ($mobile && User::getByMobile($mobile)) - { - $this->setError(__('Mobile already exist')); - return FALSE; - } - - $ip = request()->ip(); - $time = time(); - $params = array_merge($data, [ - 'nickname' => $username, - 'salt' => Random::alnum(), - 'jointime' => $time, - 'joinip' => $ip, - 'logintime' => $time, - 'loginip' => $ip, - 'prevtime' => $time, - 'status' => 'normal' - ]); - $params['password'] = $this->getEncryptPassword($password, $params['salt']); - $params = array_merge($params, $extend); - - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS && $sync) - { - $uc = new Client(); - $user_id = $uc->uc_user_register($username, $password, $email); - // 如果小于0则说明发生错误 - if ($user_id <= 0) - { - $this->setError($user_id > -4 ? self::ERR_USERNAME_IS_INCORRECT : self::ERR_EMAIL_IS_INCORRECT); - return FALSE; - } - else - { - $params['id'] = $user_id; - } - } - - //账号注册时需要开启事务,避免出现垃圾数据 - Db::startTrans(); - try - { - $ret = $this->user->save($params); - Db::commit(); - - // 此时的Model中只包含部分数据 - $this->user = $this->user->get($this->user->id); - - $this->keeptime($keeptime); - return $this->syncLogin(); - } - catch (Exception $e) - { - Db::rollback(); - return FALSE; - } - } - - /** - * 用户登录 - * - * @param string $account 账号,用户名、邮箱、手机号 - * @param string $password 密码 - * @param int $keeptime 有效时长,默认为浏览器关闭 - * @return array - */ - public function login($account, $password, $keeptime = 0, $sync = TRUE) - { - $field = Validate::is($account, 'email') ? 'email' : (Validate::regex($account, '/^1\d{10}$/') ? 'mobile' : 'username'); - $user = $this->user->get([$field => $account]); - if ($user) - { - if ($user->status != 'normal') - { - $this->setError(self::ERR_ACCOUNT_IS_LOCKED); - return FALSE; - } - if ($user->password != $this->getEncryptPassword($password, $user->salt)) - { - $this->setError(self::ERR_PASSWORD_IS_INCORRECT); - return FALSE; - } - - $this->user = $user; - - // 设置登录有效时长 - $this->keeptime($keeptime); - - return $this->syncLogin($sync); - } - else - { - $this->setError(self::ERR_ACCOUNT_IS_INCORRECT); - return FALSE; - } - } - - /** - * 注销登录退出 - * @return bool - */ - public function logout($token = NULL) - { - //设置登录标识 - $this->_logined = FALSE; - $token = is_null($token) ? Cookie::get('token') : $token; - Token::delete($token); - Cookie::delete('user_id'); - //Cookie::del('username'); - Cookie::delete('token'); - return TRUE; - } - - /** - * 生成Token - * @return string - */ - public function token() - { - //$token = Encrypt::aesEncode($this->keeptime . '|' . $expiretime, Config::get('encrypt', 'aes_key'), TRUE); - $token = Random::uuid(); - Token::set($token, $this->user->id, $this->keeptime); - return $token; - } - - /** - * 初始化 - * - * @param int $user_id 会员ID,默认从Cookie中取 - * @param string $token 会员Token,默认从Cookie中取 - * - * @return boolean - */ - public function init($user_id = NULL, $token = NULL) - { - $user_id = $user_id ? $user_id : Cookie::get('user_id'); - $user_id = intval($user_id); - if ($user_id > 0) - { - if ($this->_error) - return FALSE; - $user = $this->get($user_id); - if (!$user) - { - $this->setError(self::ERR_ACCOUNT_NOT_EXIST); - return FALSE; - } - if ($user['status'] != 'normal') - { - $this->setError(self::ERR_ACCOUNT_IS_LOCKED); - return FALSE; - } - $token = $token ? $token : Cookie::get('token'); - if (!Token::check($token)) - { - return FALSE; - } - if (Token::identity($token) != $user['id']) - { - return FALSE; - } - $this->user = $user; - $this->_logined = TRUE; - return TRUE; - } - else - { - $this->setError(self::ERR_YOU_ARE_NOT_LOGGED_IN); - return FALSE; - } - } - - /** - * 检测是否登录 - * - * @return boolean - */ - public function check() - { - return $this->_logined; - } - - /** - * 检测是否登录 - * - * @return boolean - */ - public function isLogin() - { - return $this->check(); - } - - /** - * 获取当前请求的URI - * @return string - */ - public function getRequestUri() - { - return $this->requestUri; - } - - /** - * 设置当前请求的URI - * @param string $uri - */ - public function setRequestUri($uri) - { - $this->requestUri = $uri; - } - - /** - * 第三方登录 - * @param string $platform - * @param array $params - * @param int $keeptime - * @return boolean - */ - public function connect($platform, $params = [], $keeptime = 0) - { - $time = time(); - $values = [ - 'platform' => $platform, - 'openid' => $params['openid'], - 'openname' => isset($params['userinfo']['nickname']) ? $params['userinfo']['nickname'] : '', - 'access_token' => $params['access_token'], - 'refresh_token' => $params['refresh_token'], - 'expires_in' => $params['expires_in'], - 'logintime' => $time, - 'expiretime' => $time + $params['expires_in'], - ]; - - $this->keeptime($keeptime); - $userthird = UserThird::get(['platform' => $platform, 'openid' => $params['openid']]); - if ($userthird) - { - $this->user = $this->user->get($userthird['user_id']); - if (!$this->user) - { - return FALSE; - } - $userthird->save($values); - return $this->syncLogin(); - } - else - { - // 先随机一个用户名,随后再变更为u+数字id - $username = Random::alnum(20); - $password = Random::alnum(6); - // 默认注册一个会员 - $result = $this->register($username, $password, '', '', [], $keeptime); - if (!$result) - { - return FALSE; - } - $userarr = ['username' => 'u' . $this->user->id]; - if (isset($params['userinfo']['nickname'])) - $userarr['nickname'] = $params['userinfo']['nickname']; - if (isset($params['userinfo']['avatar'])) - $userarr['avatar'] = $params['userinfo']['avatar']; - - // 更新会员资料 - $this->user->save($userarr); - - // 保存第三方信息 - $values['user_id'] = $this->user->id; - UserThird::create($values); - - // 写入登录Cookies和Token - $this->writeStatus(); - return TRUE; - } - } - - /** - * 删除一个指定会员 - * @param int $user_id - * @param bool $sync 是否同步删除 - */ - public function delete($user_id, $sync = TRUE) - { - $user = $this->user->get($user_id); - if (!$user) - { - return FALSE; - } - - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS && $sync) - { - $uc = new Client(); - $re = $uc->uc_user_delete($user['id']); - // 如果小于0则说明发生错误 - if ($re <= 0) - { - $this->setError(self::ERR_ACCOUNT_IS_LOCKED); - return FALSE; - } - } - // 调用事务删除账号 - $result = Db::transaction(function($db) use($user_id) { - // 删除会员 - User::destroy($user_id); - - // 删除会员第三方登录 - UserThird::destroy($user_id); - }); - - return $result ? TRUE : FALSE; - } - - /** - * 直接登录账号 - * @param int $user_id - * @param boolean $sync - * @return boolean - */ - public function direct($user_id, $sync = TRUE) - { - $this->user = $this->user->get($user_id); - if ($this->user) - { - $this->syncLogin($sync); - return TRUE; - } - else - { - return FALSE; - } - } - - /** - * 获取密码加密方式 - * @param string $password - * @param string $salt - * @return string - */ - public function getEncryptPassword($password, $salt = '') - { - return md5(md5($password) . $salt); - } - - - - /** - * 检测当前控制器和方法是否匹配传递的数组 - * - * @param array $arr 需要验证权限的数组 - */ - public function match($arr = []) - { - $request = Request::instance(); - $arr = is_array($arr) ? $arr : explode(',', $arr); - if (!$arr) - { - return FALSE; - } - // 是否存在 - if (in_array(strtolower($request->action()), $arr) || in_array('*', $arr)) - { - return TRUE; - } - - // 没找到匹配 - return FALSE; - } - - /** - * 同步登录信息 - * @param int $sync 是否同步登录到UC - * @return boolean - */ - protected function syncLogin($sync = TRUE) - { - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS && $sync) - { - $uc = new Client(); - $re = $uc->uc_user_login($this->user->id, $this->user->password . '#split#' . $this->user->salt, 3); - // 如果小于0则说明发生错误 - if ($re <= 0) - { - $this->setError(self::ERR_USERNAME_OR_PASSWORD_IS_INCORRECT); - return FALSE; - } - } - - //增加登录次数和设置最后登录时间 - $this->user->save([ - 'prevtime' => $this->user->logintime, - 'logintime' => time(), - 'loginip' => request()->ip(), - ]); - - // 写入登录Cookies和Token - $this->writeStatus(); - return TRUE; - } - - /** - * 写入登录态和Cookie - * - * @param int $keeptime - */ - protected function writeStatus() - { - //设置登录标识 - $this->_logined = TRUE; - - $token = $this->token(); - Cookie::set('user_id', $this->user->id, $this->keeptime); - Cookie::set('username', $this->user->username, 86400 * 365); - //加密安全字符 - Cookie::set('token', $token, $this->keeptime); - $this->setError(''); - } - - /** - * 设置会话有效时间 - * @param int $keeptime 默认为永久 - */ - public function keeptime($keeptime = 0) - { - $this->keeptime = $keeptime; - } - - /** - * 渲染用户数据 - * @param array $datalist - * @param array $fields - * @param string $fieldkey - * @param string $renderkey - * @return array - */ - public function render(&$datalist, $fields = [], $fieldkey = 'user_id', $renderkey = 'userinfo') - { - $fields = !$fields ? ['id', 'nickname', 'level', 'avatar'] : (is_array($fields) ? $fields : explode(',', $fields)); - $ids = []; - foreach ($datalist as $k => $v) - { - if (!isset($v[$fieldkey])) - continue; - $ids[] = $v[$fieldkey]; - } - $list = []; - if ($ids) - { - if (!in_array('id', $fields)) - { - $fields[] = 'id'; - } - $ids = array_unique($ids); - $selectlist = User::where('id', 'in', $ids)->column($fields); - foreach ($selectlist as $k => $v) - { - $list[$v['id']] = $v; - } - } - foreach ($datalist as $k => &$v) - { - $v[$renderkey] = isset($list[$v[$fieldkey]]) ? $list[$v[$fieldkey]] : NULL; - } - unset($v); - return $datalist; - } - - /** - * 设置错误信息 - * - * @param $error - */ - public function setError($error) - { - $this->_error = $error; - return $this; - } - - /** - * 获取错误信息 - * @return string - */ - public function getError() - { - return __($this->_error); - } - - public function __toString() - { - return $this->user->toJson(); - } - - // JsonSerializable - public function jsonSerialize() - { - return $this->user->toArray(); - } - - // ArrayAccess - public function offsetSet($name, $value) - { - $this->user->setAttr($name, $value); - } - - public function offsetExists($name) - { - return $this->user->__isset($name); - } - - public function offsetUnset($name) - { - $this->user->__unset($name); - } - - public function offsetGet($name) - { - return $this->user->getAttr($name); - } - -} diff --git a/application/common/library/Menu.php b/application/common/library/Menu.php new file mode 100644 index 00000000..fb63ab5d --- /dev/null +++ b/application/common/library/Menu.php @@ -0,0 +1,77 @@ + $v) + { + $hasChild = isset($v['sublist']) && $v['sublist'] ? true : false; + + $data = array_intersect_key($v, $allow); + + $data['ismenu'] = isset($data['ismenu']) ? $data['ismenu'] : ($hasChild ? 1 : 0); + $data['icon'] = isset($data['icon']) ? $data['icon'] : ($hasChild ? 'fa fa-list' : 'fa fa-circle-o'); + $data['pid'] = $pid; + $data['status'] = 'normal'; + try + { + $menu = AuthRule::create($data); + if ($hasChild) + { + self::create($v['sublist'], $menu->id); + } + } + catch (PDOException $e) + { + print_r($e); + } + } + } + + /** + * 删除菜单 + * @param string $name 规则name + * @return boolean + */ + public static function delete($name) + { + $menu = AuthRule::getByName($name); + if ($menu) + { + // 必须将结果集转换为数组 + $ruleList = collection(model('AuthRule')->order('weigh', 'desc')->field('id,pid,name')->select())->toArray(); + // 构造菜单数据 + $ids = Tree::instance()->init($ruleList)->getChildrenIds($menu['id'], true); + if ($ids) + { + AuthRule::destroy($ids); + } + return true; + } + return false; + } + +} diff --git a/application/common/library/Token.php b/application/common/library/Token.php deleted file mode 100644 index 268790cc..00000000 --- a/application/common/library/Token.php +++ /dev/null @@ -1,66 +0,0 @@ - - * 更多字段可参考http://docs.upyun.com/api/form_api/#_2 - * + * 本地上传配置信息 * @return array */ - public static function upload($params = []) + public static function upload() { $uploadcfg = config('upload'); - $uploadcfg = $uploadcfg ? $uploadcfg : []; - $uploadcfg = array_merge($uploadcfg, $params); - $uploadcfg['bucket'] = isset($uploadcfg['bucket']) ? $uploadcfg['bucket'] : ''; - $multiple = isset($uploadcfg['multiple']) ? $uploadcfg['multiple'] : false; - $savekey = isset($uploadcfg['savekey']) ? $uploadcfg['savekey'] : ''; - $uploadcfg['save-key'] = isset($uploadcfg['save-key']) ? $uploadcfg['save-key'] : $savekey; - $expiration = time() + (isset($uploadcfg['expire']) ? $uploadcfg['expire'] : 600); - $uploadcfg['expiration'] = isset($uploadcfg['expiration']) ? $uploadcfg['expiration'] : $expiration; - $notifyurl = isset($uploadcfg['notifyurl']) ? $uploadcfg['notifyurl'] : ''; - $returnurl = isset($uploadcfg['returnurl']) ? $uploadcfg['returnurl'] : ''; - if ($notifyurl) - $uploadcfg['notify-url'] = $notifyurl; - else - unset($uploadcfg['notify-url']); - if ($returnurl) - $uploadcfg['return-url'] = $returnurl; - else - unset($uploadcfg['return-url']); - //设置允许的附加字段 - $allowfields = [ - 'bucket', 'save-key', 'expiration', 'date', 'content-md5', 'notify-url', 'return-url', 'content-secret', 'content-type', 'allow-file-type', 'content-length-range', - 'image-width-range', 'image-height-range', 'x-gmkerl-thumb', 'x-gmkerl-type', 'apps', 'b64encoded', 'ext-param' - ]; - $params = array_intersect_key($uploadcfg, array_flip($allowfields)); - $policy = base64_encode(json_encode($params)); - $signature = md5($policy . '&' . (isset($uploadcfg['formkey']) ? $uploadcfg['formkey'] : '')); - $multipart = [ - 'policy' => $policy, - 'signature' => $signature, - ]; - - $multipart = array_merge($multipart, $params); - return [ - 'cdnurl' => isset($uploadcfg['cdnurl']) ? $uploadcfg['cdnurl'] : '', - 'uploadurl' => isset($uploadcfg['uploadurl']) ? $uploadcfg['uploadurl'] : url('ajax/upload'), - 'bucket' => $uploadcfg['bucket'], - 'maxsize' => isset($uploadcfg['maxsize']) ? $uploadcfg['maxsize'] : '', - 'mimetype' => isset($uploadcfg['mimetype']) ? $uploadcfg['mimetype'] : '', - 'multipart' => $multipart, - 'multiple' => $multiple, + $upload = [ + 'cdnurl' => $uploadcfg['cdnurl'], + 'uploadurl' => $uploadcfg['uploadurl'], + 'bucket' => 'local', + 'maxsize' => $uploadcfg['maxsize'], + 'mimetype' => $uploadcfg['mimetype'], + 'multipart' => [], + 'multiple' => $uploadcfg['multiple'], ]; + return $upload; } } diff --git a/application/common/model/Configvalue.php b/application/common/model/Configvalue.php deleted file mode 100644 index dfbbec63..00000000 --- a/application/common/model/Configvalue.php +++ /dev/null @@ -1,76 +0,0 @@ - 'json', - ]; - - /** - * 加载上传配置 - * - * @param array $params 扩展参数,常用字段savekey,mimetype,maxsize,ext-param,notify-url,return-url
                - * 更多字段可参考http://docs.upyun.com/api/form_api/#_2 - * - * @return array - */ - public static function upload($params = []) - { - $uploadcfg = Config::get('upload'); - $uploadcfg = $uploadcfg ? $uploadcfg : []; - $uploadcfg = array_merge($uploadcfg, $params); - $uploadcfg['bucket'] = isset($uploadcfg['bucket']) ? $uploadcfg['bucket'] : ''; - $multiple = isset($uploadcfg['multiple']) ? $uploadcfg['multiple'] : false; - $savekey = isset($uploadcfg['savekey']) ? $uploadcfg['savekey'] : ''; - $uploadcfg['save-key'] = isset($uploadcfg['save-key']) ? $uploadcfg['save-key'] : $savekey; - $expiration = time() + (isset($uploadcfg['expire']) ? $uploadcfg['expire'] : 600); - $uploadcfg['expiration'] = isset($uploadcfg['expiration']) ? $uploadcfg['expiration'] : $expiration; - $notifyurl = isset($uploadcfg['notifyurl']) ? $uploadcfg['notifyurl'] : ''; - $returnurl = isset($uploadcfg['returnurl']) ? $uploadcfg['returnurl'] : ''; - if ($notifyurl) - $uploadcfg['notify-url'] = $notifyurl; - else - unset($uploadcfg['notify-url']); - if ($returnurl) - $uploadcfg['return-url'] = $returnurl; - else - unset($uploadcfg['return-url']); - - //设置允许的附加字段 - $allowfields = [ - 'bucket', 'save-key', 'expiration', 'date', 'content-md5', 'notify-url', 'return-url', 'content-secret', 'content-type', 'allow-file-type', 'content-length-range', - 'image-width-range', 'image-height-range', 'x-gmkerl-thumb', 'x-gmkerl-type', 'apps', 'b64encoded', 'ext-param' - ]; - $params = array_intersect_key($uploadcfg, array_flip($allowfields)); - $policy = base64_encode(json_encode($params)); - $signature = md5($policy . '&' . (isset($uploadcfg['formkey']) ? $uploadcfg['formkey'] : '')); - $multipart = [ - 'policy' => $policy, - 'signature' => $signature, - ]; - - $multipart = array_merge($multipart, $params); - return [ - 'cdnurl' => isset($uploadcfg['cdnurl']) ? $uploadcfg['cdnurl'] : '', - 'uploadurl' => isset($uploadcfg['uploadurl']) ? $uploadcfg['uploadurl'] : url('ajax/upload'), - 'bucket' => $uploadcfg['bucket'], - 'maxsize' => isset($uploadcfg['maxsize']) ? $uploadcfg['maxsize'] : '', - 'mimetype' => isset($uploadcfg['mimetype']) ? $uploadcfg['mimetype'] : '', - 'multipart' => $multipart, - 'multiple' => $multiple, - ]; - } - -} diff --git a/application/common/model/Crontab.php b/application/common/model/Crontab.php deleted file mode 100644 index f0681dd3..00000000 --- a/application/common/model/Crontab.php +++ /dev/null @@ -1,54 +0,0 @@ - __('Request Url'), - 'sql' => __('Execute Sql Script'), - 'shell' => __('Execute Shell'), - ]; - } - - public function getTypeTextAttr($value, $data) - { - $typelist = self::getTypeList(); - $value = $value ? $value : $data['type']; - return $value && isset($typelist[$value]) ? $typelist[$value] : $value; - } - - protected function setBegintimeAttr($value) - { - return $value && !is_numeric($value) ? strtotime($value) : $value; - } - - protected function setEndtimeAttr($value) - { - return $value && !is_numeric($value) ? strtotime($value) : $value; - } - - protected function setExecutetimeAttr($value) - { - return $value && !is_numeric($value) ? strtotime($value) : $value; - } - -} diff --git a/application/common/model/Page.php b/application/common/model/Page.php deleted file mode 100644 index 18cd2f86..00000000 --- a/application/common/model/Page.php +++ /dev/null @@ -1,20 +0,0 @@ -belongsTo('Category', 'category_id')->setEagerlyType(0); - } -} diff --git a/application/common/model/User.php b/application/common/model/User.php deleted file mode 100644 index b81500e3..00000000 --- a/application/common/model/User.php +++ /dev/null @@ -1,16 +0,0 @@ - $name]); - return $item ? $item->value : ''; - } - -} diff --git a/application/common/model/WechatContext.php b/application/common/model/WechatContext.php deleted file mode 100644 index c51aee09..00000000 --- a/application/common/model/WechatContext.php +++ /dev/null @@ -1,16 +0,0 @@ - 'page', 'list_rows' => 15, ], + //验证码配置 'captcha' => [ // 验证码字符集合 'codeSet' => '2345678abcdefhijkmnpqrstuvwxyzABCDEFGHJKLMNPQRTUVWXY', @@ -239,4 +240,9 @@ return [ // 验证成功后是否重置 'reset' => true ], + //FastAdmin配置 + 'fastadmin' => [ + 'version' => '1.0.0.20170808_beta', + 'api_url' => 'http://api.fastadmin.net', + ], ]; diff --git a/application/constants.php b/application/constants.php deleted file mode 100644 index c670814c..00000000 --- a/application/constants.php +++ /dev/null @@ -1,23 +0,0 @@ - false, + 'hooks' => + array ( + ), +); \ No newline at end of file diff --git a/application/extra/payment.php b/application/extra/payment.php deleted file mode 100644 index eeb49b10..00000000 --- a/application/extra/payment.php +++ /dev/null @@ -1,48 +0,0 @@ - [ - // 即时到账方式 - 'payment_type' => 1, - // 传输协议 - 'transport' => 'http', - // 编码方式 - 'input_charset' => 'utf-8', - // 签名方法 - 'sign_type' => 'MD5', - // 证书路径 - 'cacert' => './cacert.pem', - //验签公钥地址 - 'public_key_path' => './alipay_public_key.pem', - 'private_key_path' => '', - // 支付完成异步通知调用地址 - 'notify_url' => '/order/callback_alipay/notify', - // 支付完成同步返回地址 - 'return_url' => '/order/callback_alipay/return', - // 支付宝商家 ID - 'partner' => '2088xxxxxxxx', - // // 支付宝商家 KEY - 'key' => 'xxxxxxxxxxxx', - // // 支付宝商家注册邮箱 - 'seller_email' => 'email@domain.com' - ], - 'wechat' => [ - //微信支付配置数组 - // 公众账号appid - 'appid' => '', - // 商户号 - 'mch_id' => '', - // 加密key - 'apikey' => '', - // 公众号appsecret - 'appsecret' => '', - // 证书路径(apiclient_cert.pem) - 'sslcertPath' => '', - // 密钥路径(apiclient_key.pem) - 'sslkeyPath' => '', - // 支付完成异步通知调用地址 - 'notify_url' => '' - ] -]; diff --git a/application/extra/service.php b/application/extra/service.php deleted file mode 100644 index 4c7c64ff..00000000 --- a/application/extra/service.php +++ /dev/null @@ -1,42 +0,0 @@ - [ - 'key' => '', - 'secret' => '' - ], - // 环信配置 - 'easemob' => [ - 'org_name' => '', - 'app_name' => '', - 'client_id' => '', - 'client_secret' => '', - ], - // 七牛上传配置 - 'qiniu' => [ - 'secretkey' => '', - 'accesskey' => '', - //超时时间 - 'expire' => 86400, - //bucket配置 - 'file' => 'uploadbucket', - 'task' => 'taskbucket', - 'share' => 'sharebucket', - //bucket对应域名 - 'domain' => [ - 'uploadbucket' => 'http://1.qiniudn.com/', - 'taskbucket' => 'http://1.qiniudn.com/', - 'sharebucket' => 'http://1.qiniudn.com/', - ] - ], - // 又拍云配置 - 'upyun' => [ - 'bucketname' => '', - 'username' => '', - 'password' => '', - 'endpoint' => 'v0.api.upyun.com', - ] -]; diff --git a/application/extra/third.php b/application/extra/third.php deleted file mode 100644 index 9001c58b..00000000 --- a/application/extra/third.php +++ /dev/null @@ -1,28 +0,0 @@ - [ - 'app_id' => '', - 'app_secret' => '', - 'callback' => '', - ], - // 微信 - // 申请请到https://open.weixin.qq.com - 'wechat' => [ - 'app_id' => '', - 'app_secret' => '', - 'callback' => '', - 'scope' => 'snsapi_userinfo', - ], - // QQ - // 申请请到https://connect.qq.com - 'qq' => [ - 'app_id' => '', - 'app_secret' => '', - 'scope' => 'get_user_info', - 'callback' => '', - ], -]; diff --git a/application/extra/upload.php b/application/extra/upload.php index d461c3b5..e04fd0ca 100644 --- a/application/extra/upload.php +++ b/application/extra/upload.php @@ -3,29 +3,13 @@ //上传配置 return [ /** - * 上传地址,默认是本地上传,如果需要使用又拍云则改为http://v0.api.upyun.com/yourbucketname + * 上传地址,默认是本地上传 */ 'uploadurl' => 'ajax/upload', /** - * 本机的CDN地址或又拍云http://yourbucketname.b0.upaiyun.com + * CDN地址 */ 'cdnurl' => '', - /** - * 上传成功后的通知地址 - */ - 'notifyurl' => 'http://www.yoursite.com/upyun/notify', - /** - * 又拍云Bucket - */ - 'bucket' => 'yourbucketname', - /** - * 生成的policy有效时间 - */ - 'expire' => '86400', - /** - * 又拍云formkey - */ - 'formkey' => '', /** * 文件保存格式 */ @@ -42,12 +26,4 @@ return [ * 是否支持批量上传 */ 'multiple' => false, - /** - * 又拍云操作员用户名 - */ - 'username' => '', - /** - * 又拍云操作员密码 - */ - 'password' => '', ]; diff --git a/application/extra/wechat.php b/application/extra/wechat.php deleted file mode 100644 index e8fdfe74..00000000 --- a/application/extra/wechat.php +++ /dev/null @@ -1,64 +0,0 @@ - true, - /** - * 账号基本信息，请从微信公众平台/开放平台获取 - */ - 'app_id' => 'your-app-id', // AppID - 'secret' => 'your-app-secret', // AppSecret - 'token' => 'your-token', // Token - 'aes_key' => '', // EncodingAESKey，安全模式下请一定要填写！！！ - /** - * 日志配置 - * - * level: 日志级别, 可选为： - * debug/info/notice/warning/error/critical/alert/emergency - * permission：日志文件权限(可选)，默认为null（若为null值,monolog会取0644） - * file：日志文件位置(绝对路径!!!)，要求可写权限 - */ - 'log' => [ - 'level' => 'debug', - 'permission' => 0777, - 'file' => '/runtime/log/easywechat.log', - ], - /** - * OAuth 配置 - * - * scopes：公众平台（snsapi_userinfo / snsapi_base），开放平台：snsapi_login - * callback：OAuth授权完成后的回调页地址 - */ - 'oauth' => [ - 'scopes' => ['snsapi_userinfo'], - 'callback' => 'http://www.yoursite.com/callback', - ], - /** - * 微信支付 - */ - 'payment' => [ - 'merchant_id' => 'your-mch-id', - 'key' => 'key-for-signature', - 'cert_path' => 'path/to/your/cert.pem', // XXX: 绝对路径！！！！ - 'key_path' => 'path/to/your/key', // XXX: 绝对路径！！！！ - // 'device_info' => '013467007045764', - // 'sub_app_id' => '', - // 'sub_merchant_id' => '', - // ... - ], - /** - * Guzzle 全局设置 - * - * 更多请参考： http://docs.guzzlephp.org/en/latest/request-options.html - */ - 'guzzle' => [ - 'timeout' => 3.0, // 超时时间（秒） - //'verify' => false, // 关掉 SSL 认证（强烈不建议！！！） - ], -]; diff --git a/application/index/controller/Ajax.php b/application/index/controller/Ajax.php index 738f0a7a..26ee7a96 100644 --- a/application/index/controller/Ajax.php +++ b/application/index/controller/Ajax.php @@ -38,7 +38,6 @@ class Ajax extends Frontend public function upload() { $this->checkLogin(); - $this->code = -1; $file = $this->request->file('file'); //判断是否已经存在附件 @@ -46,11 +45,9 @@ class Ajax extends Frontend $uploaded = model("attachment")->where('sha1', $sha1)->find(); if ($uploaded) { - $this->code = 1; - $this->data = [ + $this->success('', null, [ 'url' => $uploaded['url'] - ]; - return; + ]); } $upload = Config::get('upload'); @@ -104,15 +101,14 @@ class Ajax extends Frontend 'sha1' => $sha1, ); model("attachment")->create(array_filter($params)); - $this->code = 1; - $this->data = [ + $this->success('', null, [ 'url' => $uploadDir . $splInfo->getSaveName() - ]; + ]); } else { // 上传失败获取错误信息 - $this->data = $file->getError(); + $this->error($file->getError()); } } diff --git a/application/index/controller/Autotask.php b/application/index/controller/Autotask.php deleted file mode 100644 index 03f75372..00000000 --- a/application/index/controller/Autotask.php +++ /dev/null @@ -1,135 +0,0 @@ -request->isCli()) - $this->error('Autotask script only work at client!'); - - parent::_initialize(); - - // 清除错误 - error_reporting(0); - - // 设置永不超时 - set_time_limit(0); - } - - /** - * 执行定时任务 - */ - public function crontab() - { - $time = time(); - $logDir = LOG_PATH . 'crontab/'; - if (!is_dir($logDir)) - { - mkdir($logDir); - } - //筛选未过期且未完成的任务 - $crontabList = Crontab::where('status', '=', 'normal')->order('weigh desc,id desc')->select(); - foreach ($crontabList as $crontab) - { - $update = []; - $execute = FALSE; - if ($time < $crontab['begintime']) - { - //任务未开始 - continue; - } - if ($crontab['maximums'] && $crontab['executes'] > $crontab['maximums']) - { - //任务已超过最大执行次数 - $update['status'] = 'completed'; - } - else if ($crontab['endtime'] > 0 && $time > $crontab['endtime']) - { - //任务已过期 - $update['status'] = 'expired'; - } - else - { - //重复执行 - //如果未到执行时间则继续循环 - if (!Date::cron($crontab['schedule'])) - continue; - $execute = TRUE; - } - - // 如果允许执行 - if ($execute) - { - $update['executetime'] = $time; - $update['executes'] = $crontab['executes'] + 1; - $update['status'] = ($crontab['maximums'] > 0 && $update['executes'] >= $crontab['maximums']) ? 'completed' : 'normal'; - } - - // 如果需要更新状态 - if (!$update) - continue; - // 更新状态 - $crontab->save($update); - - // 将执行放在后面是为了避免超时导致多次执行 - if (!$execute) - continue; - try - { - if ($crontab['type'] == 'url') - { - if (substr($crontab['content'], 0, 1) == "/") - { - // 本地项目URL - exec('nohup php ' . ROOT_PATH . 'public/index.php ' . $crontab['content'] . ' >> ' . $logDir . date("Y-m-d") . '.log 2>&1 &'); - } - else - { - // 远程异步调用URL - Http::sendAsyncRequest($crontab['content']); - } - } - else if ($crontab['type'] == 'sql') - { - //这里需要强制重连数据库,使用已有的连接会报2014错误 - $connect = Db::connect([], true); - $connect->execute("select 1"); - // 执行SQL - $connect->getPdo()->exec($crontab['content']); - } - else if ($crontab['type'] == 'shell') - { - // 执行Shell - exec($crontab['content'] . ' >> ' . $logDir . date("Y-m-d") . '.log 2>&1 &'); - } - } - catch (Exception $e) - { - Log::record($e->getMessage()); - } - } - return 'Execute completed!'; - } - -} diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php deleted file mode 100644 index 3dab595d..00000000 --- a/application/index/controller/Common.php +++ /dev/null @@ -1,18 +0,0 @@ -view->fetch(); - } - - /** - * 二维码生成 - */ - public function qrcode() - { - if ($this->request->get("issubmit")) - { - $text = $this->request->get('text'); - $size = $this->request->get('size'); - $padding = $this->request->get('padding'); - $errorcorrection = $this->request->get('errorcorrection'); - $foreground = $this->request->get('foreground', "#fff"); - $background = $this->request->get('background', "#000"); - $logo = $this->request->get('logo'); - $logosize = $this->request->get('logosize'); - $label = $this->request->get('label'); - $labelfontsize = $this->request->get('labelfontsize'); - $labelhalign = $this->request->get('labelhalign'); - $labelvalign = $this->request->get('labelvalign'); - - - // 前景色 - list($r, $g, $b) = sscanf($foreground, "#%02x%02x%02x"); - $foregroundcolor = ['r' => $r, 'g' => $g, 'b' => $b]; - - // 背景色 - list($r, $g, $b) = sscanf($background, "#%02x%02x%02x"); - $backgroundcolor = ['r' => $r, 'g' => $g, 'b' => $b]; - - $qrCode = new QrCode(); - $qrCode - ->setText($text) - ->setSize($size) - ->setPadding($padding) - ->setErrorCorrection($errorcorrection) - ->setForegroundColor($foregroundcolor) - ->setBackgroundColor($backgroundcolor) - ->setLogoSize($logosize) - ->setLabelFontPath(ROOT_PATH . 'public/assets/fonts/fzltxh.ttf') - ->setLabel($label) - ->setLabelFontSize($labelfontsize) - ->setLabelHalign($labelhalign) - ->setLabelValign($labelvalign) - ->setImageType(QrCode::IMAGE_TYPE_PNG); - if ($logo) - { - $qrCode->setLogo(ROOT_PATH . 'public/assets/img/qrcode.png'); - } - //也可以直接使用render方法输出结果 - //$qrCode->render(); - return new Response($qrCode->get(), 200, ['Content-Type' => $qrCode->getContentType()]); - } - else - { - return $this->view->fetch(); - } - } - - /** - * Bootstrap组件 - */ - public function bootstrap() - { - return $this->view->fetch(); - } - - /** - * 阿里大于短信发送 - */ - public function alisms() - { - $alisms = new \fast\service\Alisms(); - $ret = $alisms->mobile('your mobile') - ->template('your sms template') - ->sign('your sign') - ->param(['code' => '8647']) - ->send(); - dump($ret); - } - -} diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index aa611de7..598385fb 100755 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -7,7 +7,7 @@ use app\common\controller\Frontend; class Index extends Frontend { - protected $layout = 'bootstrap'; + protected $layout = ''; public function _initialize() { diff --git a/application/index/controller/Sms.php b/application/index/controller/Sms.php deleted file mode 100644 index 3dc4bbb1..00000000 --- a/application/index/controller/Sms.php +++ /dev/null @@ -1,168 +0,0 @@ - - * 可选参数:无 - */ - public function send() - { - $this->code = -1; - $mobile = $this->request->post("mobile"); - $type = $this->request->post("type"); - $type = $type ? $type : 'register'; - - $last = Smslib::get($mobile, $type); - if ($last && time() - $last['createtime'] < 60) - { - //发送频繁 - $this->msg = __('SMS sent frequently'); - return; - } - if ($type) - { - $userinfo = User::getByMobile($mobile); - if ($type == 'register' && $userinfo) - { - //注册账号 - $this->msg = __('The phone number already exists'); - return; - } - else if ($type == 'changepwd' && !$userinfo) - { - //修改密码 - $this->msg = __('The phone number not exists'); - return; - } - else if (in_array($type, ['changemobile', 'bindmobile']) && $userinfo) - { - //修改手机号 - $this->msg = __('The phone number already exists'); - return; - } - } - $ret = Smslib::send($mobile, '', $type); - if ($ret) - { - $this->code = 1; - $this->msg = "发送成功"; - } - else - { - $this->msg = __('Send failed, please try again later'); - } - return; - } - - /** - * 检测验证码 - * - * 必选参数:mobile,type,captchacode
                - * 可选参数:无 - */ - public function check() - { - $this->code = -1; - $mobile = $this->request->post("mobile"); - $type = $this->request->post("type"); - $type = $type ? $type : 'register'; - $captchacode = $this->request->post("captchacode"); - - if ($type) - { - $userinfo = User::getByMobile($mobile); - if ($type == 'register' && $userinfo) - { - //注册账号 - $this->msg = __('The phone number already exists'); - return; - } - else if ($type == 'changepwd' && !$userinfo) - { - //修改密码 - $this->msg = __('The phone number note exists'); - return; - } - else if (in_array($type, ['changemobile', 'bindmobile']) && $userinfo) - { - //修改手机号 - $this->msg = __('The phone number already exists'); - return; - } - } - $ret = Smslib::check($mobile, $captchacode, $type); - if ($ret) - { - $this->code = 1; - } - else - { - $this->msg = __('The captcha code not correct'); - } - return; - } - - public function sendemail() - { - $this->code = -1; - $email = $this->request->post("email"); - $type = $this->request->post("type"); - $type = $type ? $type : 'register'; - - $name = "email{$type}"; - $session = session($name); - - if (!$session) - { - if (time() - $session['time'] < 120) - { - $this->msg = "发送邮箱验证码过于频繁"; - return; - } - } - - if (Smslib::sendemail($email, '', $type)) - { - $this->code = 1; - $this->msg = "发送成功"; - } - else - { - $this->msg = "发送邮件失败！请稍后重试！"; - } - } - - public function checkemail() - { - $this->code = -1; - $email = $this->request->post("email"); - $type = $this->request->post("type"); - $type = $type ? $type : 'register'; - - $ret = Smslib::checkemail($email, $captchacode, $type); - if ($ret) - { - $this->code = 1; - } - else - { - $this->msg = __('The captcha code not correct'); - } - } - -} diff --git a/application/index/controller/Ucenter.php b/application/index/controller/Ucenter.php deleted file mode 100644 index 6ea13180..00000000 --- a/application/index/controller/Ucenter.php +++ /dev/null @@ -1,363 +0,0 @@ -response(); - return; - } - - public function index() - { - $this->redirect('/'); - return; - } - - /** - * 删除用户 - */ - protected function deleteuser() - { - $uids = $this->get['ids']; - $uids = is_array($uids) ? $uids : explode(',', $uids); - !API_DELETEUSER && exit(API_RETURN_FORBIDDEN); - User::destroy($uids); - UserThird::destroy($uids); - $result = TRUE; - return $result ? API_RETURN_SUCCEED : API_RETURN_FAILED; - } - - /** - * 获取标签 - */ - protected function gettag() - { - $name = $this->get['id']; - if (!API_GETTAG) - { - return API_RETURN_FORBIDDEN; - } - $datalist = []; - if ($name == 'get_recently_list') - { - for ($i = 0; $i < 9; $i++) - { - $datalist[] = array( - 'name' => 'name' . $i, - 'uid' => 1, - 'username' => 'username' . $i, - 'dateline' => '2021', - 'url' => 'http://www.yourwebsite.com/thread.php?id=', - 'image' => 'http://www.yourwebsite.com/threadimage.php?id=', - ); - } - } - return $this->_serialize([$name, $datalist], 1); - } - - /** - * 同步注册 - */ - protected function synregister() - { - $uid = $this->get['uid']; - $username = $this->get['username']; - $password = $this->get['password']; - $email = isset($this->get['email']) ? $this->get['email'] : ''; - $mobile = isset($this->get['mobile']) ? $this->get['mobile'] : ''; - if (!API_SYNLOGIN) - { - return API_RETURN_FORBIDDEN; - } - // 同步注册接口 - header('P3P: CP="CURa ADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSP COR"'); - $this->user->register($username, $password, $email, $mobile, [], 0, FALSE); - echo 'signup ok'; - } - - /** - * 同步登录 - */ - protected function synlogin() - { - $uid = $this->get['uid']; - $username = $this->get['username']; - if (!API_SYNLOGIN) - { - return API_RETURN_FORBIDDEN; - } - // 同步登录接口 - header('P3P: CP="CURa ADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSP COR"'); - $this->user->direct($uid, FALSE); - echo 'login ok'; - } - - /** - * 同步退出 - */ - protected function synlogout() - { - if (!API_SYNLOGOUT) - { - return API_RETURN_FORBIDDEN; - } - - //同步登出接口 - header('P3P: CP="CURa ADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSP COR"'); - $this->user->logout(); - echo 'logout ok'; - } - - /** - * 添加用户 - */ - protected function adduser() - { - $uid = $this->get['uid']; - $username = $this->get['username']; - $password = $this->get['password']; - $email = isset($this->get['email']) ? $this->get['email'] : ''; - $mobile = isset($this->get['mobile']) ? $this->get['mobile'] : ''; - if (!API_ADDUSER) - { - return API_RETURN_FORBIDDEN; - } - $time = time(); - $salt = Random::alnum(); - $password = $this->user->getEncryptPassword($password, $salt); - $ip = $this->request->ip(); - $userarr = [ - 'id' => $uid, - 'username' => $username, - 'password' => $password, - 'salt' => $salt, - 'email' => $email, - 'mobile' => $mobile, - 'jointime' => $time, - 'joinip' => $ip - ]; - User::save($userarr); - return API_RETURN_SUCCEED; - } - - /** - * 更新用户信息,包含用户名,密码,邮箱,手机号和其它扩展信息 - */ - protected function updateinfo() - { - if (!API_UPDATEINFO) - { - return API_RETURN_FORBIDDEN; - } - $uid = isset($this->get['uid']) ? $this->get['uid'] : 0; - $username = isset($this->get['username']) ? $this->get['username'] : ''; - $password = isset($this->get['password']) ? $this->get['password'] : ''; - $email = isset($this->get['email']) ? $this->get['email'] : ''; - $mobile = isset($this->get['mobile']) ? $this->get['mobile'] : ''; - print_r($this->get); - $userinfo = User::get($uid); - if (!$userinfo) - { - return API_RETURN_FAILED; - } - $values = []; - if ($username) - { - $values['username'] = $username; - } - if ($password) - { - $salt = Random::alnum(); - $password = $this->user->getEncryptPassword($password, $salt); - $values['password'] = $password; - $values['salt'] = $salt; - } - if ($email) - { - $values['email'] = $email; - } - if ($mobile) - { - $values['mobile'] = $mobile; - } - $userinfo->save($values); - return API_RETURN_SUCCEED; - } - - /** - * 更新禁言文字 - */ - protected function updatebadwords() - { - if (!API_UPDATEBADWORDS) - { - return API_RETURN_FORBIDDEN; - } - $cachefile = $this->appdir . './uc_client/data/cache/badwords.php'; - $fp = fopen($cachefile, 'w'); - $data = array(); - if (is_array($this->post)) - { - foreach ($this->post as $k => $v) - { - $data['findpattern'][$k] = $v['findpattern']; - $data['replace'][$k] = $v['replacement']; - } - } - $s = "appdir . './uc_client/data/cache/hosts.php'; - $fp = fopen($cachefile, 'w'); - $s = "post, TRUE) . ";\r\n"; - fwrite($fp, $s); - fclose($fp); - return API_RETURN_SUCCEED; - } - - /** - * 更新App信息 - */ - protected function updateapps() - { - if (!API_UPDATEAPPS) - { - return API_RETURN_FORBIDDEN; - } - $UC_API = $this->post['UC_API']; - - //note 写 app 缓存文件 - $cachefile = $this->appdir . './uc_client/data/cache/apps.php'; - $fp = fopen($cachefile, 'w'); - $s = "post, TRUE) . ";\r\n"; - fwrite($fp, $s); - fclose($fp); - - //note 写配置文件 - if (is_writeable($this->appdir . './config.inc.php')) - { - $configfile = trim(file_get_contents($this->appdir . './config.inc.php')); - $configfile = substr($configfile, -2) == '?>' ? substr($configfile, 0, -2) : $configfile; - $configfile = preg_replace("/define\('UC_API',\s*'.*?'\);/i", "define('UC_API', '$UC_API');", $configfile); - if ($fp = @fopen($this->appdir . './config.inc.php', 'w')) - { - @fwrite($fp, trim($configfile)); - @fclose($fp); - } - } - - return API_RETURN_SUCCEED; - } - - /** - * 更新客户端配置文件 - */ - protected function updateclient() - { - if (!API_UPDATECLIENT) - { - return API_RETURN_FORBIDDEN; - } - $cachefile = $this->appdir . './uc_client/data/cache/settings.php'; - $fp = fopen($cachefile, 'w'); - $s = "post, TRUE) . ";\r\n"; - fwrite($fp, $s); - fclose($fp); - return API_RETURN_SUCCEED; - } - - /** - * 更新积分 - */ - protected function updatecredit() - { - if (!API_UPDATECREDIT) - { - return API_RETURN_FORBIDDEN; - } - $credit = $this->get['credit']; - $amount = $this->get['amount']; - $uid = $this->get['uid']; - return API_RETURN_SUCCEED; - } - - /** - * 获取积分 - */ - protected function getcredit() - { - if (!API_GETCREDIT) - { - return API_RETURN_FORBIDDEN; - } - } - - /** - * 获取积分配置 - */ - protected function getcreditsettings() - { - if (!API_GETCREDITSETTINGS) - { - return API_RETURN_FORBIDDEN; - } - $credits = [ - '1' => array('威望', ''), - '2' => array('金钱', '枚'), - ]; - return $this->_serialize($credits); - } - - /** - * 更新积分配置 - */ - protected function updatecreditsettings() - { - if (!API_UPDATECREDITSETTINGS) - { - return API_RETURN_FORBIDDEN; - } - return API_RETURN_SUCCEED; - } - -} diff --git a/application/index/controller/Upyun.php b/application/index/controller/Upyun.php deleted file mode 100644 index d84eaba4..00000000 --- a/application/index/controller/Upyun.php +++ /dev/null @@ -1,58 +0,0 @@ -request->post("url"); - $code = $this->request->post("code"); - $message = $this->request->post("message"); - $sign = $this->request->post("sign"); - $time = $this->request->post("time"); - $extparam = $this->request->post("ext-param"); - if ($url && $code && $message && $time && $sign) - { - $arr = [$code, $message, $url, $time, Config::get('upload.formkey')]; - if ($extparam) - { - $arr[] = $extparam; - } - if ($sign == md5(implode('&', $arr))) - { - $params = array( - 'filesize' => $this->request->param("file_size"), - 'imagewidth' => $this->request->param("image-width"), - 'imageheight' => $this->request->param("image-height"), - 'imagetype' => $this->request->param("image-type"), - 'imageframes' => $this->request->param("image-frames"), - 'mimetype' => $this->request->param("mimetype"), - 'extparam' => $extparam, - 'url' => $url, - 'uploadtime' => $time, - 'storage' => 'upyun' - ); - model("attachment")->create(array_filter($params)); - echo "success"; - } - else - { - echo "failure"; - } - } - else - { - echo "failure"; - } - return; - } - -} diff --git a/application/index/controller/User.php b/application/index/controller/User.php deleted file mode 100644 index eb545e4b..00000000 --- a/application/index/controller/User.php +++ /dev/null @@ -1,222 +0,0 @@ -view->fetch(); - } - - /** - * 注册会员 - */ - public function register() - { - $url = $this->request->get('url', '/'); - if ($this->user->check()) - $this->error(__('You\'ve logged in, do not login again'), $url); - if ($this->request->isPost()) - { - $username = $this->request->post('username'); - $password = $this->request->post('password'); - $repassword = $password; - $email = $this->request->post('email'); - $captcha = $this->request->post('captcha'); - if (!captcha_check($captcha)) - { - $this->error(__('Captcha is incorrect')); - } - if ($this->user->register($username, $password, $email)) - { - $synchtml = ''; - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS) - { - $uc = new Client(); - $synchtml = $uc->uc_user_synregister($this->user->id, $password); - } - $referer = Cookie::get('referer_url'); - $this->success(__('Sign up successful') . $synchtml, $url); - } - else - { - $this->error($this->user->getError()); - } - } - return $this->view->fetch(); - } - - /** - * 会员登录 - */ - public function login() - { - $url = $this->request->get('url', '/'); - if ($this->user->check()) - $this->error(__('You\'ve logged in, do not login again'), $url); - if ($this->request->isPost()) - { - $account = $this->request->post('account'); - $password = $this->request->post('password'); -// $captcha = $this->request->post('captcha'); -// if (!captcha_check($captcha)) -// { -// $this->error(__('Captcha is incorrect')); -// } - if ($this->user->login($account, $password)) - { - $synchtml = ''; - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS) - { - $uc = new Client(); - $synchtml = $uc->uc_user_synlogin($this->user->id); - } - $this->success(__('Logged in successful') . $synchtml, $url); - } - else - { - $this->error($this->user->getError()); - } - } - return $this->view->fetch(); - } - - /** - * 注销登录 - */ - function logout() - { - //注销本站 - $this->user->logout(); - $synchtml = ''; - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS) - { - $uc = new Client(); - $synchtml = $uc->uc_user_synlogout(); - } - $this->success(__('Logout successful') . $synchtml, '/'); - } - - /** - * 第三方登录跳转和回调处理 - */ - public function third() - { - $action = $this->request->param('action'); - $platform = $this->request->param('platform'); - $config = Config::get('third'); - if (!isset($config[$platform])) - { - $this->error(__('Invalid parameters')); - return; - } - $thirdapp = new Application(); - if ($action == 'redirect') - { - // 跳转到登录授权页面 - $this->redirect($thirdapp->{$platform}->getAuthorizeUrl()); - } - else if ($action == 'callback') - { - // 授权成功后的回调 - $result = $thirdapp->{$platform}->getUserInfo(); - if ($result) - { - $loginret = $this->user->connect($platform, $result); - if ($loginret) - { - $synchtml = ''; - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS) - { - $uc = new Client(); - $synchtml = $uc->uc_user_synlogin($this->user->id); - } - $this->success(__('Logged in successful') . $synchtml, '/'); - return; - } - } - $this->error(__('Operation failed'), 'user/login'); - } - else - { - $this->error(__('Invalid parameters')); - } - - return; - } - - /** - * 修改密码 - */ - public function changepwd() - { - if ($this->request->isPost()) - { - $oldpassword = $this->request->post("oldpassword"); - $newpassword = $this->request->post("newpassword"); - //判断旧密码是否正确 - if ($this->user->password == $this->user->getEncryptPassword($oldpassword, $this->user->salt)) - { - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS) - { - $uc = new Client(); - $ret = $uc->uc_user_edit($this->user->id, $this->user->username, $newpassword, $this->user->email, $this->user->mobile); - // 如果小于0则说明发生错误 - if ($ret < 0) - { - $this->error(__('Change password failure')); - } - } - - $salt = Random::alnum(); - $newpassword = $this->user->getEncryptPassword($newpassword, $salt); - $this->user->save(['password' => $newpassword, 'salt' => $salt]); - $this->user->logout(); - $synchtml = ''; - ////////////////同步到Ucenter//////////////// - if (defined('UC_STATUS') && UC_STATUS) - { - $uc = new Client(); - $synchtml = $uc->uc_user_synlogout(); - } - $this->success(__('Change password successful') . $synchtml, "user/login"); - } - else - { - //旧密码不正确 - $this->error(__('Password is incorrect')); - } - } - return $this->view->fetch(); - } - -} diff --git a/application/index/controller/Wechat.php b/application/index/controller/Wechat.php deleted file mode 100644 index eca68468..00000000 --- a/application/index/controller/Wechat.php +++ /dev/null @@ -1,192 +0,0 @@ -app = new Application(Config::get('wechat')); - } - - /** - * 微信API对接接口 - */ - public function api() - { - $this->app->server->setMessageHandler(function ($message) { - - $WechatService = new WechatService; - $WechatContext = new WechatContext; - $WechatResponse = new WechatResponse; - - $openid = $message->FromUserName; - $to_openid = $message->ToUserName; - $event = $message->Event; - $eventkey = $message->EventKey ? $message->EventKey : $message->Event; - - $unknownmessage = WechatConfig::value('default.unknown.message'); - $unknownmessage = $unknownmessage ? $unknownmessage : "对找到对应指令!"; - - switch ($message->MsgType) - { - case 'event': //事件消息 - switch ($event) - { - case 'subscribe'://添加关注 - $subscribemessage = WechatConfig::value('default.subscribe.message'); - $subscribemessage = $subscribemessage ? $subscribemessage : "欢迎关注我们!"; - return $subscribemessage; - case 'unsubscribe'://取消关注 - return ''; - case 'LOCATION'://获取地理位置 - return ''; - case 'VIEW': //跳转链接,eventkey为链接 - return ''; - default: - break; - } - - $response = $WechatResponse->where(["eventkey" => $eventkey, 'status' => 'normal'])->find(); - if ($response) - { - $content = (array) json_decode($response['content'], TRUE); - $context = $WechatContext->where(['openid' => $openid])->find(); - $data = ['eventkey' => $eventkey, 'command' => '', 'refreshtime' => time(), 'openid' => $openid]; - if ($context) - { - $WechatContext->data($data)->where('id', $context['id'])->update(); - $data['id'] = $context['id']; - } - else - { - $id = $WechatContext->data($data)->save(); - $data['id'] = $id; - } - $result = $WechatService->response($this, $openid, $content, $data); - if ($result) - { - return $result; - } - } - return $unknownmessage; - case 'text': //文字消息 - case 'image': //图片消息 - case 'voice': //语音消息 - case 'video': //视频消息 - case 'location': //坐标消息 - case 'link': //链接消息 - default: //其它消息 - //上下文事件处理 - $context = $WechatContext->where(['openid' => ['=', $openid], 'refreshtime' => ['>=', time() - 1800]])->find(); - if ($context && $context['eventkey']) - { - $response = $WechatResponse->where(['eventkey' => $context['eventkey'], 'status' => 'normal'])->find(); - if ($response) - { - $WechatContext->data(array('refreshtime' => time()))->where('id', $context['id'])->update(); - $content = (array) json_decode($response['content'], TRUE); - $result = $WechatService->command($this, $openid, $content, $context); - if ($result) - { - return $result; - } - } - } - //自动回复处理 - if ($message->MsgType == 'text') - { - $wechat_autoreply = new WechatAutoreply(); - $autoreply = $wechat_autoreply->where(['text' => $message->Content, 'status' => 'normal'])->find(); - if ($autoreply) - { - $response = $WechatResponse->where(["eventkey" => $autoreply['eventkey'], 'status' => 'normal'])->find(); - if ($response) - { - $content = (array) json_decode($response['content'], TRUE); - $context = $WechatContext->where(['openid' => $openid])->find(); - $result = $WechatService->response($this, $openid, $content, $context); - if ($result) - { - return $result; - } - } - } - } - return $unknownmessage; - } - return ""; //SUCCESS - }); - $response = $this->app->server->serve(); - // 将响应输出 - $response->send(); - } - - /** - * 登录回调 - */ - public function callback() - { - - } - - /** - * 支付回调 - */ - public function notify() - { - Log::record(file_get_contents('php://input'), "notify"); - $response = $this->app->payment->handleNotify(function($notify, $successful) { - // 使用通知里的 "微信支付订单号" 或者 "商户订单号" 去自己的数据库找到订单 - $orderinfo = Order::findByTransactionId($notify->transaction_id); - if ($orderinfo) - { - //订单已处理 - return true; - } - $orderinfo = Order::get($notify->out_trade_no); - if (!$orderinfo) - { // 如果订单不存在 - return 'Order not exist.'; // 告诉微信，我已经处理完了，订单没找到，别再通知我了 - } - // 如果订单存在 - // 检查订单是否已经更新过支付状态,已经支付成功了就不再更新了 - if ($orderinfo['paytime']) - { - return true; - } - // 用户是否支付成功 - if ($successful) - { - // 请在这里编写处理成功的处理逻辑 - - return true; // 返回处理完成 - } - else - { // 用户支付失败 - return true; - } - }); - - $response->send(); - } - -} diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php index 840dfe4c..69ff6cf1 100644 --- a/application/index/lang/zh-cn.php +++ b/application/index/lang/zh-cn.php @@ -1,105 +1,90 @@ '保持会话', - 'Sign in' => '登入', - 'Username' => '用户名', - 'User id' => '会员ID', - 'Username' => '用户名', - 'Nickname' => '昵称', - 'Password' => '密码', - 'Sign up' => '注 册', - 'Sign in' => '登 录', - 'Sign out' => '注 销', - 'Keep login' => '保持会话', - 'Guest' => '游客', - 'Welcome' => '%s，你好！', - 'Add' => '添加', - 'Edit' => '编辑', - 'Delete' => '删除', - 'Move' => '移动', - 'Name' => '名称', - 'Status' => '状态', - 'Weigh' => '权重', - 'Operate' => '操作', - 'Warning' => '温馨提示', - 'Default' => '默认', - 'Article' => '文章', - 'Page' => '单页', - 'OK' => '确定', - 'Cancel' => '取消', - 'Loading' => '加载中', - 'More' => '更多', - 'Normal' => '正常', - 'Hidden' => '隐藏', - 'Submit' => '提交', - 'Reset' => '重置', - 'Execute' => '执行', - 'Close' => '关闭', - 'Search' => '搜索', - 'Refresh' => '刷新', - 'First' => '首页', - 'Previous' => '上一页', - 'Next' => '下一页', - 'Last' => '末页', - 'None' => '无', - 'Home' => '主页', - 'Online' => '在线', - 'Logout' => '注销', - 'Profile' => '个人资料', - 'Index' => '首页', - 'Hot' => '热门', - 'Recommend' => '推荐', - 'Dashboard' => '控制台', - 'Code' => '编号', - 'Message' => '内容', - 'Line' => '行号', - 'File' => '文件', - 'Menu' => '菜单', - 'Name' => '名称', - 'Weigh' => '权重', - 'Type' => '类型', - 'Title' => '标题', - 'Content' => '内容', - 'Status' => '状态', - 'Operate' => '操作', - 'Append' => '追加', - 'Memo' => '备注', - 'Parent' => '父级', - 'Params' => '参数', - 'Permission' => '权限', - 'Advance search' => '高级搜索', - 'Check all' => '选中全部', - 'Expand all' => '展开全部', - 'Begin time' => '开始时间', - 'End time' => '结束时间', - 'Create time' => '创建时间', - 'Flag' => '标志', - 'Redirect now' => '立即跳转', - 'Operation completed' => '操作成功!', - 'Operation failed' => '操作失败!', - 'Unknown data format' => '未知的数据格式!', - 'Network error' => '网络错误!', - 'Issues & Wiki' => '问题交流', - 'Advanced search' => '高级搜索', - 'Invalid parameters' => '未知参数', - 'No results were found' => '记录未找到', - 'Parameter %s can not be empty' => '参数%s不能为空', - 'Are you sure you want to delete the %s selected item?' => '确定删除选中的 %s 项?', - 'Are you sure you want to delete this item?' => '确定删除此项?', - 'Are you sure you want to delete or turncate?' => '确定删除或清空?', - 'You have no permission' => '你没有权限访问', - 'Please enter your username' => '请输入你的用户名', - 'Please enter your password' => '请输入你的密码', - 'Please login first' => '请登录后操作', - 'Sign up successful' => '注册成功', - 'Logged in successful' => '登录成功', - 'Logout successful' => '注销成功', - 'You\'ve logged in, do not login again' => '你已经登录，无需重复登录', - 'Username or password can not be empty' => '用户名密码不能为空', - 'Username is incorrect' => '用户名不正确', - 'Password is incorrect' => '密码不正确', - 'Verification code is incorrect' => '验证码不正确', - 'An unexpected error occurred' => '发生了一个意外错误,程序猿正在紧急处理中', - 'This page will be re-directed in %s seconds' => '页面将在 %s 秒后自动跳转', + 'Keep login' => '保持会话', + 'Sign in' => '登入', + 'Username' => '用户名', + 'User id' => '会员ID', + 'Username' => '用户名', + 'Nickname' => '昵称', + 'Password' => '密码', + 'Sign up' => '注 册', + 'Sign in' => '登 录', + 'Sign out' => '注 销', + 'Keep login' => '保持会话', + 'Guest' => '游客', + 'Welcome' => '%s，你好！', + 'Add' => '添加', + 'Edit' => '编辑', + 'Delete' => '删除', + 'Move' => '移动', + 'Name' => '名称', + 'Status' => '状态', + 'Weigh' => '权重', + 'Operate' => '操作', + 'Warning' => '温馨提示', + 'Default' => '默认', + 'Article' => '文章', + 'Page' => '单页', + 'OK' => '确定', + 'Cancel' => '取消', + 'Loading' => '加载中', + 'More' => '更多', + 'Normal' => '正常', + 'Hidden' => '隐藏', + 'Submit' => '提交', + 'Reset' => '重置', + 'Execute' => '执行', + 'Close' => '关闭', + 'Search' => '搜索', + 'Refresh' => '刷新', + 'First' => '首页', + 'Previous' => '上一页', + 'Next' => '下一页', + 'Last' => '末页', + 'None' => '无', + 'Home' => '主页', + 'Online' => '在线', + 'Logout' => '注销', + 'Profile' => '个人资料', + 'Index' => '首页', + 'Hot' => '热门', + 'Recommend' => '推荐', + 'Dashboard' => '控制台', + 'Code' => '编号', + 'Message' => '内容', + 'Line' => '行号', + 'File' => '文件', + 'Menu' => '菜单', + 'Name' => '名称', + 'Weigh' => '权重', + 'Type' => '类型', + 'Title' => '标题', + 'Content' => '内容', + 'Status' => '状态', + 'Operate' => '操作', + 'Append' => '追加', + 'Memo' => '备注', + 'Parent' => '父级', + 'Params' => '参数', + 'Permission' => '权限', + 'Advance search' => '高级搜索', + 'Check all' => '选中全部', + 'Expand all' => '展开全部', + 'Begin time' => '开始时间', + 'End time' => '结束时间', + 'Create time' => '创建时间', + 'Flag' => '标志', + 'Redirect now' => '立即跳转', + 'Operation completed' => '操作成功!', + 'Operation failed' => '操作失败!', + 'Unknown data format' => '未知的数据格式!', + 'Network error' => '网络错误!', + 'Advanced search' => '高级搜索', + 'Invalid parameters' => '未知参数', + 'No results were found' => '记录未找到', + 'Parameter %s can not be empty' => '参数%s不能为空', + 'You have no permission' => '你没有权限访问', + 'An unexpected error occurred' => '发生了一个意外错误,程序猿正在紧急处理中', + 'This page will be re-directed in %s seconds' => '页面将在 %s 秒后自动跳转', ]; diff --git a/application/index/lang/zh-cn/sms.php b/application/index/lang/zh-cn/sms.php deleted file mode 100644 index 1e1459f7..00000000 --- a/application/index/lang/zh-cn/sms.php +++ /dev/null @@ -1,9 +0,0 @@ - '短信发送频繁', - 'The phone number already exists' => '手机号已经存在', - 'The phone number note exists' => '手机号不存在', - 'The captcha code not correct' => '验证码不正确', - 'Send failed, please try again later' => '发送失败，请稍后重试', -]; diff --git a/application/index/view/demo/bootstrap.html b/application/index/view/demo/bootstrap.html deleted file mode 100644 index 51a645db..00000000 --- a/application/index/view/demo/bootstrap.html +++ /dev/null @@ -1,1646 +0,0 @@ -
                - - -
                -
                -
                -
                -

                Navbar

                -
                - -
                -
                -
                - - Brand -
                -
                - -
                - -
                - -
                -
                -
                - -
                -
                -
                - - Brand -
                -
                - -
                - -
                - -
                -
                -
                - -
                -
                -
                - - - -
                -
                -
                -
                -

                Buttons

                -
                -
                -
                - -
                -
                - -

                - - - - - - - -

                - -

                - - - - - - - -

                - - -
                -
                -
                - - - -
                - -
                - - - -
                - -
                - - - -
                - -
                - - - -
                - -
                - - - -
                -
                -
                - -

                - - - - -

                - -

                - - Delete - - Settings -

                -

                - - Font Awesome
                Version 4.4.0                 -

                -

                -

                - - - - -
                -

                -

                -

                - - -
                -

                -

                -

                - - -
                -

                -

                -

                - User - - - -
                -

                -

                -

                - - Dropdown - - -
                -

                -
                -
                - -

                - -

                - - -
                -
                - Left - Middle - Right -
                -
                - -
                -
                -
                - - - - -
                - -
                - - - -
                - -
                - -
                - - -
                -
                -
                -
                - -
                -
                - - - - -
                -
                - -
                -
                -
                - - -
                -
                -
                -
                -

                Typography

                -
                -
                -
                - - - -
                -
                -
                -

                Heading 1

                -

                Heading 2

                -

                Heading 3

                -

                Heading 4

                -
                Heading 5
                -
                Heading 6
                -

                Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.

                -
                -
                -
                -
                -

                Example body text

                -

                Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

                -

                This line of text is meant to be treated as fine print.

                -

                The following snippet of text is rendered as bold text.

                -

                The following snippet of text is rendered as italicized text.

                -

                The following snippet of text is rendered as code.

                -

                An abbreviation of the word attribute is attr.

                -
                - -
                -
                -
                -

                Emphasis classes

                -

                Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.

                -

                Nullam id dolor id nibh ultricies vehicula ut id elit.

                -

                Etiam porta sem malesuada magna mollis euismod.

                -

                Donec ullamcorper nulla non metus auctor fringilla.

                -

                Duis mollis, est non commodo luctus, nisi erat porttitor ligula.

                -

                Maecenas sed diam eget risus varius blandit sit amet non magna.

                -
                - -
                -
                - - - -
                -
                -

                Blockquotes

                -
                -
                -
                -
                -
                -
                -

                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

                - Someone famous in Source Title -
                -
                -
                -
                -
                -
                -

                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

                - Someone famous in Source Title -
                -
                -
                -
                -
                - - - -
                - -
                - - -
                - -
                -
                -
                -

                Tables

                -
                -

                Bordered table && Hover rows

                -
                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
                ID Name PhoneCompany ZipCity Date
                1Jennifer1-342-463-8341Et Rutrum Non Associates35728Fogo03/04/14
                2Clark1-516-859-1120Nam Ac Inc.7162Machelen03/23/13
                3Brendan1-724-406-2487Enim Commodo Limited98611Norman02/13/14
                4Warren1-412-485-9725Odio Etiam Institute10312Sautin01/01/13
                5Rajah1-849-642-8777Neque Ltd29131Glovertown02/16/13
                -
                -

                Striped rows

                -
                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
                #First NameLast NameUsername
                1MarkOtto@mdo
                2JacobThornton@fat
                3Larrythe Bird@twitter
                -
                -

                Contextual classes

                -
                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
                #Column headingColumn headingColumn heading
                1Column contentColumn contentColumn content
                2Column contentColumn contentColumn content
                3Column contentColumn contentColumn content
                4Column contentColumn contentColumn content
                5Column contentColumn contentColumn content
                6Column contentColumn contentColumn content
                7Column contentColumn contentColumn content
                -
                -
                -
                -
                - -
                -
                -

                Thumbnails

                -
                -
                -
                -
                -
                - - 100%x180 - -
                -
                - - 100%x180 - -
                -
                - - 100%x180 - -
                -
                - - 100%x180 - -
                -
                -
                -
                -
                -

                Custom content

                -
                -
                -
                -
                -
                -
                - 100%x200 -
                -

                Thumbnail label

                -

                Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

                -

                Button Button

                -
                -
                -
                -
                -
                - 100%x200 -
                -

                Thumbnail label

                -

                Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

                -

                Button Button

                -
                -
                -
                -
                -
                - 100%x200 -
                -

                Thumbnail label

                -

                Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

                -

                Button Button

                -
                -
                -
                -
                -
                - -
                -
                -

                Default media

                -
                -
                -
                -
                -
                - - 64x64 - -
                -
                -

                Media heading

                - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. -
                -
                -
                -
                - - 64x64 - -
                -
                -

                Media heading

                - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. -
                -
                - - 64x64 - -
                -
                -

                Nested media heading

                - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. -
                -
                -
                -
                -
                -
                -

                Media heading

                - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. -
                -
                - - 64x64 - -
                -
                -
                -
                - - 64x64 - -
                -
                -

                Media heading

                - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. -
                -
                - - 64x64 - -
                -
                -
                - - -
                -
                -
                -
                -

                Forms

                -
                -
                -
                - -
                -
                -
                -
                -
                - Legend -
                - -
                - -
                -
                -
                - -
                - -
                - -
                -
                -
                -
                - -
                - - A longer block of help text that breaks onto a new line and may extend beyond one line. -
                -
                -
                - -
                -
                - -
                -
                - -
                -
                -
                -
                - -
                - -
                - -
                -
                -
                -
                - - -
                -
                -
                -
                -
                -
                -
                - -
                -
                - - -
                - -
                - - -
                - -
                - - -
                - -
                - - -
                - -
                - - -
                - -
                - - -
                - -
                - - -
                - -
                - - -
                - -
                - -
                - $ - - - - -
                -
                -
                - -
                -
                -
                - - -
                - -
                -
                -
                -

                Navs

                -
                -
                -
                - -
                -
                - -
                - -
                -
                -

                Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

                -
                -
                -

                Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit.

                -
                - - -
                -
                -
                -
                - -
                - -
                -
                -
                - -
                -
                -
                - -
                -
                  -
                • Home
                  • -
                - -
                  -
                • Home
                  • -
                • Library
                  • -
                - - -
                - -
                -
                - - -
                -
                -

                Pagination

                -
                - - - - - -
                -
                -
                -

                Pager

                -
                - - - -
                -
                -
                - -
                -
                -
                - - - -
                - -
                - - -
                - -
                -
                -
                -

                Indicators

                -
                - -
                -
                -
                - -
                -
                -

                Alerts

                -
                -
                - -

                Warning!

                -

                Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

                -
                -
                -
                -
                -
                -
                -
                -
                - - Oh snap! Change a few things up and try submitting again. -
                -
                -
                -
                -
                -
                - - Well done! You successfully read this important alert message. -
                -
                -
                -
                -
                -
                - - Heads up! This alert needs your attention, but it's not super important. -
                -
                -
                -
                -
                -
                -

                Labels

                -
                - Default - Primary - Success - Warning - Danger - Info -
                -
                -
                -

                Badges

                -
                - -
                -
                -
                - - -
                - -
                -
                -
                -

                Progress bars

                -
                - -

                Basic

                -
                -
                -
                -
                -
                - -

                Contextual alternatives

                -
                -
                -
                -
                - -
                -
                -
                - -
                -
                -
                - -
                -
                -
                -
                - -

                Striped

                -
                -
                -
                -
                - -
                -
                -
                - -
                -
                -
                - -
                -
                -
                -
                - -

                Animated

                -
                -
                -
                -
                -
                - -

                Stacked

                -
                -
                -
                -
                -
                -
                -
                -
                -
                -
                - - -
                - -
                -
                -
                -

                Containers

                -
                -
                -
                -

                Jumbotron

                -

                This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

                -

                Learn more

                -
                -
                -
                -
                - - -
                -
                -

                List groups

                -
                -
                -
                -
                -
                -
                  -
                • - 14 - Cras justo odio -
                  • -
                • - 2 - Dapibus ac facilisis in -
                  • -
                • - 1 - Morbi leo risus -
                  • -
                -
                -
                -
                -
                -
                - - Cras justo odio - - Dapibus ac facilisis in - - Morbi leo risus - -
                -
                -
                -
                -
                -
                - -

                List group item heading

                -

                Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

                -                 - -

                List group item heading

                -

                Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

                -                 -
                -
                -
                -
                - - -
                -
                -

                Panels

                -
                -
                -
                -
                -
                -
                -
                - Basic panel -
                -
                - -
                -
                Panel heading
                -
                - Panel content -
                -
                - -
                -
                - Panel content -
                -
                Panel footer
                -
                -
                -
                -
                -
                -
                -
                -

                Panel primary

                -
                -
                - Panel content -
                -
                - -
                -
                -

                Panel success

                -
                -
                - Panel content -
                -
                - -
                -
                -

                Panel warning

                -
                -
                - Panel content -
                -
                -
                -
                -
                -
                -
                -
                -

                Panel danger

                -
                -
                - Panel content -
                -
                - -
                -
                -

                Panel info

                -
                -
                - Panel content -
                -
                -
                -
                -
                - -
                -
                -

                Wells

                -
                -
                -
                -
                -
                -
                - Look, I'm in a well! -
                -
                -
                -
                -
                -
                - Look, I'm in a small well! -
                -
                -
                -
                -
                -
                - Look, I'm in a large well! -
                -
                -
                -
                -
                - - -
                - -
                -
                -
                -

                Dialogs

                -
                -
                -
                -
                -
                -

                Modals

                -
                - Show modal dialog - -
                -

                Bootstrap3-Dialog Plugin

                -
                - Normal modal - Alert modal - Confirm modal - More sample -
                -
                -
                -

                Popovers

                -
                - - - - - - - -
                -

                Tooltips

                -
                - - - - - - - -
                -
                -
                -
                - -
                -

                Toastr

                -
                -
                -
                -
                - - -
                -
                - - -
                -
                - -
                -
                - -
                -
                - -
                -
                - -
                -
                - -
                - -
                -
                - -
                -
                - -
                -
                - -
                -
                -
                - -
                - -
                -
                - -
                -
                - -
                -
                - -
                -
                - -
                -
                - -
                -
                -
                - -
                -
                -
                - - -
                -
                - - -
                -
                - - -
                -
                - - -
                -
                -
                - -
                -
                - - -
                -
                - - -
                -
                - - -
                -
                - - -
                -
                -
                -
                - -
                -
                - - - -
                -
                - -
                -
                - 
                
-            
                
-        
                
-    
                
-
-
                
\ No newline at end of file
diff --git a/application/index/view/demo/index.html b/application/index/view/demo/index.html
deleted file mode 100644
index d6fd4405..00000000
--- a/application/index/view/demo/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
                
-    
                
-        
                
-            Demo
-        
                
-    
                
-
                
\ No newline at end of file
diff --git a/application/index/view/demo/qrcode.html b/application/index/view/demo/qrcode.html
deleted file mode 100644
index 3e85d000..00000000
--- a/application/index/view/demo/qrcode.html
+++ /dev/null
@@ -1,149 +0,0 @@
-
                
-    
                二维码生成
                
-    
                
-        
                
-            
-            
                
-                
                
-                    
                
-                        
-                        
-                    
                
-                    
                
-                        
-                        
-                    
                
-                    
                
-                        
-                        
                
-                            
                
-                                
-                            
                
-                            
                
-                                
-                            
                
-                        
                
-                    
                
-                    
                
-                        
-                        
-                    
                
-                
                
-
-                
                
-                    
                
-                        
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                    
                
-                    
                
-                        
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                        
                
-                            
-                        
                
-                    
                
-                
                
-
-                
                
-                    
                
-                        
                
-                            
-                            
-                        
                
-                        
                
-                            
-                            
-                        
                
-                        
                
-                            
-                            
-                        
                
-                        
                
-                            
-                            
-                        
                
-                    
                
-                
                
-
-                
                
-                    
                
-                        
-                        
-                    
                
-                    
                
-                        
-                        
-                    
                
-                    
                
-                        
                
-                            
-                            
                
-                                
-                            
                
-                            
                
-                                
-                            
                
-                            
                
-                                
-                            
                
-                            
                
-                                
-                            
                
-                        
                
-                    
                
-                
                
-            
                
-        
                
-    
                
-    
-
                
\ No newline at end of file
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 207946b3..ce236ac7 100644
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -1,55 +1,224 @@
-
                
-    
                
-        
                
+
+
 
-            FastAdmin后台演示
-        
                
-        
                
-            FastAdmin源码下载
-        
                
-    
                
-    
                组件
                
+    
 
-    
                
-        
                
-            
                
-                
-                
                
-                    
                第三方登录
                
-                    
                FastAdmin中自带第三方登录扩展组件,包括微博登录、QQ登录、微信登录,可极速进行第三方登录的融合,同时系统中已提供注册登录的代码
                
-                    
                预览 下载
                
+        
+        
+        
+        
+        
+
+        FastAdmin - 基于ThinkPHP5和Bootstrap的极速后台开发框架
+
+        
+        
+        
+
+        
+        
+        
+        
+
+        
+        
+        
+
+        
+        
+    
+
+    
+
+        
+
+        
                
+            
                
+                
                
+                    
                
+                        
                
+                            
                
+                                
                FastAdmin
                
+                                
                基于ThinkPHP5和Bootstrap的极速后台开发框架
                
+                                登录后台
+                            
                
+                        
                
+                    
                
                 
                
             
                
-        
                
-        
                
-            
                
-                
-                
                
-                    
                Ucenter整合登录
                
-                    
                FastAdmin中基于Ucenter融合一套账号同步登录注册退出的方案,同时提供修改版Ucenter和Discuz论坛代码下载,同时适应于PHP7,此版本改动较大,建议适用于新系统的开发
                
-                    
                预览 下载
                
+        
+
+        
                
+            
                
+                
                
+                    
                
+                        
                
+                            
                功能特性
                
+                        
                
+                    
                
+                
                
+                
                
+                    
                
+                        
                
+                            
                
+                                
                
+                                    
                
+                                        
+                                        
                权限管理
                
+                                        
                基于完善的Auth权限控制管理、无限父子级权限分组、可自由分配子级权限、一个管理员可同时属于多个组别
                
+                                    
                
+                                
                
+                                
                
+                                    
                
+                                        
+                                        
                响应式开发
                
+                                        
                基于Bootstrap和AdminLTE进行二次开发,手机、平板、PC均自动适配,无需要担心兼容性问题
                
+                                    
                
+                                
                
+                                
                
+                                    
                
+                                        
+                                        
                多语言
                
+                                        
                不仅仅后台开发支持多语言,同时视图部分和JS部分仍然共享同一个语言包,语法相同且自动加载
                
+                                    
                
+                                
                
+                                
                
+                                    
                
+                                        
+                                        
                模块化开发
                
+                                        
                控制器、模型、视图、JS一一对应,使用RequireJS进行JS模块化管理,采用Bower进行前端包组件管理
                
+                                    
                
+                                
                
+                                
                
+                                    
                
+                                        
+                                        
                CRUD
                
+                                        
                控制台进行一键生成控制器、模型、视图和JS文件,同时可一键生成后台权限节点和菜单栏
                
+                                    
                
+                                
                
+                                
                
+                                    
                
+                                        
+                                        
                自由可扩展
                
+                                        
                FastAdmin提供强大的扩展中心，可直接在线安装和卸载插件，同时支持命令行一键操作
                
+                                    
                
+                                
                
+                            
                
+                        
                
+                    
                
                 
                
             
                
-        
                
-        
                
-            
                
-                
-                
                
-                    
                二维码生成
                
-                    
                基于第三方组件增加了一个二维码的生成示例,可快速的调整文字、标签、Logo的大小、颜色、字体等等。此外还可对标签位置、容错率等进行相关设置。
                
-                    
                预览 下载
                
+        
+
+        
                
+            
                
+                
                
+                    
                不要犹豫
                开始行动
                
+                    为FastAdmin贡献代码!
                 
                
             
                
-        
                
-        
                
-            
                
-                
-                
                
-                    
                Bootstrap组件
                
-                    
                由于FastAdmin对Bootstrap进行了大量的二次开发,对Bootstrap的组件样式有许多更改,你可以直接在这里预览到Bootstrap的部分组件
                
-                    
                预览 下载
                
-                
                
+            
                
+        
+
+        
                
+            
                
+                
                © 2017 FastAdmin. All Rights Reserved.
                
+                
             
                
-        
                
-    
                
-
                
\ No newline at end of file
+        
+
+        
+        
+
+        
+        
+
+        
+        
+
+        
+
+        
+
+    
+
+
+
diff --git a/application/index/view/layout/bootstrap.html b/application/index/view/layout/bootstrap.html
deleted file mode 100644
index ee325811..00000000
--- a/application/index/view/layout/bootstrap.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-    
-        
-        FastAdmin
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-
-        
-    
-    
-        
                
-            
                
-                
                
-                    
-                    FastAdmin
-                
                
-                
-            
                
-        
                
-
-
-        {__CONTENT__}
-
-        
-
-        
-    
-
\ No newline at end of file
diff --git a/application/index/view/layout/user.html b/application/index/view/layout/user.html
deleted file mode 100644
index 309c2fe2..00000000
--- a/application/index/view/layout/user.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-    
-        会员中心
-        
-        
-        
-        
-        
-        
-
-        
-
-        
-        
-    
-    
-        
                
-            
                
-                
                
-                    
                
-                        {__CONTENT__}
-                    
                
-                
                
-            
                
-        
                
-    
-
\ No newline at end of file
diff --git a/application/index/view/user/changepwd.html b/application/index/view/user/changepwd.html
deleted file mode 100644
index 5c8a71a9..00000000
--- a/application/index/view/user/changepwd.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
                
-    
                
-        
                
-            
                
-                
                修改密码
                
-            
                
-            
                
-                
                
-                    
                
-                        
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
-                            返回
-                        
                
-                    
                
-                
                
-            
                
-        
                
-    
                
-
                
\ No newline at end of file
diff --git a/application/index/view/user/index.html b/application/index/view/user/index.html
deleted file mode 100644
index 1c866400..00000000
--- a/application/index/view/user/index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
                
-    
                
-        
                
-            
                
-                
                会员中心
                
-            
                
-            
                
-                
                
-                    {if $user->check()}
-                    
                
-                        
                
-                        
                
-                            
                
-                                {:__('Welcome', $user->nickname)}
                
-                                Lv:{$user->level}
-                            
                
-                        
                
-                    
                
-                    
-
-                     立即注销
-                    {else/}
-                     立即注册
-                     立即登录
-                    {/if}
-                
                
-            
                
-        
                
-    
                
-
                
\ No newline at end of file
diff --git a/application/index/view/user/login.html b/application/index/view/user/login.html
deleted file mode 100644
index 06f74d37..00000000
--- a/application/index/view/user/login.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
                
-    
                
-        
                
-            
                
-                
                登录
                
-            
                
-            
                
-                
                
-                    
                
-                        
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                Wrong username og password
                
-                            
                
-                                
-                            
                
-                            
-                            注册一个新账号
-                        
                
-                    
                
-                
                
-                
                
-                    
                会员权益
                
-                    
                  
-                        
                •  最新代码推送
                  • 
-                        
                •  发布评论
                  • 
-                        
                •  个性化头像
                  • 
-                        
                •  定制专属页面
                  • 
-                        
                •  发现更多
                  • 
-                    
                
-                     微博登录
-                     微信登录
-                     QQ登录
-                
                
-            
                
-        
                
-    
                
-
                
\ No newline at end of file
diff --git a/application/index/view/user/register.html b/application/index/view/user/register.html
deleted file mode 100644
index 01af6d5c..00000000
--- a/application/index/view/user/register.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
                
-    
                
-        
                
-            
                
-                
                注册
                
-            
                
-            
                
-                
                
-                    
                
-                        
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
-                                
-                            
                
-                            
                
-                                
-                                
                
-                                    
-                                    
-                                        
-                                    
-                                
                
-                                
-                            
                
-                            
-                            已经账号,立即登录
-                        
                
-                    
                
-                
                
-                
                
-                    
                会员权益
                
-                    
                  
-                        
                •  最新代码推送
                  • 
-                        
                •  发布评论
                  • 
-                        
                •  个性化头像
                  • 
-                        
                •  定制专属页面
                  • 
-                        
                •  发现更多
                  • 
-                    
                
-                     微博登录
-                     微信登录
-                     QQ登录
-                
                
-            
                
-        
                
-    
                
-
                
\ No newline at end of file
diff --git a/application/uc.php b/application/uc.php
deleted file mode 100644
index 17976ba4..00000000
--- a/application/uc.php
+++ /dev/null
@@ -1,24 +0,0 @@
-rules = Db::name($this->config['auth_rule'])->where($where)->field('id,pid,condition,icon,name,title,ismenu')->select();
-
+        
         //循环规则，判断结果。
         $rulelist = []; //
         if (in_array('*', $ids))
@@ -248,7 +248,6 @@ class Auth
             }
         }
         $_rulelist[$uid] = $rulelist;
-
         //登录验证则需要保存规则列表
         if (2 == $this->config['auth_type'])
         {
diff --git a/application/common/model/Version.php b/extend/fast/Version.php
similarity index 50%
rename from application/common/model/Version.php
rename to extend/fast/Version.php
index 31864bad..fb50a2d0 100644
--- a/application/common/model/Version.php
+++ b/extend/fast/Version.php
@@ -1,136 +1,93 @@
- 'normal'], [], TRUE);
-        foreach ($versionlist as $k => $v)
-        {
-            // 版本正常且新版本号不等于验证的版本号且找到匹配的旧版本
-            if ($v['status'] == 'normal' && $v['newversion'] !== $version && self::inversion($version, $v['oldversion']))
-            {
-                $updateversion = $v;
-                break;
-            }
-        }
-        if (isset($updateversion))
-        {
-            $search = ['{version}', '{newversion}', '{downloadurl}', '{url}', '{packagesize}'];
-            $replace = [$version, $updateversion['newversion'], $updateversion['downloadurl'], $updateversion['downloadurl'], $updateversion['packagesize']];
-            $upgradetext = str_replace($search, $replace, $updateversion['content']);
-            return [
-                "enforce"     => $updateversion['enforce'],
-                "version"     => $version,
-                "newversion"  => $updateversion['newversion'],
-                "downloadurl" => $updateversion['downloadurl'],
-                "packagesize" => $updateversion['packagesize'],
-                "upgradetext" => $upgradetext
-            ];
-        }
-        return NULL;
-    }
-
-    /**
-     * 检测版本是否的版本要求的数据中
-     *
-     * @param string $version
-     * @param array $data
-     */
-    public static function inversion($version, $data = [])
-    {
-        //版本号以.分隔
-        $data = is_array($data) ? $data : [$data];
-        if ($data)
-        {
-            if (in_array("*", $data) || in_array($version, $data))
-            {
-                return TRUE;
-            }
-            $ver = explode('.', $version);
-            if ($ver)
-            {
-                $versize = count($ver);
-                //验证允许的版本
-                foreach ($data as $m)
-                {
-                    $c = explode('.', $m);
-                    if (!$c || $versize != count($c))
-                        continue;
-                    $i = 0;
-                    foreach ($c as $a => $k)
-                    {
-                        if (!self::compare($ver[$a], $k))
-                        {
-                            continue 2;
-                        }
-                        else
-                        {
-                            $i++;
-                        }
-                    }
-                    if ($i == $versize)
-                        return TRUE;
-                }
-            }
-        }
-        return FALSE;
-    }
-
-    /**
-     * 比较两个版本号
-     *
-     * @param string $v1
-     * @param string $v2
-     * @return boolean
-     */
-    public static function compare($v1, $v2)
-    {
-        if ($v2 == "*" || $v1 == $v2)
-        {
-            return TRUE;
-        }
-        else
-        {
-            $values = [];
-            $k = explode(',', $v2);
-            foreach ($k as $v)
-            {
-                if (strpos($v, '-') !== FALSE)
-                {
-                    list($start, $stop) = explode('-', $v);
-                    for ($i = $start; $i <= $stop; $i++)
-                    {
-                        $values[] = $i;
-                    }
-                }
-                else
-                {
-                    $values[] = $v;
-                }
-            }
-            return in_array($v1, $values) ? TRUE : FALSE;
-        }
-    }
-
-}
+ $k)
+                    {
+                        if (!self::compare($ver[$a], $k))
+                        {
+                            continue 2;
+                        }
+                        else
+                        {
+                            $i++;
+                        }
+                    }
+                    if ($i == $versize)
+                        return TRUE;
+                }
+            }
+        }
+        return FALSE;
+    }
+
+    /**
+     * 比较两个版本号
+     *
+     * @param string $v1
+     * @param string $v2
+     * @return boolean
+     */
+    public static function compare($v1, $v2)
+    {
+        if ($v2 == "*" || $v1 == $v2)
+        {
+            return TRUE;
+        }
+        else
+        {
+            $values = [];
+            $k = explode(',', $v2);
+            foreach ($k as $v)
+            {
+                if (strpos($v, '-') !== FALSE)
+                {
+                    list($start, $stop) = explode('-', $v);
+                    for ($i = $start; $i <= $stop; $i++)
+                    {
+                        $values[] = $i;
+                    }
+                }
+                else
+                {
+                    $values[] = $v;
+                }
+            }
+            return in_array($v1, $values) ? TRUE : FALSE;
+        }
+    }
+
+}
diff --git a/extend/fast/payment/Alipay.php b/extend/fast/payment/Alipay.php
deleted file mode 100644
index 97d4e522..00000000
--- a/extend/fast/payment/Alipay.php
+++ /dev/null
@@ -1,447 +0,0 @@
- 1,
-        // 传输协议
-        'transport'        => 'http',
-        // 编码方式
-        'input_charset'    => 'utf-8',
-        // 签名方法
-        'sign_type'        => 'MD5',
-        // 证书路径
-        'cacert'           => './cacert.pem',
-        //验签公钥地址
-        'public_key_path'  => './alipay_public_key.pem',
-        'private_key_path' => '',
-        // 支付完成异步通知调用地址
-        // 'notify_url' => 'http://'.$_SERVER['HTTP_HOST'].'/order/callback_alipay/notify',
-        // 支付完成同步返回地址
-        // 'return_url' => 'http://'.$_SERVER['HTTP_HOST'].'/order/callback_alipay/return',
-        // 支付宝商家 ID
-        'partner'          => '2088xxxxxxxx',
-        // // 支付宝商家 KEY
-        'key'              => 'xxxxxxxxxxxx',
-        // // 支付宝商家注册邮箱
-        'seller_email'     => 'email@domain.com'
-    );
-    private $is_mobile = FALSE;
-    public $service = self::SERVICE;
-    public $gateway = self::GATEWAY;
-
-    /**
-     * 配置
-     * @param $options  array 配置信息
-     * @param null $type string 类型  wap app
-     */
-    public function __construct($options = [], $type = null)
-    {
-        if ($config = Config::get('payment.alipay'))
-        {
-            $this->config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-        $this->is_mobile = (($type == 'wap' || $type === true) ? true : false);
-        if ($this->is_mobile)
-        {
-            $this->gateway = self::GATEWAY_MOBILE;
-        }
-
-        if ($type == 'wap' || $type === true)
-        {
-            $this->service = self::SERVICE_WAP;
-        }
-        elseif ($type == 'app')
-        {
-            $this->service = self::SERVICE_APP;
-        }
-    }
-
-    /**
-     * 生成请求参数的签名
-     *
-     * @param $params 
-     * @return 
-     *
-     */
-    function signParameters($params)
-    {
-        // 支付宝的签名串必须是未经过 urlencode 的字符串
-        // 不清楚为何 PHP 5.5 里没有 http_build_str() 方法
-        $paramStr = urldecode(http_build_query($params));
-        switch (strtoupper(trim($this->config['sign_type'])))
-        {
-            case "MD5" :
-                $result = md5($paramStr . $this->config['key']);
-                break;
-            case "RSA" :
-            case "0001" :
-                $priKey = file_get_contents($this->config['private_key_path']);
-                $res = openssl_get_privatekey($priKey);
-                openssl_sign($paramStr, $sign, $res);
-                openssl_free_key($res);
-                //base64编码
-                $result = base64_encode($sign);
-                break;
-            default :
-                $result = "";
-        }
-        return $result;
-    }
-
-    /**
-     * 准备签名参数
-     *
-     * @param $params 
-     *        $params['out_trade_no']     唯一订单编号
-     *        $params['subject']
-     *        $params['total_fee']
-     *        $params['body']
-     *        $params['show_url']
-     *        $params['anti_phishing_key']
-     *        $params['exter_invoke_ip']
-     *        $params['it_b_pay']
-     *        $params['_input_charset']
-     * @return 
-     */
-    function prepareParameters($params)
-    {
-        $default = array(
-            'service'        => $this->service,
-            'partner'        => $this->config['partner'],
-            '_input_charset' => trim(strtolower($this->config['input_charset']))
-        );
-        if (!$this->is_mobile)
-        {
-            $default = array_merge($default, array(
-                'payment_type' => $this->config['payment_type'],
-                'seller_id'    => $this->config['partner'],
-                'notify_url'   => $this->config['notify_url'],
-            ));
-            if (isset($this->config['return_url']))
-            {
-                $default['return_url'] = $this->config['return_url'];
-            }
-        }
-
-        $params = $this->filterSignParameter(array_merge($default, (array) $params));
-        ksort($params);
-        reset($params);
-        return $params;
-    }
-
-    /**
-     * 生成签名后的请求参数
-     *
-     */
-    function buildSignedParameters($params)
-    {
-        $params = $this->prepareParameters($params);
-        $params['sign'] = $this->signParameters($params);
-        if ($params['service'] != self::SERVICE_WAP && $params['service'] != self::SERVICE_WAP_AUTH)
-        {
-            $params['sign_type'] = strtoupper(trim($this->config['sign_type']));
-        }
-        return $params;
-    }
-
-    /**
-     * https://doc.open.alipay.com/doc2/detail.htm?spm=a219a.7629140.0.0.NgdeQA&treeId=59&articleId=103663&docType=1
-     * 服务端生成app支付使用的参数以及签名
-     * @param $params 
-     * @return 
-     */
-    function buildSignedParametersForApp($params)
-    {
-        $params = $this->prepareParameters($params);
-        $params['sign'] = urlencode($this->signParameters($params));
-        $params['sign_type'] = 'RSA';
-        $paramStr = [];
-        foreach ($params as $k => &$param)
-        {
-            $param = '"' . $param . '"';
-            $paramStr[] = $k . '=' . $param;
-        }
-
-        return implode('&', $paramStr);
-    }
-
-    /**
-     * 生成请求参数的发送表单HTML
-     *
-     * 其实这个函数没有必要，更应该使用签名后的参数自己组装，只不过有时候方便就从官方 SDK 里留下了。
-     *
-     * @param $params  请求参数（未签名的）
-     * @param $method  请求方法，默认：post，可选 get
-     * @param $target  提交目标，默认：_self
-     * @return 
-     *
-     */
-    function buildRequestFormHTML($params, $method = 'post', $target = '_self')
-    {
-        $params = $this->buildSignedParameters($params);
-        $html = '
                config['input_charset'])) . '" method="' . $method . ' target="$target">';
-        foreach ($params as $key => $value)
-        {
-            $html .= "";
-        }
-        $html .= "
                ";
-        return $html;
-    }
-
-    /**
-     * 准备移动网页支付的请求参数
-     *
-     * 移动网页支付接口不同，需要先服务器提交一次请求，拿到返回 token 再返回客户端发起真实支付请求。
-     * 该方法只完成第一次服务端请求，生成参数后需要客户端另行处理（可调用`buildRequestFormHTML`生成表单提交）。
-     *
-     * @param $params 
-     *        $params['out_trade_no'] 订单唯一编号
-     *        $params['subject']      商品标题
-     *        $params['total_fee']    支付总费用
-     *        $params['merchant_url'] 商品链接地址
-     *        $params['req_id']       请求唯一 ID
-     *        $params['it_b_pay']     超期时间（秒）
-     * @return /
-     */
-    function prepareMobileTradeData($params)
-    {
-        // 不要用 SimpleXML 来构建 xml 结构，因为有第一行文档申明支付宝验证不通过
-        $xml_str = '' .
-                '' . $this->config['notify_url'] . '' .
-                '' . $this->config['return_url'] . '' .
-                '' . $this->config['seller_email'] . '' .
-                '' . $params['out_trade_no'] . '' .
-                '' . htmlspecialchars($params['subject'], ENT_XML1, 'UTF-8') . '' .
-                '' . $params['total_fee'] . '' .
-                '' . $params['merchant_url'] . '' .
-                (isset($params['it_b_pay']) ? '' . $params['it_b_pay'] . '' : '') .
-                '';
-        $request_data = $this->buildSignedParameters(array(
-            'service'  => $this->service,
-            'partner'  => $this->config['partner'],
-            'sec_id'   => $this->config['sign_type'],
-            'format'   => 'xml',
-            'v'        => '2.0',
-            'req_id'   => $params['req_id'],
-            'req_data' => $xml_str
-        ));
-        $url = $this->gateway;
-        $input_charset = trim(strtolower($this->config['input_charset']));
-        if (trim($input_charset) != '')
-        {
-            $url = $url . "_input_charset=" . $input_charset;
-        }
-        $curl = curl_init($url);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true); //SSL证书认证
-        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2); //严格认证
-        curl_setopt($curl, CURLOPT_CAINFO, $this->config['cacert']); //证书地址
-        curl_setopt($curl, CURLOPT_HEADER, 0); // 过滤HTTP头
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 显示输出结果
-        curl_setopt($curl, CURLOPT_POST, true); // post传输数据
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $request_data); // post传输数据
-        $responseText = curl_exec($curl);
-        //var_dump( curl_error($curl) );//如果执行curl过程中出现异常，可打开此开关，以便查看异常内容
-        curl_close($curl);
-        if (empty($responseText))
-        {
-            return NULL;
-        }
-        parse_str($responseText, $responseData);
-        if (empty($responseData['res_data']))
-        {
-            return NULL;
-        }
-        if ($this->config['sign_type'] == '0001')
-        {
-            $responseData['res_data'] = $this->rsaDecrypt($responseData['res_data'], $this->config['private_key_path']);
-        }
-        //token从res_data中解析出来（也就是说res_data中已经包含token的内容）
-        $doc = new DOMDocument();
-        $doc->loadXML($responseData['res_data']);
-        $responseData['request_token'] = $doc->getElementsByTagName("request_token")->item(0)->nodeValue;
-        $xml_str = '' .
-                '' . $responseData['request_token'] . '' .
-                '';
-        return array(
-            'service'  => self::SERVICE_WAP_AUTH,
-            'partner'  => $this->config['partner'],
-            'sec_id'   => $this->config['sign_type'],
-            'format'   => 'xml',
-            'v'        => '2.0',
-            'req_data' => $xml_str
-        );
-    }
-
-    /**
-     * 支付完成验证返回参数（包含同步和异步）
-     *
-     * @return 
-     */
-    function verifyCallback()
-    {
-        $async = empty($_GET);
-        $data = $async ? $_POST : $_GET;
-        if (empty($data))
-        {
-            return FALSE;
-        }
-        $signValid = $this->verifyParameters($data, $data["sign"]);
-        $notify_id = isset($data['notify_id']) ? $data['notify_id'] : NULL;
-        if ($async && $this->is_mobile)
-        {
-            //对notify_data解密
-            if ($this->config['sign_type'] == '0001')
-            {
-                $data['notify_data'] = $this->rsaDecrypt($data['notify_data'], $this->config['private_key_path']);
-            }
-            //notify_id从decrypt_post_para中解析出来（也就是说decrypt_post_para中已经包含notify_id的内容）
-            $doc = new DOMDocument();
-            $doc->loadXML($data['notify_data']);
-            $notify_id = $doc->getElementsByTagName('notify_id')->item(0)->nodeValue;
-        }
-        //获取支付宝远程服务器ATN结果（验证是否是支付宝发来的消息）
-        $responseTxt = 'true';
-        if (!empty($notify_id))
-        {
-            $responseTxt = $this->verifyFromServer($notify_id);
-        }
-        //验证
-        //$signValid的结果不是true，与安全校验码、请求时的参数格式（如：带自定义参数等）、编码格式有关
-        //$responsetTxt的结果不是true，与服务器设置问题、合作身份者ID、notify_id一分钟失效有关
-        return $signValid && preg_match("/true$/i", $responseTxt);
-    }
-
-    function verifyParameters($params, $sign)
-    {
-        $params = $this->filterSignParameter($params);
-        if (isset($params['notify_data']))
-        {
-            $params = array(
-                'service'     => $params['service'],
-                'v'           => $params['v'],
-                'sec_id'      => $params['sec_id'],
-                'notify_data' => $params['notify_data']
-            );
-        }
-        else
-        {
-            ksort($params);
-            reset($params);
-        }
-        $content = urldecode(http_build_query($params));
-        switch (strtoupper(trim($this->config['sign_type'])))
-        {
-            case "MD5" :
-                return md5($content . $this->config['key']) == $sign;
-            case "RSA" :
-            case "0001" :
-                return $this->rsaVerify($content, $this->config['public_key_path'], $sign);
-            default :
-                return FALSE;
-        }
-    }
-
-    /**
-     * 过滤参数,去除sign/sign_type参数
-     * @param $params
-     * @return 
-     */
-    function filterSignParameter($params)
-    {
-        $result = array();
-        foreach ($params as $key => $value)
-        {
-            if ($key != 'sign' && $key != 'sign_type' && $value)
-            {
-                $result[$key] = $value;
-            }
-        }
-        return $result;
-    }
-
-    function verifyFromServer($notify_id)
-    {
-        $transport = strtolower(trim($this->config['transport']));
-        $partner = trim($this->config['partner']);
-        $veryfy_url = ($transport == 'https' ? self::VERIFY_URL_HTTPS : self::VERIFY_URL) . "partner=$partner¬ify_id=$notify_id";
-        $curl = curl_init($veryfy_url);
-        curl_setopt($curl, CURLOPT_HEADER, 0); // 过滤HTTP头
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true); //SSL证书认证
-        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2); //严格认证
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 显示输出结果
-        curl_setopt($curl, CURLOPT_CAINFO, $this->config['cacert']); //证书地址
-        $responseText = curl_exec($curl);
-        // var_dump( curl_error($curl) );//如果执行curl过程中出现异常，可打开此开关，以便查看异常内容
-        curl_close($curl);
-        return $responseText;
-    }
-
-    /**
-     * RSA验签,注意验签的公钥是支付宝的公钥,不是自己生成的rsa公钥,可以在淘宝的demo中获得
-     * @param $data string 待签名数据
-     * @param $ali_public_key_path string 支付宝的公钥文件路径
-     * @param $sign string 要校对的的签名结果
-     * @return  验证结果
-     * @throws Exception
-     */
-    function rsaVerify($data, $ali_public_key_path, $sign)
-    {
-        $pubKey = file_get_contents($ali_public_key_path);
-        $res = openssl_get_publickey($pubKey);
-        if (!$res)
-        {
-            throw new Exception('公钥格式错误');
-        }
-        $result = (bool) openssl_verify($data, base64_decode($sign), $res);
-        openssl_free_key($res);
-        return $result;
-    }
-
-    /**
-     * RSA解密
-     * @param $content string 需要解密的内容，密文
-     * @param $private_key_path string 商户私钥文件路径
-     * @return string 解密后内容，明文
-     */
-    function rsaDecrypt($content, $private_key_path)
-    {
-        $priKey = file_get_contents($private_key_path);
-        $res = openssl_get_privatekey($priKey);
-        //用base64将内容还原成二进制
-        $content = base64_decode($content);
-        //把需要解密的内容，按128位拆开解密
-        $result = '';
-        for ($i = 0; $i < strlen($content) / 128; $i++)
-        {
-            $data = substr($content, $i * 128, 128);
-            openssl_private_decrypt($data, $decrypt, $res);
-            $result .= $decrypt;
-        }
-        openssl_free_key($res);
-        return $result;
-    }
-
-}
diff --git a/extend/fast/payment/Wechat.php b/extend/fast/payment/Wechat.php
deleted file mode 100644
index d414099b..00000000
--- a/extend/fast/payment/Wechat.php
+++ /dev/null
@@ -1,440 +0,0 @@
-_config = array_merge($this->_config, $config);
-        }
-        $this->_config = array_merge($this->_config, is_array($options) ? $options : []);
-    }
-
-    /**
-     * JSAPI获取prepay_id
-     *
-     * @param string $body
-     * @param string $out_trade_no
-     * @param int $total_fee
-     * @param string $openid
-     * @param array $ext
-     * @return string
-     */
-    public function getPrepayId($body, $out_trade_no, $total_fee, $openid, $ext = null)
-    {
-        $data = $ext? : [];
-        $data["nonce_str"] = $this->getNonceStr();
-        $data["body"] = $body;
-        $data["out_trade_no"] = $out_trade_no;
-        $data["total_fee"] = $total_fee;
-        $data["spbill_create_ip"] = $_SERVER["REMOTE_ADDR"];
-        $data["trade_type"] = self::TRADETYPE_JSAPI;
-        $data["openid"] = $openid;
-        $result = $this->unifiedOrder($data);
-        if ($result["return_code"] == "SUCCESS" && $result["result_code"] == "SUCCESS")
-        {
-            return $result["prepay_id"];
-        }
-        else
-        {
-            $this->error = $result["return_code"] == "SUCCESS" ? $result["err_code_des"] : $result["return_msg"];
-            $this->errorXML = $this->array2xml($result);
-            return null;
-        }
-    }
-
-    private function getNonceStr()
-    {
-        return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
-    }
-
-    /**
-     * 统一下单接口
-     */
-    public function unifiedOrder($params)
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["device_info"] = (isset($params['device_info']) && trim($params['device_info']) != '') ? $params['device_info'] : null;
-        $data["nonce_str"] = $this->getNonceStr();
-        $data["body"] = $params['body'];
-        $data["detail"] = isset($params['detail']) ? $params['detail'] : null; //optional
-        $data["attach"] = isset($params['attach']) ? $params['attach'] : null; //optional
-        $data["out_trade_no"] = isset($params['out_trade_no']) ? $params['out_trade_no'] : null;
-        $data["fee_type"] = isset($params['fee_type']) ? $params['fee_type'] : 'CNY';
-        $data["total_fee"] = $params['total_fee'];
-        $data["spbill_create_ip"] = $params['spbill_create_ip'];
-        $data["time_start"] = isset($params['time_start']) ? $params['time_start'] : null; //optional
-        $data["time_expire"] = isset($params['time_expire']) ? $params['time_expire'] : null; //optional
-        $data["goods_tag"] = isset($params['goods_tag']) ? $params['goods_tag'] : null;
-        $data["notify_url"] = isset($params['notify_url']) ? $params['notify_url'] : $this->_config['notify_url'];
-        $data["trade_type"] = $params['trade_type'];
-        $data["product_id"] = isset($params['product_id']) ? $params['product_id'] : null; //required when trade_type = NATIVE
-        $data["openid"] = isset($params['openid']) ? $params['openid'] : null; //required when trade_type = JSAPI
-        $result = $this->post(self::URL_UNIFIEDORDER, $data);
-        return $result;
-    }
-
-    private function post($url, $data, $cert = false)
-    {
-        if (!isset($data['sign']))
-            $data["sign"] = $this->sign($data);
-        $xml = $this->array2xml($data);
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_URL, $url);
-        if ($cert == true)
-        {
-            //使用证书：cert 与 key 分别属于两个.pem文件
-            curl_setopt($ch, CURLOPT_SSLCERTTYPE, 'PEM');
-            curl_setopt($ch, CURLOPT_SSLCERT, $this->_config['sslcertPath']);
-            curl_setopt($ch, CURLOPT_SSLKEYTYPE, 'PEM');
-            curl_setopt($ch, CURLOPT_SSLKEY, $this->_config['sslkeyPath']);
-        }
-        $content = curl_exec($ch);
-        $array = $this->xml2array($content);
-        return $array;
-    }
-
-    /**
-     * 扫码支付(模式二)获取支付二维码
-     *
-     * @param string $body
-     * @param string $out_trade_no
-     * @param int $total_fee
-     * @param string $product_id
-     * @param array $ext
-     * @return string
-     */
-    public function getCodeUrl($body, $out_trade_no, $total_fee, $product_id, $ext = null)
-    {
-        $data = $ext ? $ext : [];
-        $data["nonce_str"] = $this->getNonceStr();
-        $data["body"] = $body;
-        $data["out_trade_no"] = $out_trade_no;
-        $data["total_fee"] = $total_fee;
-        $data["spbill_create_ip"] = $_SERVER["SERVER_ADDR"];
-        $data["trade_type"] = self::TRADETYPE_NATIVE;
-        $data["product_id"] = $product_id;
-        $result = $this->unifiedOrder($data);
-        if ($result["return_code"] == "SUCCESS" && $result["result_code"] == "SUCCESS")
-        {
-            return $result["code_url"];
-        }
-        else
-        {
-            $this->error = $result["return_code"] == "SUCCESS" ? $result["err_code_des"] : $result["return_msg"];
-            return null;
-        }
-    }
-
-    /**
-     * 查询订单
-     * @param $transaction_id
-     * @param $out_trade_no
-     * @return array
-     */
-    public function orderQuery($transaction_id, $out_trade_no)
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["transaction_id"] = $transaction_id;
-        $data["out_trade_no"] = $out_trade_no;
-        $data["nonce_str"] = $this->getNonceStr();
-        $result = $this->post(self::URL_ORDERQUERY, $data);
-        return $result;
-    }
-
-    /**
-     * 关闭订单
-     * @param $out_trade_no
-     * @return array
-     */
-    public function closeOrder($out_trade_no)
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["out_trade_no"] = $out_trade_no;
-        $data["nonce_str"] = $this->getNonceStr();
-        $result = $this->post(self::URL_CLOSEORDER, $data);
-        return $result;
-    }
-
-    /**
-     * 申请退款 - 使用商户订单号
-     * @param $out_trade_no 商户订单号
-     * @param $out_refund_no 退款单号
-     * @param $total_fee 总金额（单位：分）
-     * @param $refund_fee 退款金额（单位：分）
-     * @param $op_user_id 操作员账号
-     * @return array
-     */
-    public function refund($out_trade_no, $out_refund_no, $total_fee, $refund_fee, $op_user_id)
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["nonce_str"] = $this->getNonceStr();
-        $data["out_trade_no"] = $out_trade_no;
-        $data["out_refund_no"] = $out_refund_no;
-        $data["total_fee"] = $total_fee;
-        $data["refund_fee"] = $refund_fee;
-        $data["op_user_id"] = $op_user_id;
-        $result = $this->post(self::URL_REFUND, $data, true);
-        return $result;
-    }
-
-    /**
-     * 申请退款 - 使用微信订单号
-     * @param $transaction_id 微信订单号
-     * @param $out_refund_no 退款单号
-     * @param $total_fee 总金额（单位：分）
-     * @param $refund_fee 退款金额（单位：分）
-     * @param $op_user_id 操作员账号
-     * @return array
-     */
-    public function refundByTransId($transaction_id, $out_refund_no, $total_fee, $refund_fee, $op_user_id)
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["nonce_str"] = $this->getNonceStr();
-        $data["transaction_id"] = $transaction_id;
-        $data["out_refund_no"] = $out_refund_no;
-        $data["total_fee"] = $total_fee;
-        $data["refund_fee"] = $refund_fee;
-        $data["op_user_id"] = $op_user_id;
-        $result = $this->post(self::URL_REFUND, $data, true);
-        return $result;
-    }
-
-    /**
-     * 下载对账单
-     * @param $bill_date 下载对账单的日期，格式：20140603
-     * @param string $bill_type 类型
-     * @return array
-     */
-    public function downloadBill($bill_date, $bill_type = 'ALL')
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["bill_date"] = $bill_date;
-        $data["bill_type"] = $bill_type;
-        $data["nonce_str"] = $this->getNonceStr();
-        $result = $this->post(self::URL_DOWNLOADBILL, $data);
-        return $result;
-    }
-
-    /**
-     * 扫码原生支付模式一中的二维码链接转成短链接
-     * @param $long_url 需要转换的URL，签名用原串，传输需URLencode
-     * @return array
-     */
-    public function shortUrl($long_url)
-    {
-        $data = array();
-        $data["appid"] = $this->_config["appid"];
-        $data["mch_id"] = $this->_config["mch_id"];
-        $data["long_url"] = $long_url;
-        $data["nonce_str"] = $this->getNonceStr();
-        $data["sign"] = $this->sign($data);
-        $data["long_url"] = urlencode($long_url);
-        $result = $this->post(self::URL_SHORTURL, $data);
-        return $result;
-    }
-
-    /**
-     * 获取jsapi支付所需参数
-     *
-     * @param string $prepay_id
-     * @return array
-     */
-    public function getPackageData($prepay_id)
-    {
-        $data = array();
-        $data["appId"] = $this->_config["appid"];
-        //解决微信支付调用JSAPI缺少参数：timeStamp
-        $data["timeStamp"] = time();
-        $data["nonceStr"] = $this->getNonceStr();
-        $data["package"] = "prepay_id=$prepay_id";
-        $data["signType"] = "MD5";
-        $data["paySign"] = $this->sign($data);
-        return $data;
-    }
-
-    /**
-     * 获取发送到通知地址的数据(在通知地址内使用)
-     * @return string 结果数组，如果不是微信服务器发送的数据返回null
-     *          appid
-     *          bank_type
-     *          cash_fee
-     *          fee_type
-     *          is_subscribe
-     *          mch_id
-     *          nonce_str
-     *          openid
-     *          out_trade_no    商户订单号
-     *          result_code
-     *          return_code
-     *          sign
-     *          time_end
-     *          total_fee       总金额
-     *          trade_type
-     *          transaction_id  微信支付订单号
-     */
-    public function getNotifyData()
-    {
-        $xml = file_get_contents("php://input");
-        $data = $this->xml2array($xml);
-        if ($this->validate($data))
-        {
-            return $data;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    /**
-     * 验证数据签名
-     * @param $data 数据数组
-     * @return 数据校验结果
-     */
-    public function validate($data)
-    {
-        if (!isset($data["sign"]))
-        {
-            return false;
-        }
-        $sign = $data["sign"];
-        unset($data["sign"]);
-        return $this->sign($data) == $sign;
-    }
-
-    /**
-     * 响应微信支付后台通知
-     * @param string $return_code 返回状态码 SUCCESS/FAIL
-     * @param $return_msg  返回信息
-     */
-    public function response_back($return_code = "SUCCESS", $return_msg = null)
-    {
-        $data = array();
-        $data["return_code"] = $return_code;
-        if ($return_msg)
-        {
-            $data["return_msg"] = $return_msg;
-        }
-        $xml = $this->array2xml($data);
-        print $xml;
-    }
-
-    /**
-     * 数据签名
-     * @param $data
-     * @return string
-     */
-    private function sign($data)
-    {
-        ksort($data);
-        $string1 = "";
-        foreach ($data as $k => $v)
-        {
-            if ($v && trim($v) != '')
-            {
-                $string1 .= "$k=$v&";
-            }
-        }
-        $stringSignTemp = $string1 . "key=" . $this->_config["apikey"];
-        $sign = strtoupper(md5($stringSignTemp));
-        return $sign;
-    }
-
-    private function array2xml($array)
-    {
-        $xml = "" . PHP_EOL;
-        foreach ($array as $k => $v)
-        {
-            if ($v && trim($v) != '')
-                $xml .= "<$k>" . PHP_EOL;
-        }
-        $xml .= "";
-        return $xml;
-    }
-
-    private function xml2array($xml)
-    {
-        $array = array();
-        $tmp = null;
-        try
-        {
-            $tmp = (array) simplexml_load_string($xml);
-        }
-        catch (Exception $e)
-        {
-
-        }
-        if ($tmp && is_array($tmp))
-        {
-            foreach ($tmp as $k => $v)
-            {
-                $array[$k] = (string) $v;
-            }
-        }
-        return $array;
-    }
-
-}
diff --git a/extend/fast/service/Alisms.php b/extend/fast/service/Alisms.php
deleted file mode 100644
index 92d87cf4..00000000
--- a/extend/fast/service/Alisms.php
+++ /dev/null
@@ -1,167 +0,0 @@
-config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-    }
-
-    /**
-     * 单例
-     * @param array $options 参数
-     * @return Alisms
-     */
-    public static function instance($options = [])
-    {
-        if (is_null(self::$instance))
-        {
-            self::$instance = new static($options);
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * 设置签名
-     * @param string $sign
-     * @return Alisms
-     */
-    public function sign($sign = '')
-    {
-        $this->_params['sms_free_sign_name'] = $sign;
-        return $this;
-    }
-
-    /**
-     * 设置参数
-     * @param array $param
-     * @return Alisms
-     */
-    public function param(array $param = [])
-    {
-        foreach ($param as $k => &$v)
-        {
-            $v = (string) $v;
-        }
-        unset($v);
-        $this->_params['sms_param'] = json_encode($param);
-        return $this;
-    }
-
-    /**
-     * 设置模板
-     * @param string $code 短信模板
-     * @return Alisms
-     */
-    public function template($code = '')
-    {
-        $this->_params['sms_template_code'] = $code;
-        return $this;
-    }
-
-    /**
-     * 接收手机
-     * @param string $mobile 手机号码
-     * @return Alisms
-     */
-    public function mobile($mobile = '')
-    {
-        $this->_params['rec_num'] = $mobile;
-        return $this;
-    }
-
-    /**
-     * 立即发送
-     * @return boolean
-     */
-    public function send()
-    {
-        $this->error = [];
-        $params = $this->_params();
-        $params['sign'] = $this->_signed($params);
-        $reponse = $this->_curl($params);
-        if ($reponse !== FALSE)
-        {
-            $res = json_decode($reponse, TRUE);
-            $res = array_pop($res);
-            if (isset($res['result']))
-                return TRUE;
-            $this->error = $res;
-        }
-        else
-        {
-            $this->error = array('code' => 0, 'msg' => 'HTTP_RESPONSE_NOT_WELL_FORMED');
-        }
-        return FALSE;
-    }
-
-    /**
-     * 获取错误信息
-     * @return array
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    private function _params()
-    {
-        return array_merge([
-            'app_key'     => $this->config['key'],
-            'format'      => 'json',
-            'method'      => 'alibaba.aliqin.fc.sms.num.send',
-            'v'           => '2.0',
-            'timestamp'   => date('Y-m-d H:i:s'),
-            'sign_method' => 'md5',
-            'sms_type'    => 'normal'
-                ], $this->_params);
-    }
-
-    private function _signed($params)
-    {
-        ksort($params);
-        $sign = $this->config['secret'];
-        foreach ($params as $k => $v)
-        {
-            if (is_string($v) && '@' != substr($v, 0, 1))
-                $sign .= $k . $v;
-        }
-        $sign .= $this->config['secret'];
-        return strtoupper(md5($sign));
-    }
-
-    private function _curl($params)
-    {
-        $uri = 'https://eco.taobao.com/router/rest?' . http_build_query($params);
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
-        curl_setopt($ch, CURLOPT_URL, $uri);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.98 Safari/537.36");
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
-        $reponse = curl_exec($ch);
-        curl_close($ch);
-        return $reponse;
-    }
-
-}
diff --git a/extend/fast/service/Easemob.php b/extend/fast/service/Easemob.php
deleted file mode 100644
index c1a9da54..00000000
--- a/extend/fast/service/Easemob.php
+++ /dev/null
@@ -1,307 +0,0 @@
- $username, 'password' => $password];
-        if ($nickname)
-        {
-            $params['nickname'] = $nickname;
-        }
-        return self::api('users', $params, $token);
-    }
-
-    /**
-     * 创建聊天室
-     *
-     * @param string $name 名称
-     * @param string $description 描述
-     * @param string $owner 创建人
-     * @param int $maxusers 最多参与者
-     * @param array $members 成员
-     * @return array
-     */
-    public static function createRoom($name, $description, $owner, $maxusers = 5000, $members = [])
-    {
-        $owner = (string) $owner;
-        $params = [
-            "name"        => $name, //聊天室名称，此属性为必须的
-            "description" => $description, //聊天室描述，此属性为必须的
-            "maxusers"    => $maxusers, //聊天室成员最大数（包括群主），值为数值类型，默认值200，最大值5000，此属性为可选的
-            "owner"       => $owner, //聊天室的管理员，此属性为必须的
-        ];
-        if ($members)
-        {
-            if (!in_array($owner, $members))
-            {
-                $members[] = $owner;
-            }
-            $params['members'] = $members;
-        }
-        return self::api('chatrooms', $params, TRUE);
-    }
-
-    /**
-     * 创建群组
-     *
-     * @param string $name 名称
-     * @param string $description 描述
-     * @param string $owner 管理员
-     * @param int $maxusers 最大成员数量
-     * @param array $members 成员列表
-     * @param boolean $public 是否公开
-     * @param boolean $approval 加入是否审核
-     * @return array
-     */
-    public static function createGroup($name, $description, $owner, $maxusers = 2000, $members = [], $public = TRUE, $approval = FALSE)
-    {
-        $owner = (string) $owner;
-        $params = [
-            "groupname" => $name,
-            "desc"      => $description,
-            "public"    => (bool) $public,
-            "maxusers"  => $maxusers,
-            "approval"  => (bool) $approval,
-            "owner"     => $owner,
-        ];
-        if ($members)
-        {
-            if (!in_array($owner, $members))
-            {
-                $members[] = $owner;
-            }
-            $params['members'] = $members;
-        }
-        return self::api('chatgroups', $params, TRUE);
-    }
-
-    /**
-     * 修改群组信息
-     *
-     * @param int $group_id
-     * @param string $name
-     * @param string $description
-     * @param int $maxusers
-     * @return array
-     */
-    public static function editGroup($group_id, $name, $description, $maxusers)
-    {
-        $params = [
-            "groupname" => $name,
-            "desc"      => $description,
-            "maxusers"  => $maxusers,
-        ];
-        return self::api('chatgroups/' . $group_id, $params, TRUE, 'PUT');
-    }
-
-    /**
-     * 获取好友列表
-     */
-    public static function getFiends($owner_username)
-    {
-        return self::api("users/{$owner_username}/contacts/users", [], TRUE, 'GET');
-    }
-
-    /**
-     * 删除群组
-     *
-     * @param int $group_id
-     * @return array
-     */
-    public static function deleteGroup($group_id)
-    {
-        $params = [];
-        return self::api('chatgroups/' . $group_id, $params, TRUE, 'DELETE');
-    }
-
-    /**
-     * 发送消息
-     *
-     * @param string $from 发件人
-     * @param string $to 收件人
-     * @param mixed $msg 消息内容
-     * @param string $target_type 消息类型 users/chatgroups/chatrooms
-     * @return array
-     */
-    public static function sendMessage($from, $to, $msg, $target_type = 'users')
-    {
-        if (!is_array($msg))
-        {
-            $msg = [
-                'type' => 'txt',
-                'msg'  => $msg
-            ];
-        }
-        $data = [
-            'target_type' => $target_type,
-            'target'      => is_array($to) ? $to : [$to],
-            'from'        => $from,
-        ];
-        if (isset($msg['ext']))
-        {
-            $data['ext'] = $msg['ext'];
-        }
-        unset($msg['ext']);
-        $data['msg'] = $msg;
-        return self::api('messages', $data);
-    }
-
-    /**
-     * 获取离线消息记录条数
-     * @param string $owner_username
-     * @return array
-     */
-    public static function getOfflineMsgCount($owner_username)
-    {
-        return self::api("users/{$owner_username}/offline_msg_count", [], TRUE, 'GET');
-    }
-
-    /**
-     * 群组添加成员
-     * @param int $chatroom_id
-     * @param array $usernames
-     * @param array
-     */
-    public static function addChatRoomMembers($chatroom_id, $usernames)
-    {
-        return self::api("chatgroups/{$chatroom_id}/users", $usernames, TRUE);
-    }
-
-    /**
-     * 添加单个成员POST
-     */
-    public static function addOneChatRoomMember($chatroom_id, $username)
-    {
-        //return $chatroom_id;
-        return self::api("chatgroups/{$chatroom_id}/users/{$username}", [], TRUE);
-    }
-
-    /**
-     * 群组删除成员
-     * @param int $chatroom_id
-     * @param string $usernames
-     * @return array
-     */
-    public static function minusChatRoomMembers($chatroom_id, $usernames)
-    {
-        return self::api("chatgroups/{$chatroom_id}/users/{$usernames}", [], TRUE, 'DELETE');
-    }
-
-    /**
-     * 添加好友
-     */
-    public static function addFriends($owner_username, $friend_username)
-    {
-        return self::api("users/{$owner_username}/contacts/users/{$friend_username}", [], TRUE);
-    }
-
-    /**
-     * 删除好友
-     */
-    public static function minusFriends($owner_username, $friend_username)
-    {
-        return self::api("users/{$owner_username}/contacts/users/{$friend_username}", [], TRUE, 'DELETE');
-    }
-
-    /**
-     * 查看用户参与的所有群组
-     * @param type $owner_username
-     * @return type
-     */
-    public static function joinedChatgroups($owner_username)
-    {
-        return self::api("users/{$owner_username}/joined_chatgroups", [], TRUE, 'GET');
-    }
-
-    /**
-     * 调用API接口
-     *
-     * @param string $api 接口
-     * @param array $params request head参数
-     * @param boolean $token 是否认证模式
-     * @param string $method 请求方法 POST/GET
-     * @param array $options 扩展配置
-     * @return array
-     */
-    public static function api($api, $params = [], $token = TRUE, $method = 'POST', $options = [])
-    {
-        $header = ['Content-Type:application/json'];
-        if ($token)
-        {
-            $header[] = self::getNewToken();
-        }
-        $config = Config::get('service.easemob');
-        $options[CURLOPT_HTTPHEADER] = $header;
-
-        $url = self::URL . '/' . $config['org_name'] . '/' . $config['app_name'] . '/' . $api;
-        //return $url;
-        $ret = Http::sendRequest($url, json_encode($params), $method, $options);
-        if ($ret['ret'] && $ret['msg'])
-        {
-            $msg = json_decode($ret['msg'], TRUE);
-            if (isset($msg['error']))
-            {
-                Log::error($ret['msg']);
-            }
-            return isset($msg['error']) ? [] : $msg;
-        }
-        else
-        {
-            return [];
-        }
-    }
-
-    private static function getToken()
-    {
-        $tokendata = Cache::get('easemobtoken');
-        if ($tokendata && $tokendata['expiretime'] > time())
-        {
-            return $tokendata['access_token'];
-        }
-        else
-        {
-            $config = Config::get('service.easemob');
-            $data = self::api('token', [
-                        'grant_type'    => 'client_credentials',
-                        'client_id'     => $config['client_id'],
-                        'client_secret' => $config['client_secret'],
-                            ], FALSE, 'POST');
-            if ($data)
-            {
-                $data['expiretime'] = time() + $data['expires_in'];
-                Cache::set('easemobtoken', $data, $data['expires_in'] - 10);
-                return $data['access_token'];
-            }
-            else
-            {
-                return '';
-            }
-        }
-    }
-
-}
diff --git a/extend/fast/service/Qiniu.php b/extend/fast/service/Qiniu.php
deleted file mode 100644
index c240bd58..00000000
--- a/extend/fast/service/Qiniu.php
+++ /dev/null
@@ -1,187 +0,0 @@
-_config['bucket'];
-        $op = '/move/' . self::qiniuEncode($from) . '/' . self::qiniuEncode($to);
-        return self::opration($op);
-    }
-
-    /**
-     * 复制文件
-     *
-     * @param string $from      来源文件
-     * @param string $saveas    目标文件
-     * @return bool
-     */
-    public static function copy($from, $saveas)
-    {
-        // $bucket = $this->_config['bucket'];
-        $op = '/copy/' . self::qiniuEncode($from) . '/' . self::qiniuEncode($saveas);
-        return self::opration($op);
-    }
-
-    /**
-     * 获取token
-     *
-     * @param string $bucket    空间名
-     * @param string $key       密钥
-     * @param int    $max       文件大小限制
-     * @param int    $timeout   超时时间
-     * @return string
-     */
-    public static function getToken($bucket, $key, $max = 10485760, $timeout = 600)
-    {
-        $setting = array(
-            'scope'      => $bucket,
-            'saveKey'    => $key,
-            'deadline'   => $timeout + $_SERVER['REQUEST_TIME'],
-            'fsizeLimit' => intval($max),
-        );
-        $setting = self::qiniuEncode(json_encode($setting));
-        return self::sign($setting) . ':' . $setting;
-    }
-
-    /**
-     * 删除
-     *
-     * @param string $uri   文件路径
-     * @return boolean
-     */
-    public static function delete($uri)
-    {
-        $file = self::qiniuEncode($uri);
-        return self::opration('/delete/' . $file);
-    }
-
-    /**
-     * 判断文件是否存在
-     *
-     * @param string $uri
-     * @return boolean
-     */
-    public static function has($uri)
-    {
-        $op = '/stat/' . self::qiniuEncode($uri);
-        return self::opration($op);
-    }
-
-    /**
-     * 转pdf
-     *
-     * @param string $bucket
-     * @param string $key
-     * @param string $saveas
-     * @return boolean
-     */
-    public static function toPdf($bucket, $key, $saveas)
-    {
-        $API = 'http://api.qiniu.com';
-        $op = '/pfop/';
-        $data = 'bucket=' . $bucket . '&key=' . $key . '&fops=yifangyun_preview|saveas/' . self::qiniuEncode($saveas);
-        return self::opration($op, $data, $API);
-    }
-
-    /**
-     * 七牛操作
-     *
-     * @param string $op 操作命令
-     * @param string $data 操作结果
-     * @param string $host
-     * @return boolean
-     */
-    private static function opration($op, $data = null, $host = self::QINIU_RS)
-    {
-        $token = self::sign(is_string($data) ? $op . "\n" . $data : $op . "\n");
-        $url = $host . $op;
-        $header = array('Authorization: QBox ' . $token);
-
-        if ($ch = curl_init($url))
-        {
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-            if ($data)
-            {
-                curl_setopt($ch, CURLOPT_POST, true);
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-            }
-            curl_setopt($ch, CURLOPT_HEADER, 1);
-            $response = curl_exec($ch);
-            $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-            curl_close($ch);
-
-            if ($status == 200)
-            {
-                return true;
-            }
-            // elseif (\Config::get('debug'))
-            // {
-            // 	/*操作出错*/
-            // 	\Log::debug($response, '七牛请求出错');
-            // }
-        }
-        Log::error('[QINIU]七牛错误' . $url . ':' . ($response ? : '请求失败'), 'ERROR');
-        return false;
-    }
-
-    /**
-     * 获取url签名
-     *
-     * @param string $url
-     * @return string
-     */
-    private static function sign($url)
-    {
-        $config = self::$_config ? : (self::$_config = Config::get('service.qiniu'));
-        $sign = hash_hmac('sha1', $url, $config['secretkey'], true);
-        $ak = $config['accesskey'];
-        return $ak . ':' . self::qiniuEncode($sign);
-    }
-
-    /**
-     * 七牛安全编码
-     */
-    private static function qiniuEncode($str)
-    {
-        return strtr(base64_encode($str), ['+' => '-', '/' => '_']);
-    }
-
-}
diff --git a/extend/fast/service/Upyun.php b/extend/fast/service/Upyun.php
deleted file mode 100644
index eaddea02..00000000
--- a/extend/fast/service/Upyun.php
+++ /dev/null
@@ -1,572 +0,0 @@
-config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-    }
-
-    /* }}} */
-
-    /**
-     * 获取当前SDK版本号
-     */
-    public function version()
-    {
-        return self::VERSION;
-    }
-
-    /**
-     * 创建目录
-     * @param $path 路径
-     * @param $auto_mkdir 是否自动创建父级目录，最多10层次
-     *
-     * @return void
-     */
-    public function makeDir($path, $auto_mkdir = false)
-    {/* {{{ */
-        $headers = array('Folder' => 'true');
-        if ($auto_mkdir)
-            $headers['Mkdir'] = 'true';
-        return $this->_do_request('PUT', $path, $headers);
-    }
-
-    /* }}} */
-
-    /**
-     * 删除目录和文件
-     * @param string $path 路径
-     *
-     * @return boolean
-     */
-    public function delete($path)
-    {/* {{{ */
-        return $this->_do_request('DELETE', $path);
-    }
-
-    /* }}} */
-
-    /**
-     * 上传文件
-     * @param string $path 存储路径或文件
-     * @param mixed $file 需要上传的文件，可以是文件流或者文件内容
-     * @param boolean $auto_mkdir 自动创建目录
-     * @param array $opts 可选参数
-     */
-    public function upload($path, $file = NULL, $auto_mkdir = True, $opts = NULL)
-    {
-        return $this->writeFile($path, $file, $auto_mkdir, $opts);
-    }
-
-    public function writeFile($path, $file = NULL, $auto_mkdir = True, $opts = NULL)
-    {/* {{{ */
-        if (is_null($file))
-            $file = ROOT_PATH . 'public/' . $path;
-        if (is_null($opts))
-            $opts = array();
-        if (!is_null($this->_content_md5) || !is_null($this->_file_secret))
-        {
-            //if (!is_null($this->_content_md5)) array_push($opts, self::CONTENT_MD5 . ": {$this->_content_md5}");
-            //if (!is_null($this->_file_secret)) array_push($opts, self::CONTENT_SECRET . ": {$this->_file_secret}");
-            if (!is_null($this->_content_md5))
-                $opts[self::CONTENT_MD5] = $this->_content_md5;
-            if (!is_null($this->_file_secret))
-                $opts[self::CONTENT_SECRET] = $this->_file_secret;
-        }
-
-        // 如果设置了缩略版本或者缩略图类型，则添加默认压缩质量和锐化参数
-        //if (isset($opts[self::X_GMKERL_THUMBNAIL]) || isset($opts[self::X_GMKERL_TYPE])) {
-        //    if (!isset($opts[self::X_GMKERL_QUALITY])) $opts[self::X_GMKERL_QUALITY] = 95;
-        //    if (!isset($opts[self::X_GMKERL_UNSHARP])) $opts[self::X_GMKERL_UNSHARP] = 'true';
-        //}
-
-        if ($auto_mkdir === True)
-            $opts['Mkdir'] = 'true';
-
-        $this->_file_infos = $this->_do_request('PUT', $path, $opts, $file);
-
-        return $this->_file_infos;
-    }
-
-    /* }}} */
-
-    /**
-     * 下载文件
-     * @param string $path 文件路径
-     * @param mixed $file_handle
-     *
-     * @return mixed
-     */
-    public function readFile($path, $file_handle = NULL)
-    {/* {{{ */
-        return $this->_do_request('GET', $path, NULL, NULL, $file_handle);
-    }
-
-    /* }}} */
-
-    /**
-     * 获取目录文件列表
-     *
-     * @param string $path 查询路径
-     *
-     * @return mixed
-     */
-    public function getList($path = '/')
-    {/* {{{ */
-        $rsp = $this->_do_request('GET', $path);
-
-        $list = array();
-        if ($rsp)
-        {
-            $rsp = explode("\n", $rsp);
-            foreach ($rsp as $item)
-            {
-                @list($name, $type, $size, $time) = explode("\t", trim($item));
-                if (!empty($time))
-                {
-                    $type = $type == 'N' ? 'file' : 'folder';
-                }
-
-                $item = array(
-                    'name' => $name,
-                    'type' => $type,
-                    'size' => intval($size),
-                    'time' => intval($time),
-                );
-                array_push($list, $item);
-            }
-        }
-
-        return $list;
-    }
-
-    /* }}} */
-
-    /**
-     * @deprecated
-     * @param string $path 目录路径
-     * @return mixed
-     */
-    public function getFolderUsage($path = '/')
-    {/* {{{ */
-        $rsp = $this->_do_request('GET', '/?usage');
-        return floatval($rsp);
-    }
-
-    /* }}} */
-
-    /**
-     * 获取文件、目录信息
-     *
-     * @param string $path 路径
-     *
-     * @return mixed
-     */
-    public function getFileInfo($path)
-    {/* {{{ */
-        $rsp = $this->_do_request('HEAD', $path);
-
-        return $rsp;
-    }
-
-    /* }}} */
-
-    /**
-     * 连接签名方法
-     * @param $method 请求方式 {GET, POST, PUT, DELETE}
-     * return 签名字符串
-     */
-    private function sign($method, $uri, $date, $length)
-    {/* {{{ */
-        //$uri = urlencode($uri);
-        $sign = "{$method}&{$uri}&{$date}&{$length}&{$this->config['password']}";
-        return 'UpYun ' . $this->config['username'] . ':' . md5($sign);
-    }
-
-    /* }}} */
-
-    /**
-     * HTTP REQUEST 封装
-     * @param string $method HTTP REQUEST方法，包括PUT、POST、GET、OPTIONS、DELETE
-     * @param string $path 除Bucketname之外的请求路径，包括get参数
-     * @param array $headers 请求需要的特殊HTTP HEADERS
-     * @param array $body 需要POST发送的数据
-     *
-     * @return mixed
-     */
-    protected function _do_request($method, $path, $headers = NULL, $body = NULL, $file_handle = NULL)
-    {/* {{{ */
-        $uri = "/{$this->config['bucket']}{$path}";
-        $ch = curl_init("http://{$this->config['endpoint']}{$uri}");
-
-        $_headers = array('Expect:');
-        if (!is_null($headers) && is_array($headers))
-        {
-            foreach ($headers as $k => $v)
-            {
-                array_push($_headers, "{$k}: {$v}");
-            }
-        }
-
-        $length = 0;
-        $date = gmdate('D, d M Y H:i:s \G\M\T');
-
-        if (!is_null($body))
-        {
-            if (!is_resource($body) && file_exists($body))
-            {
-                $body = fopen($body, "rb");
-            }
-            if (is_resource($body))
-            {
-                fseek($body, 0, SEEK_END);
-                $length = ftell($body);
-                fseek($body, 0);
-
-                array_push($_headers, "Content-Length: {$length}");
-                curl_setopt($ch, CURLOPT_INFILE, $body);
-                curl_setopt($ch, CURLOPT_INFILESIZE, $length);
-            }
-            else
-            {
-                $length = @strlen($body);
-                array_push($_headers, "Content-Length: {$length}");
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
-            }
-        }
-        else
-        {
-            array_push($_headers, "Content-Length: {$length}");
-        }
-
-        array_push($_headers, "Authorization: {$this->sign($method, $uri, $date, $length)}");
-        array_push($_headers, "Date: {$date}");
-
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);
-        curl_setopt($ch, CURLOPT_TIMEOUT, $this->config['timeout']);
-        curl_setopt($ch, CURLOPT_HEADER, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
-
-        if ($method == 'PUT' || $method == 'POST')
-        {
-            curl_setopt($ch, CURLOPT_POST, 1);
-        }
-        else
-        {
-            curl_setopt($ch, CURLOPT_POST, 0);
-        }
-
-        if ($method == 'GET' && is_resource($file_handle))
-        {
-            curl_setopt($ch, CURLOPT_HEADER, 0);
-            curl_setopt($ch, CURLOPT_FILE, $file_handle);
-        }
-
-        if ($method == 'HEAD')
-        {
-            curl_setopt($ch, CURLOPT_NOBODY, true);
-        }
-        $response = curl_exec($ch);
-        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-        if ($http_code == 0)
-            throw new Exception('Connection Failed', $http_code);
-
-        curl_close($ch);
-
-        $header_string = '';
-        $body = '';
-
-        if ($method == 'GET' && is_resource($file_handle))
-        {
-            $header_string = '';
-            $body = $response;
-        }
-        else
-        {
-            list($header_string, $body) = explode("\r\n\r\n", $response, 2);
-        }
-        $this->setXRequestId($header_string);
-        if ($http_code == 200)
-        {
-            if ($method == 'GET' && is_null($file_handle))
-            {
-                return $body;
-            }
-            else
-            {
-                $data = $this->_getHeadersData($header_string);
-                return count($data) > 0 ? $data : true;
-            }
-        }
-        else
-        {
-            $message = $this->_getErrorMessage($header_string);
-            if (is_null($message) && $method == 'GET' && is_resource($file_handle))
-            {
-                $message = 'File Not Found';
-            }
-            switch ($http_code)
-            {
-                case 401:
-                    throw new Exception($message, $http_code);
-                    break;
-                case 403:
-                    throw new Exception($message, $http_code);
-                    break;
-                case 404:
-                    throw new Exception($message, $http_code);
-                    break;
-                case 406:
-                    throw new Exception($message, $http_code);
-                    break;
-                case 503:
-                    throw new Exception($message, $http_code);
-                    break;
-                default:
-                    throw new Exception($message, $http_code);
-            }
-        }
-    }
-
-    /* }}} */
-
-    /**
-     * 处理HTTP HEADERS中返回的自定义数据
-     *
-     * @param string $text header字符串
-     *
-     * @return array
-     */
-    private function _getHeadersData($text)
-    {/* {{{ */
-        $headers = explode("\r\n", $text);
-        $items = array();
-        foreach ($headers as $header)
-        {
-            $header = trim($header);
-            if (stripos($header, 'x-upyun') !== False)
-            {
-                list($k, $v) = explode(':', $header);
-                $items[trim($k)] = in_array(substr($k, 8, 5), array('width', 'heigh', 'frame')) ? intval($v) : trim($v);
-            }
-        }
-        return $items;
-    }
-
-    /* }}} */
-
-    /**
-     * 获取返回的错误信息
-     *
-     * @param string $header_string
-     *
-     * @return mixed
-     */
-    private function _getErrorMessage($header_string)
-    {
-        list($status, $stash) = explode("\r\n", $header_string, 2);
-        list($v, $code, $message) = explode(" ", $status, 3);
-        return $message . " X-Request-Id: " . $this->getXRequestId();
-    }
-
-    private function setXRequestId($header_string)
-    {
-        preg_match('~^X-Request-Id: ([0-9a-zA-Z]{32})~ism', $header_string, $result);
-        $this->x_request_id = isset($result[1]) ? $result[1] : '';
-    }
-
-    public function getXRequestId()
-    {
-        return $this->x_request_id;
-    }
-
-    /**
-     * 删除目录
-     * @deprecated
-     * @param $path 路径
-     *
-     * @return void
-     */
-    public function rmDir($path)
-    {/* {{{ */
-        $this->_do_request('DELETE', $path);
-    }
-
-    /* }}} */
-
-    /**
-     * 删除文件
-     *
-     * @deprecated
-     * @param string $path 要删除的文件路径
-     *
-     * @return boolean
-     */
-    public function deleteFile($path)
-    {/* {{{ */
-        $rsp = $this->_do_request('DELETE', $path);
-    }
-
-    /* }}} */
-
-    /**
-     * 获取目录文件列表
-     * @deprecated
-     *
-     * @param string $path 要获取列表的目录
-     *
-     * @return array
-     */
-    public function readDir($path)
-    {/* {{{ */
-        return $this->getList($path);
-    }
-
-    /* }}} */
-
-    /**
-     * 获取空间使用情况
-     *
-     * @deprecated 推荐直接使用 getFolderUsage('/')来获取
-     * @return mixed
-     */
-    public function getBucketUsage()
-    {/* {{{ */
-        return $this->getFolderUsage('/');
-    }
-
-    /* }}} */
-
-    /**
-     * 获取文件信息
-     *
-     * #deprecated
-     * @param $file 文件路径（包含文件名）
-     * return array('type'=> file | folder, 'size'=> file size, 'date'=> unix time) 或 null
-     */
-    //public function getFileInfo($file){/*{{{*/
-    //    $result = $this->head($file);
-    //	if(is_null($r))return null;
-    //	return array('type'=> $this->tmp_infos['x-upyun-file-type'], 'size'=> @intval($this->tmp_infos['x-upyun-file-size']), 'date'=> @intval($this->tmp_infos['x-upyun-file-date']));
-    //}/*}}}*/
-
-    /**
-     * 切换 API 接口的域名
-     *
-     * @deprecated
-     * @param $domain {默然 v0.api.upyun.com 自动识别, v1.api.upyun.com 电信, v2.api.upyun.com 联通, v3.api.upyun.com 移动}
-     * return null;
-     */
-    public function setApiDomain($domain)
-    {/* {{{ */
-        $this->config['endpoint'] = $domain;
-    }
-
-    /* }}} */
-
-    /**
-     * 设置待上传文件的 Content-MD5 值（如又拍云服务端收到的文件MD5值与用户设置的不一致，将回报 406 Not Acceptable 错误）
-     *
-     * @deprecated
-     * @param $str （文件 MD5 校验码）
-     * return null;
-     */
-    public function setContentMD5($str)
-    {/* {{{ */
-        $this->_content_md5 = $str;
-    }
-
-    /* }}} */
-
-    /**
-     * 设置待上传文件的 访问密钥（注意：仅支持图片空！，设置密钥后，无法根据原文件URL直接访问，需带 URL 后面加上 （缩略图间隔标志符+密钥） 进行访问）
-     * 如缩略图间隔标志符为 ! ，密钥为 bac，上传文件路径为 /folder/test.jpg ，那么该图片的对外访问地址为： http://空间域名/folder/test.jpg!bac
-     *
-     * @deprecated
-     * @param $str （文件 MD5 校验码）
-     * return null;
-     */
-    public function setFileSecret($str)
-    {/* {{{ */
-        $this->_file_secret = $str;
-    }
-
-    /* }}} */
-
-    /**
-     * @deprecated
-     * 获取上传文件后的信息（仅图片空间有返回数据）
-     * @param $key 信息字段名（x-upyun-width、x-upyun-height、x-upyun-frames、x-upyun-file-type）
-     * return value or NULL
-     */
-    public function getWritedFileInfo($key)
-    {/* {{{ */
-        if (!isset($this->_file_infos))
-            return NULL;
-        return $this->_file_infos[$key];
-    }
-
-    /* }}} */
-}
diff --git a/extend/fast/service/Wechat.php b/extend/fast/service/Wechat.php
deleted file mode 100644
index 84312938..00000000
--- a/extend/fast/service/Wechat.php
+++ /dev/null
@@ -1,213 +0,0 @@
- array(
-                'name'   => '签到送积分',
-                'config' => array(
-                )
-            ),
-            'article' => array(
-                'name'   => '关联文章',
-                'config' => array(
-                    array(
-                        'type'    => 'text',
-                        'caption' => '文章ID',
-                        'field'   => 'id',
-                        'options' => ''
-                    )
-                )
-            ),
-            'page'    => array(
-                'name'   => '关联单页',
-                'config' => array(
-                    array(
-                        'type'    => 'text',
-                        'caption' => '单页ID',
-                        'field'   => 'id',
-                        'options' => ''
-                    )
-                )
-            ),
-            'service' => array(
-                'name'   => '在线客服',
-                'config' => array(
-                )
-            ),
-        );
-    }
-
-    // 微信输入交互内容指令
-    public function command($obj, $openid, $content, $context)
-    {
-        $response = FALSE;
-        if (isset($content['app']))
-        {
-            switch ($content['app'])
-            {
-                case 'signin':
-                case 'article':
-                case 'page':
-                    break;
-                case 'service':
-                    $service = (array) json_decode(WechatConfig::value('service'), true);
-                    list($begintime, $endtime) = explode('-', $service['onlinetime']);
-                    $session = $obj->app->staff_session;
-                    $staff = $obj->app->staff;
-
-                    $kf_account = $session->get($openid)->kf_account;
-                    $time = time();
-                    if (!$kf_account && ($time < strtotime(date("Y-m-d {$begintime}")) || $time > strtotime(date("Y-m-d {$endtime}"))))
-                    {
-                        return $service['offlinemsg'];
-                    }
-                    if (!$kf_account)
-                    {
-                        $kf_list = $staff->onlines()->kf_online_list;
-                        if ($kf_list)
-                        {
-                            $kfarr = [];
-                            foreach ($kf_list as $k => $v)
-                            {
-                                $kfarr[$v['kf_account']] = $v['accepted_case'];
-                            }
-                            $kfkeys = array_keys($kfarr, min($kfarr));
-                            $kf_account = reset($kfkeys);
-                            $session->create($kf_account, $openid);
-                            $response = $service['waitformsg'];
-                        }
-                        else
-                        {
-                            $response = $service['nosessionmsg'];
-                        }
-                    }
-                    else
-                    {
-                        $server = $obj->app->server;
-                        $server->setMessageHandler(function($message) {
-                            return new Transfer();
-                        });
-                        $response = $server->serve();
-                        $response->send();
-                        exit;
-                    }
-
-                    break;
-                default:
-                    break;
-            }
-        }
-        else
-        {
-            $response = isset($content['content']) ? $content['content'] : $response;
-        }
-        return $response;
-    }
-
-    // 微信点击菜单event指令
-    public function response($obj, $openid, $content, $context)
-    {
-        $upload = Config::get('upload');
-        $response = FALSE;
-        if (isset($content['app']))
-        {
-            switch ($content['app'])
-            {
-                case 'signin':
-                    $thirdinfo = UserThird::get(['platform' => 'wechat', 'openid' => $openid]);
-                    if (!$thirdinfo)
-                    {
-                        $response = '您还没有绑定用户还不能签到!';
-                    }
-                    else
-                    {
-                        $user_id = $thirdinfo->user_id;
-                        $usersign = new UserSignin;
-                        $signdata = $usersign->where('user_id', '=', $user_id)->where('createtime', '>=', Date::unixtime())->find();
-                        if ($signdata)
-                        {
-                            $response = '今天已签到,请明天再来!';
-                        }
-                        else
-                        {
-                            $signdata = (array) json_decode(WechatConfig::value('signin'), TRUE);
-
-                            $lastdata = $usersign->where('user_id', $user_id)->order('id', 'desc')->limit(1)->find();
-                            $successions = $lastdata && $lastdata['createtime'] > Date::unixtime('day', -1) ? $lastdata['successions'] + 1 : 1;
-                            $usersign->save(['user_id' => $thirdinfo['user_id'], 'successions' => $successions, 'createtime' => time()]);
-                            $score = isset($signdata['s' . $successions]) ? $signdata['s' . $successions] : $signdata['sn'];
-                            User::where(['id' => $user_id])->setInc('score', $score);
-                            $response = '签到成功!连续签到' . $successions . '天!获得' . $score . '积分';
-                        }
-                    }
-
-                    break;
-                case 'article':
-                    $id = explode(',', $content['id']);
-                    $pagelist = Page::all($id);
-                    $response = [];
-                    foreach ($pagelist as $k => $pageinfo)
-                    {
-                        if ($pageinfo)
-                        {
-                            $news = new News();
-                            $news->title = $pageinfo['title'];
-                            $news->url = $pageinfo['url'] ? $pageinfo['url'] : url('index/page/show', ['id' => $pageinfo['id']], true, true);
-                            $news->image = $upload['cdnurl'] . $pageinfo['image'];
-                            $news->description = $pageinfo['description'];
-                            $response[] = $news;
-                        }
-                    }
-
-                case 'page':
-                    $id = isset($content['id']) ? $content['id'] : 0;
-                    $pageinfo = Page::get($id);
-                    if ($pageinfo)
-                    {
-                        $news = new News();
-                        $news->title = $pageinfo['title'];
-                        $news->url = $pageinfo['url'] ? $pageinfo['url'] : url('index/page/show', ['id' => $pageinfo['id']], true, true);
-                        $news->image = $upload['cdnurl'] . $pageinfo['image'];
-                        $news->description = $pageinfo['description'];
-                        return $news;
-                    }
-                    break;
-                case 'service':
-                    $response = $this->command($obj, $openid, $content, $context);
-                    break;
-                default:
-                    break;
-            }
-        }
-        else
-        {
-            $response = isset($content['content']) ? $content['content'] : $response;
-        }
-        return $response;
-    }
-
-}
diff --git a/extend/fast/third/Application.php b/extend/fast/third/Application.php
deleted file mode 100644
index de16a3a6..00000000
--- a/extend/fast/third/Application.php
+++ /dev/null
@@ -1,76 +0,0 @@
- 'Qq',
-        'weibo'  => 'Weibo',
-        'wechat' => 'Wechat',
-    ];
-
-    /**
-     * 服务对象信息
-     * @var array
-     */
-    protected $services = [];
-
-    public function __construct($options = [])
-    {
-        if ($config = Config::get('third'))
-        {
-            $this->config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-
-        //注册服务器提供者
-        $this->registerProviders();
-    }
-
-    /**
-     * 注册服务提供者
-     */
-    private function registerProviders()
-    {
-        foreach ($this->providers as $k => $v)
-        {
-            $this->services[$k] = function() use ($k, $v)
-            {
-                $options = $this->config[$k];
-                $options['app_id'] = isset($options['app_id']) ? $options['app_id'] : '';
-                $options['app_secret'] = isset($options['app_secret']) ? $options['app_secret'] : '';
-                // 如果未定义回调地址则自动生成
-                $options['callback'] = isset($options['callback']) && $options['callback'] ? $options['callback'] : url('user/third?action=callback&platform=' . $k, [], false, true);
-                // 如果非http地址则转换一下
-                $options['callback'] = substr($options['callback'], 0, 7) == 'http://' || substr($options['callback'], 0, 8) == 'https://' ? $options['callback'] : url($options['callback'], '', false, true);
-                $objname = __NAMESPACE__ . "\\{$v}";
-                return new $objname($options);
-            };
-        }
-    }
-
-    public function __set($key, $value)
-    {
-        $this->services[$key] = $value;
-    }
-
-    public function __get($key)
-    {
-        return $this->services[$key]($this);
-    }
-
-}
diff --git a/extend/fast/third/Qq.php b/extend/fast/third/Qq.php
deleted file mode 100644
index f7a2e65b..00000000
--- a/extend/fast/third/Qq.php
+++ /dev/null
@@ -1,145 +0,0 @@
-config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-    }
-
-    /**
-     * 登陆
-     */
-    public function login()
-    {
-        header("Location:" . $this->getAuthorizeUrl());
-    }
-
-    /**
-     * 获取authorize_url
-     */
-    public function getAuthorizeUrl()
-    {
-        $state = md5(uniqid(rand(), TRUE));
-        Session::set('state', $state);
-        $queryarr = array(
-            "response_type" => "code",
-            "client_id"     => $this->config['app_id'],
-            "redirect_uri"  => $this->config['callback'],
-            "scope"         => $this->config['scope'],
-            "state"         => $state,
-        );
-        request()->isMobile() && $queryarr['display'] = 'mobile';
-        $url = self::GET_AUTH_CODE_URL . '?' . http_build_query($queryarr);
-        return $url;
-    }
-
-    /**
-     * 获取用户信息
-     * @param array $params
-     * @return array
-     */
-    public function getUserInfo($params = [])
-    {
-        $params = $params ? $params : $_GET;
-        if (isset($params['access_token']) || (isset($params['state']) && $params['state'] == Session::get('state') && isset($params['code'])))
-        {
-            //获取access_token
-            $data = isset($params['code']) ? $this->getAccessToken($params['code']) : $params;
-            $access_token = isset($data['access_token']) ? $data['access_token'] : '';
-            $refresh_token = isset($data['refresh_token']) ? $data['refresh_token'] : '';
-            $expires_in = isset($data['expires_in']) ? $data['expires_in'] : 0;
-            if ($access_token)
-            {
-                $openid = $this->getOpenId($access_token);
-                //获取用户信息
-                $queryarr = [
-                    "access_token"       => $access_token,
-                    "oauth_consumer_key" => $this->config['app_id'],
-                    "openid"             => $openid,
-                ];
-                $ret = Http::get(self::GET_USERINFO_URL, $queryarr);
-                $userinfo = json_decode($ret, TRUE);
-                if (!$userinfo || !isset($userinfo['ret']) || $userinfo['ret'] !== 0)
-                    return [];
-                $userinfo = $userinfo ? $userinfo : [];
-                $userinfo['avatar'] = isset($userinfo['figureurl_qq_2']) ? $userinfo['figureurl_qq_2'] : '';
-                $data = [
-                    'access_token'  => $access_token,
-                    'refresh_token' => $refresh_token,
-                    'expires_in'    => $expires_in,
-                    'openid'        => $openid,
-                    'userinfo'      => $userinfo
-                ];
-                return $data;
-            }
-        }
-        return [];
-    }
-
-    /**
-     * 获取access_token
-     * @param string $code
-     * @return array
-     */
-    private function getAccessToken($code = '')
-    {
-        if (!$code)
-            return '';
-        $queryarr = array(
-            "grant_type"    => "authorization_code",
-            "client_id"     => $this->config['app_id'],
-            "client_secret" => $this->config['app_secret'],
-            "redirect_uri"  => $this->config['callback'],
-            "code"          => $code,
-        );
-        $ret = Http::get(self::GET_ACCESS_TOKEN_URL, $queryarr);
-        $params = [];
-        parse_str($ret, $params);
-        return $params ? $params : [];
-    }
-
-    /**
-     * 获取open_id
-     * @param string $access_token
-     * @return string
-     */
-    private function getOpenId($access_token = '')
-    {
-        $response = Http::get(self::GET_OPENID_URL, ['access_token' => $access_token]);
-        if (strpos($response, "callback") !== false)
-        {
-            $lpos = strpos($response, "(");
-            $rpos = strrpos($response, ")");
-            $response = substr($response, $lpos + 1, $rpos - $lpos - 1);
-        }
-        $user = json_decode($response, TRUE);
-        return isset($user['openid']) ? $user['openid'] : '';
-    }
-
-}
diff --git a/extend/fast/third/Wechat.php b/extend/fast/third/Wechat.php
deleted file mode 100644
index d616ddd5..00000000
--- a/extend/fast/third/Wechat.php
+++ /dev/null
@@ -1,124 +0,0 @@
-config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-    }
-
-    /**
-     * 登陆
-     */
-    public function login()
-    {
-        header("Location:" . $this->getAuthorizeUrl());
-    }
-
-    /**
-     * 获取authorize_url
-     */
-    public function getAuthorizeUrl()
-    {
-        $state = md5(uniqid(rand(), TRUE));
-        Session::set('state', $state);
-        $queryarr = array(
-            "appid"        => $this->config['app_id'],
-            "redirect_uri"  => $this->config['callback'],
-            "response_type" => "code",
-            "scope"         => $this->config['scope'],
-            "state"         => $state,
-        );
-        request()->isMobile() && $queryarr['display'] = 'mobile';
-        $url = self::GET_AUTH_CODE_URL . '?' . http_build_query($queryarr) . '#wechat_redirect';
-        return $url;
-    }
-
-    /**
-     * 获取用户信息
-     * @param array $params
-     * @return array
-     */
-    public function getUserInfo($params = [])
-    {
-        $params = $params ? $params : $_GET;
-        if (isset($params['access_token']) || (isset($params['state']) && $params['state'] == Session::get('state') && isset($params['code'])))
-        {
-            //获取access_token
-            $data = isset($params['code']) ? $this->getAccessToken($params['code']) : $params;
-            $access_token = isset($data['access_token']) ? $data['access_token'] : '';
-            $refresh_token = isset($data['refresh_token']) ? $data['refresh_token'] : '';
-            $expires_in = isset($data['expires_in']) ? $data['expires_in'] : 0;
-            if ($access_token)
-            {
-                $openid = isset($data['openid']) ? $data['openid'] : '';
-                //获取用户信息
-                $queryarr = [
-                    "access_token" => $access_token,
-                    "openid"       => $openid,
-                    "lang"         => 'zh_CN'
-                ];
-                $ret = Http::post(self::GET_USERINFO_URL, $queryarr);
-                $userinfo = json_decode($ret, TRUE);
-                if (!$userinfo || isset($userinfo['errcode']))
-                    return [];
-                $userinfo = $userinfo ? $userinfo : [];
-                $userinfo['avatar'] = isset($userinfo['headimgurl']) ? $userinfo['headimgurl'] : '';
-                $data = [
-                    'access_token'  => $access_token,
-                    'refresh_token' => $refresh_token,
-                    'expires_in'    => $expires_in,
-                    'openid'        => $openid,
-                    'userinfo'      => $userinfo
-                ];
-                return $data;
-            }
-        }
-        return [];
-    }
-
-    /**
-     * 获取access_token
-     * @param string code
-     * @return array
-     */
-    private function getAccessToken($code = '')
-    {
-        if (!$code)
-            return '';
-        $queryarr = array(
-            "appid"      => $this->config['app_id'],
-            "secret"     => $this->config['app_secret'],
-            "code"       => $code,
-            "grant_type" => "authorization_code",
-        );
-        $response = Http::post(self::GET_ACCESS_TOKEN_URL, $queryarr);
-        $ret = json_decode($response, TRUE);
-        return $ret ? $ret : [];
-    }
-
-}
diff --git a/extend/fast/third/Weibo.php b/extend/fast/third/Weibo.php
deleted file mode 100644
index fb1dbabc..00000000
--- a/extend/fast/third/Weibo.php
+++ /dev/null
@@ -1,124 +0,0 @@
-config = array_merge($this->config, $config);
-        }
-        $this->config = array_merge($this->config, is_array($options) ? $options : []);
-    }
-
-    /**
-     * 登陆
-     */
-    public function login()
-    {
-        header("Location:" . $this->getAuthorizeUrl());
-    }
-
-    /**
-     * 获取authorize_url
-     */
-    public function getAuthorizeUrl()
-    {
-        $state = md5(uniqid(rand(), TRUE));
-        Session::set('state', $state);
-        $queryarr = array(
-            "response_type" => "code",
-            "client_id"     => $this->config['app_id'],
-            "redirect_uri"  => $this->config['callback'],
-            "state"         => $state,
-        );
-        request()->isMobile() && $queryarr['display'] = 'mobile';
-        $url = self::GET_AUTH_CODE_URL . '?' . http_build_query($queryarr);
-        return $url;
-    }
-
-    /**
-     * 获取用户信息
-     * @param array $params
-     * @return array
-     */
-    public function getUserInfo($params = [])
-    {
-        $params = $params ? $params : $_GET;
-        if (isset($params['access_token']) || (isset($params['state']) && $params['state'] == Session::get('state') && isset($params['code'])))
-        {
-            //获取access_token
-            $data = isset($params['code']) ? $this->getAccessToken($params['code']) : $params;
-            $access_token = isset($data['access_token']) ? $data['access_token'] : '';
-            $refresh_token = isset($data['refresh_token']) ? $data['refresh_token'] : '';
-            $expires_in = isset($data['expires_in']) ? $data['expires_in'] : 0;
-            if ($access_token)
-            {
-                $uid = isset($data['uid']) ? $data['uid'] : '';
-                //获取用户信息
-                $queryarr = [
-                    "access_token" => $access_token,
-                    "uid"          => $uid,
-                ];
-                $ret = Http::get(self::GET_USERINFO_URL, $queryarr);
-                $userinfo = json_decode($ret, TRUE);
-                if (!$userinfo || isset($userinfo['error_code']))
-                    return [];
-                $userinfo = $userinfo ? $userinfo : [];
-                $userinfo['nickname'] = isset($userinfo['screen_name']) ? $userinfo['screen_name'] : '';
-                $userinfo['avatar'] = isset($userinfo['profile_image_url']) ? $userinfo['profile_image_url'] : '';
-                $data = [
-                    'access_token'  => $access_token,
-                    'refresh_token' => $refresh_token,
-                    'expires_in'    => $expires_in,
-                    'openid'        => $uid,
-                    'userinfo'      => $userinfo
-                ];
-                return $data;
-            }
-        }
-        return [];
-    }
-
-    /**
-     * 获取access_token
-     * @param string code
-     * @return array
-     */
-    private function getAccessToken($code = '')
-    {
-        if (!$code)
-            return '';
-        $queryarr = array(
-            "grant_type"    => "authorization_code",
-            "client_id"     => $this->config['app_id'],
-            "client_secret" => $this->config['app_secret'],
-            "redirect_uri"  => $this->config['callback'],
-            "code"          => $code,
-        );
-        $response = Http::post(self::GET_ACCESS_TOKEN_URL, $queryarr);
-        $ret = json_decode($response, TRUE);
-        return $ret ? $ret : [];
-    }
-
-}
diff --git a/extend/fast/ucenter/client/Client.php b/extend/fast/ucenter/client/Client.php
deleted file mode 100644
index 58ed17be..00000000
--- a/extend/fast/ucenter/client/Client.php
+++ /dev/null
@@ -1,31 +0,0 @@
-initConfig();
-        Loader::import('client', dirname(__FILE__) . "/uc_client/"); //加载uc客户端主脚本
-    }
-
-    //加载配置
-    public function initConfig()
-    {
-        if (!defined('UC_API'))
-        {
-            new Exception('未发现uc常量配置信息');
-        }
-    }
-
-    function __call($method, $params)
-    {
-        return call_user_func_array($method, $params);
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/client.php b/extend/fast/ucenter/client/uc_client/client.php
deleted file mode 100644
index 67f361ff..00000000
--- a/extend/fast/ucenter/client/uc_client/client.php
+++ /dev/null
@@ -1,840 +0,0 @@
- $val)
-            {
-                $string[$key] = uc_addslashes($val, $force, $strip);
-            }
-        }
-        else
-        {
-            $string = addslashes($strip ? stripslashes($string) : $string);
-        }
-    }
-    return $string;
-}
-
-if (!function_exists('daddslashes'))
-{
-
-    function daddslashes($string, $force = 0)
-    {
-        return uc_addslashes($string, $force);
-    }
-
-}
-
-if (!function_exists('dhtmlspecialchars'))
-{
-
-    function dhtmlspecialchars($string, $flags = null)
-    {
-        if (is_array($string))
-        {
-            foreach ($string as $key => $val)
-            {
-                $string[$key] = dhtmlspecialchars($val, $flags);
-            }
-        }
-        else
-        {
-            if ($flags === null)
-            {
-                $string = str_replace(array('&', '"', '<', '>'), array('&', '"', '<', '>'), $string);
-                if (strpos($string, '&#') !== false)
-                {
-                    $string = preg_replace('/&((#(\d{3,5}|x[a-fA-F0-9]{4}));)/', '&\\1', $string);
-                }
-            }
-            else
-            {
-                if (PHP_VERSION < '5.4.0')
-                {
-                    $string = htmlspecialchars($string, $flags);
-                }
-                else
-                {
-                    if (strtolower(CHARSET) == 'utf-8')
-                    {
-                        $charset = 'UTF-8';
-                    }
-                    else
-                    {
-                        $charset = 'ISO-8859-1';
-                    }
-                    $string = htmlspecialchars($string, $flags, $charset);
-                }
-            }
-        }
-        return $string;
-    }
-
-}
-
-if (!function_exists('fsocketopen'))
-{
-
-    function fsocketopen($hostname, $port = 80, &$errno, &$errstr, $timeout = 15)
-    {
-        $fp = '';
-        if (function_exists('fsockopen'))
-        {
-            $fp = @fsockopen($hostname, $port, $errno, $errstr, $timeout);
-        }
-        elseif (function_exists('pfsockopen'))
-        {
-            $fp = @pfsockopen($hostname, $port, $errno, $errstr, $timeout);
-        }
-        elseif (function_exists('stream_socket_client'))
-        {
-            $fp = @stream_socket_client($hostname . ':' . $port, $errno, $errstr, $timeout);
-        }
-        return $fp;
-    }
-
-}
-
-function uc_stripslashes($string)
-{
-    !defined('MAGIC_QUOTES_GPC') && define('MAGIC_QUOTES_GPC', get_magic_quotes_gpc());
-    if (MAGIC_QUOTES_GPC)
-    {
-        return stripslashes($string);
-    }
-    else
-    {
-        return $string;
-    }
-}
-
-// 采用POST请求形式
-function uc_api_post($module, $action, $arg = array())
-{
-    $s = $sep = '';
-    foreach ($arg as $k => $v)
-    {
-        $k = urlencode($k);
-        if (is_array($v))
-        {
-            $s2 = $sep2 = '';
-            foreach ($v as $k2 => $v2)
-            {
-                $k2 = urlencode($k2);
-                $s2 .= "$sep2{$k}[$k2]=" . urlencode(uc_stripslashes($v2));
-                $sep2 = '&';
-            }
-            $s .= $sep . $s2;
-        }
-        else
-        {
-            $s .= "$sep$k=" . urlencode(uc_stripslashes($v));
-        }
-        $sep = '&';
-    }
-    $postdata = uc_api_requestdata($module, $action, $s);
-    return uc_fopen2(UC_API . '/index.php', 500000, $postdata, '', TRUE, UC_IP, 20);
-}
-
-function uc_api_requestdata($module, $action, $arg = '', $extra = '')
-{
-    $input = uc_api_input($arg);
-    $post = "m=$module&a=$action&inajax=2&release=" . UC_CLIENT_RELEASE . "&input=$input&appid=" . UC_APPID . $extra;
-    return $post;
-}
-
-function uc_api_url($module, $action, $arg = '', $extra = '')
-{
-    $url = UC_API . '/index.php?' . uc_api_requestdata($module, $action, $arg, $extra);
-    return $url;
-}
-
-function uc_api_input($data)
-{
-    $s = urlencode(uc_authcode($data . '&agent=' . md5($_SERVER['HTTP_USER_AGENT']) . "&time=" . time(), 'ENCODE', UC_KEY));
-    return $s;
-}
-
-// 直连数据库的形式
-function uc_api_mysql($model, $action, $args = array())
-{
-    global $uc_controls;
-    if (empty($uc_controls[$model]))
-    {
-        // 优先使用mysqli
-        if (function_exists("mysqli_connect"))
-        {
-            include_once UC_ROOT . './lib/dbi.class.php';
-        }
-        else
-        {
-            include_once UC_ROOT . './lib/db.class.php';
-        }
-        include_once UC_ROOT . './model/base.php';
-        include_once UC_ROOT . "./control/$model.php";
-        $classname = $model . 'control';
-        $uc_controls[$model] = new $classname();
-    }
-    if ($action{0} != '_')
-    {
-        $args = uc_addslashes($args, 1, TRUE);
-        $action = 'on' . $action;
-        $uc_controls[$model]->input = $args;
-        return $uc_controls[$model]->$action($args);
-    }
-    else
-    {
-        return '';
-    }
-}
-
-function uc_serialize($arr, $htmlon = 0)
-{
-    include_once UC_ROOT . './lib/xml.class.php';
-    return xml_serialize($arr, $htmlon);
-}
-
-function uc_unserialize($s)
-{
-    include_once UC_ROOT . './lib/xml.class.php';
-    return @xml_unserialize($s);
-}
-
-function uc_authcode($string, $operation = 'DECODE', $key = '', $expiry = 0)
-{
-
-    $ckey_length = 4;
-
-    $key = md5($key ? $key : UC_KEY);
-    $keya = md5(substr($key, 0, 16));
-    $keyb = md5(substr($key, 16, 16));
-    $keyc = $ckey_length ? ($operation == 'DECODE' ? substr($string, 0, $ckey_length) : substr(md5(microtime()), -$ckey_length)) : '';
-
-    $cryptkey = $keya . md5($keya . $keyc);
-    $key_length = strlen($cryptkey);
-
-    $string = $operation == 'DECODE' ? base64_decode(substr($string, $ckey_length)) : sprintf('%010d', $expiry ? $expiry + time() : 0) . substr(md5($string . $keyb), 0, 16) . $string;
-    $string_length = strlen($string);
-
-    $result = '';
-    $box = range(0, 255);
-
-    $rndkey = array();
-    for ($i = 0; $i <= 255; $i++)
-    {
-        $rndkey[$i] = ord($cryptkey[$i % $key_length]);
-    }
-
-    for ($j = $i = 0; $i < 256; $i++)
-    {
-        $j = ($j + $box[$i] + $rndkey[$i]) % 256;
-        $tmp = $box[$i];
-        $box[$i] = $box[$j];
-        $box[$j] = $tmp;
-    }
-
-    for ($a = $j = $i = 0; $i < $string_length; $i++)
-    {
-        $a = ($a + 1) % 256;
-        $j = ($j + $box[$a]) % 256;
-        $tmp = $box[$a];
-        $box[$a] = $box[$j];
-        $box[$j] = $tmp;
-        $result .= chr(ord($string[$i]) ^ ($box[($box[$a] + $box[$j]) % 256]));
-    }
-
-    if ($operation == 'DECODE')
-    {
-        if ((substr($result, 0, 10) == 0 || substr($result, 0, 10) - time() > 0) && substr($result, 10, 16) == substr(md5(substr($result, 26) . $keyb), 0, 16))
-        {
-            return substr($result, 26);
-        }
-        else
-        {
-            return '';
-        }
-    }
-    else
-    {
-        return $keyc . str_replace('=', '', base64_encode($result));
-    }
-}
-
-function uc_fopen2($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE)
-{
-    $__times__ = isset($_GET['__times__']) ? intval($_GET['__times__']) + 1 : 1;
-    if ($__times__ > 2)
-    {
-        return '';
-    }
-    $url .= (strpos($url, '?') === FALSE ? '?' : '&') . "__times__=$__times__";
-    return uc_fopen($url, $limit, $post, $cookie, $bysocket, $ip, $timeout, $block);
-}
-
-function uc_fopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE)
-{
-    $return = '';
-    $matches = parse_url($url);
-    !isset($matches['scheme']) && $matches['scheme'] = '';
-    !isset($matches['host']) && $matches['host'] = '';
-    !isset($matches['path']) && $matches['path'] = '';
-    !isset($matches['query']) && $matches['query'] = '';
-    !isset($matches['port']) && $matches['port'] = '';
-    $scheme = $matches['scheme'];
-    $host = $matches['host'];
-    $path = $matches['path'] ? $matches['path'] . ($matches['query'] ? '?' . $matches['query'] : '') : '/';
-    $port = !empty($matches['port']) ? $matches['port'] : 80;
-    if ($post)
-    {
-        $out = "POST $path HTTP/1.0\r\n";
-        $header = "Accept: */*\r\n";
-        $header .= "Accept-Language: zh-cn\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "User-Agent: {$_SERVER['HTTP_USER_AGENT']}\r\n";
-        $header .= "Host: $host\r\n";
-        $header .= 'Content-Length: ' . strlen($post) . "\r\n";
-        $header .= "Connection: Close\r\n";
-        $header .= "Cache-Control: no-cache\r\n";
-        $header .= "Cookie: $cookie\r\n\r\n";
-        $out .= $header . $post;
-    }
-    else
-    {
-        $out = "GET $path HTTP/1.0\r\n";
-        $header = "Accept: */*\r\n";
-        $header .= "Accept-Language: zh-cn\r\n";
-        $header .= "User-Agent: {$_SERVER['HTTP_USER_AGENT']}\r\n";
-        $header .= "Host: $host\r\n";
-        $header .= "Connection: Close\r\n";
-        $header .= "Cookie: $cookie\r\n\r\n";
-        $out .= $header;
-    }
-    $fpflag = 0;
-    if (!$fp = @fsocketopen(($ip ? $ip : $host), $port, $errno, $errstr, $timeout))
-    {
-        $context = array(
-            'http' => array(
-                'method'  => $post ? 'POST' : 'GET',
-                'header'  => $header,
-                'content' => $post,
-                'timeout' => $timeout,
-            ),
-        );
-        $context = stream_context_create($context);
-        $fp = @fopen($scheme . '://' . ($ip ? $ip : $host) . ':' . $port . $path, 'b', false, $context);
-        $fpflag = 1;
-    }
-    if (!$fp)
-    {
-        return '';
-    }
-    else
-    {
-        stream_set_blocking($fp, $block);
-        stream_set_timeout($fp, $timeout);
-        @fwrite($fp, $out);
-        $status = stream_get_meta_data($fp);
-        if (!$status['timed_out'])
-        {
-            while (!feof($fp) && !$fpflag)
-            {
-                if (($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n"))
-                {
-                    break;
-                }
-            }
-
-            $stop = false;
-            while (!feof($fp) && !$stop)
-            {
-                $data = fread($fp, ($limit == 0 || $limit > 8192 ? 8192 : $limit));
-                $return .= $data;
-                if ($limit)
-                {
-                    $limit -= strlen($data);
-                    $stop = $limit <= 0;
-                }
-            }
-        }
-        @fclose($fp);
-        return $return;
-    }
-}
-
-function uc_app_ls()
-{
-    $return = call_user_func(UC_API_FUNC, 'app', 'ls', array());
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_feed_add($icon, $uid, $username, $title_template = '', $title_data = '', $body_template = '', $body_data = '', $body_general = '', $target_ids = '', $images = array())
-{
-    return call_user_func(UC_API_FUNC, 'feed', 'add', array(
-        'icon'           => $icon,
-        'appid'          => UC_APPID,
-        'uid'            => $uid,
-        'username'       => $username,
-        'title_template' => $title_template,
-        'title_data'     => $title_data,
-        'body_template'  => $body_template,
-        'body_data'      => $body_data,
-        'body_general'   => $body_general,
-        'target_ids'     => $target_ids,
-        'image_1'        => $images[0]['url'],
-        'image_1_link'   => $images[0]['link'],
-        'image_2'        => $images[1]['url'],
-        'image_2_link'   => $images[1]['link'],
-        'image_3'        => $images[2]['url'],
-        'image_3_link'   => $images[2]['link'],
-        'image_4'        => $images[3]['url'],
-        'image_4_link'   => $images[3]['link']
-            )
-    );
-}
-
-function uc_feed_get($limit = 100, $delete = TRUE)
-{
-    $return = call_user_func(UC_API_FUNC, 'feed', 'get', array('limit' => $limit, 'delete' => $delete));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_friend_add($uid, $friendid, $comment = '')
-{
-    return call_user_func(UC_API_FUNC, 'friend', 'add', array('uid' => $uid, 'friendid' => $friendid, 'comment' => $comment));
-}
-
-function uc_friend_delete($uid, $friendids)
-{
-    return call_user_func(UC_API_FUNC, 'friend', 'delete', array('uid' => $uid, 'friendids' => $friendids));
-}
-
-function uc_friend_totalnum($uid, $direction = 0)
-{
-    return call_user_func(UC_API_FUNC, 'friend', 'totalnum', array('uid' => $uid, 'direction' => $direction));
-}
-
-function uc_friend_ls($uid, $page = 1, $pagesize = 10, $totalnum = 10, $direction = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'friend', 'ls', array('uid' => $uid, 'page' => $page, 'pagesize' => $pagesize, 'totalnum' => $totalnum, 'direction' => $direction));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_user_register($username, $password, $email = '', $mobile = '', $extend = [])
-{
-    return call_user_func(UC_API_FUNC, 'user', 'register', array('username' => $username, 'password' => $password, 'email' => $email, 'mobile' => $mobile, 'extend' => $extend));
-}
-
-function uc_user_login($username, $password, $isuid = 0, $extend = [])
-{
-    $isuid = intval($isuid);
-    $return = call_user_func(UC_API_FUNC, 'user', 'login', array('username' => $username, 'password' => $password, 'isuid' => $isuid, 'extend' => $extend));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-/**
- * 同步注册
- * @param int $uid
- * @param string $password
- * @return string
- */
-function uc_user_synregister($uid, $password)
-{
-    $uid = intval($uid);
-    if (@include UC_ROOT . './data/cache/apps.php')
-    {
-        if (count($_CACHE['apps']) > 1)
-        {
-            $return = uc_api_post('user', 'synregister', array('uid' => $uid, 'password' => $password));
-        }
-        else
-        {
-            $return = '';
-        }
-    }
-    return $return;
-}
-
-/**
- * 同步登录
- * @param int $uid
- * @return string
- */
-function uc_user_synlogin($uid)
-{
-    $uid = intval($uid);
-    if (@include UC_ROOT . './data/cache/apps.php')
-    {
-        if (count($_CACHE['apps']) > 1)
-        {
-            $return = uc_api_post('user', 'synlogin', array('uid' => $uid));
-        }
-        else
-        {
-            $return = '';
-        }
-    }
-    return $return;
-}
-
-/**
- * 同步退出
- * @return string
- */
-function uc_user_synlogout()
-{
-    if (@include UC_ROOT . './data/cache/apps.php')
-    {
-        if (count($_CACHE['apps']) > 1)
-        {
-            $return = uc_api_post('user', 'synlogout', array());
-        }
-        else
-        {
-            $return = '';
-        }
-    }
-    return $return;
-}
-
-/**
- * 修改用户信息
- * @param int $uid 会员ID
- * @param string $username 用户名
- * @param string $password 密码
- * @param string $email 邮箱
- * @param string $mobile 手机号
- * @param array $extend 扩展信息
- * @return type
- */
-function uc_user_edit($uid, $username, $password, $email = '', $mobile = '', $extend = [])
-{
-    return call_user_func(UC_API_FUNC, 'user', 'edit', array('uid' => $uid, 'username' => $username, 'password' => $password, 'email' => $email, 'mobile' => $mobile, 'extend' => $extend));
-}
-
-function uc_user_delete($uid)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'delete', array('uid' => $uid));
-}
-
-function uc_user_deleteavatar($uid)
-{
-    uc_api_post('user', 'deleteavatar', array('uid' => $uid));
-}
-
-function uc_user_checkname($username)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'check_username', array('username' => $username));
-}
-
-function uc_user_checkemail($email)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'check_email', array('email' => $email));
-}
-
-function uc_user_checkmobile($mobile)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'check_mobile', array('mobile' => $mobile));
-}
-
-function uc_user_addprotected($username, $admin = '')
-{
-    return call_user_func(UC_API_FUNC, 'user', 'addprotected', array('username' => $username, 'admin' => $admin));
-}
-
-function uc_user_deleteprotected($username)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'deleteprotected', array('username' => $username));
-}
-
-function uc_user_getprotected()
-{
-    $return = call_user_func(UC_API_FUNC, 'user', 'getprotected', array('1' => 1));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_get_user($username, $isuid = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'user', 'get_user', array('username' => $username, 'isuid' => $isuid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_user_merge($oldusername, $newusername, $uid, $password, $email)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'merge', array('oldusername' => $oldusername, 'newusername' => $newusername, 'uid' => $uid, 'password' => $password, 'email' => $email));
-}
-
-function uc_user_merge_remove($username)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'merge_remove', array('username' => $username));
-}
-
-function uc_user_getcredit($appid, $uid, $credit)
-{
-    return uc_api_post('user', 'getcredit', array('appid' => $appid, 'uid' => $uid, 'credit' => $credit));
-}
-
-function uc_user_logincheck($username, $ip)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'logincheck', array('username' => $username, 'ip' => $ip));
-}
-
-function uc_pm_location($uid, $newpm = 0)
-{
-    $apiurl = uc_api_url('pm_client', 'ls', "uid=$uid", ($newpm ? '&folder=newbox' : ''));
-    @header("Expires: 0");
-    @header("Cache-Control: private, post-check=0, pre-check=0, max-age=0", FALSE);
-    @header("Pragma: no-cache");
-    @header("location: $apiurl");
-}
-
-function uc_pm_checknew($uid, $more = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'pm', 'check_newpm', array('uid' => $uid, 'more' => $more));
-    return (!$more || UC_CONNECT == 'mysql') ? $return : uc_unserialize($return);
-}
-
-function uc_pm_send($fromuid, $msgto, $subject, $message, $instantly = 1, $replypmid = 0, $isusername = 0, $type = 0)
-{
-    if ($instantly)
-    {
-        $replypmid = @is_numeric($replypmid) ? $replypmid : 0;
-        return call_user_func(UC_API_FUNC, 'pm', 'sendpm', array('fromuid' => $fromuid, 'msgto' => $msgto, 'subject' => $subject, 'message' => $message, 'replypmid' => $replypmid, 'isusername' => $isusername, 'type' => $type));
-    }
-    else
-    {
-        $fromuid = intval($fromuid);
-        $subject = rawurlencode($subject);
-        $msgto = rawurlencode($msgto);
-        $message = rawurlencode($message);
-        $replypmid = @is_numeric($replypmid) ? $replypmid : 0;
-        $replyadd = $replypmid ? "&pmid=$replypmid&do=reply" : '';
-        $apiurl = uc_api_url('pm_client', 'send', "uid=$fromuid", "&msgto=$msgto&subject=$subject&message=$message$replyadd");
-        @header("Expires: 0");
-        @header("Cache-Control: private, post-check=0, pre-check=0, max-age=0", FALSE);
-        @header("Pragma: no-cache");
-        @header("location: " . $apiurl);
-    }
-}
-
-function uc_pm_delete($uid, $folder, $pmids)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'delete', array('uid' => $uid, 'pmids' => $pmids));
-}
-
-function uc_pm_deleteuser($uid, $touids)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'deleteuser', array('uid' => $uid, 'touids' => $touids));
-}
-
-function uc_pm_deletechat($uid, $plids, $type = 0)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'deletechat', array('uid' => $uid, 'plids' => $plids, 'type' => $type));
-}
-
-function uc_pm_readstatus($uid, $uids, $plids = array(), $status = 0)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'readstatus', array('uid' => $uid, 'uids' => $uids, 'plids' => $plids, 'status' => $status));
-}
-
-function uc_pm_list($uid, $page = 1, $pagesize = 10, $folder = 'inbox', $filter = 'newpm', $msglen = 0)
-{
-    $uid = intval($uid);
-    $page = intval($page);
-    $pagesize = intval($pagesize);
-    $return = call_user_func(UC_API_FUNC, 'pm', 'ls', array('uid' => $uid, 'page' => $page, 'pagesize' => $pagesize, 'filter' => $filter, 'msglen' => $msglen));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_ignore($uid)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'ignore', array('uid' => $uid));
-}
-
-function uc_pm_view($uid, $pmid = 0, $touid = 0, $daterange = 1, $page = 0, $pagesize = 10, $type = 0, $isplid = 0)
-{
-    $uid = intval($uid);
-    $touid = intval($touid);
-    $page = intval($page);
-    $pagesize = intval($pagesize);
-    $pmid = @is_numeric($pmid) ? $pmid : 0;
-    $return = call_user_func(UC_API_FUNC, 'pm', 'view', array('uid' => $uid, 'pmid' => $pmid, 'touid' => $touid, 'daterange' => $daterange, 'page' => $page, 'pagesize' => $pagesize, 'type' => $type, 'isplid' => $isplid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_view_num($uid, $touid, $isplid)
-{
-    $uid = intval($uid);
-    $touid = intval($touid);
-    $isplid = intval($isplid);
-    return call_user_func(UC_API_FUNC, 'pm', 'viewnum', array('uid' => $uid, 'touid' => $touid, 'isplid' => $isplid));
-}
-
-function uc_pm_viewnode($uid, $type, $pmid)
-{
-    $uid = intval($uid);
-    $type = intval($type);
-    $pmid = @is_numeric($pmid) ? $pmid : 0;
-    $return = call_user_func(UC_API_FUNC, 'pm', 'viewnode', array('uid' => $uid, 'type' => $type, 'pmid' => $pmid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_chatpmmemberlist($uid, $plid = 0)
-{
-    $uid = intval($uid);
-    $plid = intval($plid);
-    $return = call_user_func(UC_API_FUNC, 'pm', 'chatpmmemberlist', array('uid' => $uid, 'plid' => $plid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_kickchatpm($plid, $uid, $touid)
-{
-    $uid = intval($uid);
-    $plid = intval($plid);
-    $touid = intval($touid);
-    return call_user_func(UC_API_FUNC, 'pm', 'kickchatpm', array('uid' => $uid, 'plid' => $plid, 'touid' => $touid));
-}
-
-function uc_pm_appendchatpm($plid, $uid, $touid)
-{
-    $uid = intval($uid);
-    $plid = intval($plid);
-    $touid = intval($touid);
-    return call_user_func(UC_API_FUNC, 'pm', 'appendchatpm', array('uid' => $uid, 'plid' => $plid, 'touid' => $touid));
-}
-
-function uc_pm_blackls_get($uid)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_get', array('uid' => $uid));
-}
-
-function uc_pm_blackls_set($uid, $blackls)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_set', array('uid' => $uid, 'blackls' => $blackls));
-}
-
-function uc_pm_blackls_add($uid, $username)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_add', array('uid' => $uid, 'username' => $username));
-}
-
-function uc_pm_blackls_delete($uid, $username)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_delete', array('uid' => $uid, 'username' => $username));
-}
-
-function uc_domain_ls()
-{
-    $return = call_user_func(UC_API_FUNC, 'domain', 'ls', array('1' => 1));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_credit_exchange_request($uid, $from, $to, $toappid, $amount)
-{
-    $uid = intval($uid);
-    $from = intval($from);
-    $toappid = intval($toappid);
-    $to = intval($to);
-    $amount = intval($amount);
-    return uc_api_post('credit', 'request', array('uid' => $uid, 'from' => $from, 'to' => $to, 'toappid' => $toappid, 'amount' => $amount));
-}
-
-function uc_tag_get($tagname, $nums = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'tag', 'gettag', array('tagname' => $tagname, 'nums' => $nums));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_avatar($uid, $type = 'virtual', $returnhtml = 1)
-{
-    $uid = intval($uid);
-    $uc_input = uc_api_input("uid=$uid");
-    $uc_avatarflash = UC_API . '/images/camera.swf?inajax=1&appid=' . UC_APPID . '&input=' . $uc_input . '&agent=' . md5($_SERVER['HTTP_USER_AGENT']) . '&ucapi=' . urlencode(str_replace('http://', '', UC_API)) . '&avatartype=' . $type . '&uploadSize=2048';
-    if ($returnhtml)
-    {
-        return '
-			
-			
-			
-			
-			
-			
-			
-			
-		';
-    }
-    else
-    {
-        return array(
-            'width', '450',
-            'height', '253',
-            'scale', 'exactfit',
-            'src', $uc_avatarflash,
-            'id', 'mycamera',
-            'name', 'mycamera',
-            'quality', 'high',
-            'bgcolor', '#ffffff',
-            'menu', 'false',
-            'swLiveConnect', 'true',
-            'allowScriptAccess', 'always'
-        );
-    }
-}
-
-function uc_mail_queue($uids, $emails, $subject, $message, $frommail = '', $charset = 'gbk', $htmlon = FALSE, $level = 1)
-{
-    return call_user_func(UC_API_FUNC, 'mail', 'add', array('uids' => $uids, 'emails' => $emails, 'subject' => $subject, 'message' => $message, 'frommail' => $frommail, 'charset' => $charset, 'htmlon' => $htmlon, 'level' => $level));
-}
-
-function uc_check_avatar($uid, $size = 'middle', $type = 'virtual')
-{
-    $url = UC_API . "/avatar.php?uid=$uid&size=$size&type=$type&check_file_exists=1";
-    $res = uc_fopen2($url, 500000, '', '', TRUE, UC_IP, 20);
-    if ($res == 1)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-function uc_check_version()
-{
-    $return = uc_api_post('version', 'check', array());
-    $data = uc_unserialize($return);
-    return is_array($data) ? $data : $return;
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/app.php b/extend/fast/ucenter/client/uc_client/control/app.php
deleted file mode 100644
index dc66f54b..00000000
--- a/extend/fast/ucenter/client/uc_client/control/app.php
+++ /dev/null
@@ -1,63 +0,0 @@
-appcontrol();
-    }
-
-    function appcontrol()
-    {
-        parent::__construct();
-        $this->load('app');
-    }
-
-    function onls()
-    {
-        $this->init_input();
-        $applist = $_ENV['app']->get_apps('appid, type, name, url, tagtemplates, viewprourl, synlogin');
-        $applist2 = array();
-        foreach ($applist as $key => $app)
-        {
-            $app['tagtemplates'] = $this->unserialize($app['tagtemplates']);
-            $applist2[$app['appid']] = $app;
-        }
-        return $applist2;
-    }
-
-    function onadd()
-    {
-
-    }
-
-    function onucinfo()
-    {
-
-    }
-
-    function _random($length, $numeric = 0)
-    {
-
-    }
-
-    function _generate_key()
-    {
-
-    }
-
-    function _format_notedata($notedata)
-    {
-
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/cache.php b/extend/fast/ucenter/client/uc_client/control/cache.php
deleted file mode 100644
index e8a621c8..00000000
--- a/extend/fast/ucenter/client/uc_client/control/cache.php
+++ /dev/null
@@ -1,30 +0,0 @@
-cachecontrol();
-    }
-
-    function cachecontrol()
-    {
-        parent::__construct();
-    }
-
-    function onupdate($arr)
-    {
-        $this->load("cache");
-        $_ENV['cache']->updatedata();
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/client.php b/extend/fast/ucenter/client/uc_client/control/client.php
deleted file mode 100644
index 9536bca1..00000000
--- a/extend/fast/ucenter/client/uc_client/control/client.php
+++ /dev/null
@@ -1,817 +0,0 @@
- $val)
-            {
-                $string[$key] = uc_addslashes($val, $force, $strip);
-            }
-        }
-        else
-        {
-            $string = addslashes($strip ? stripslashes($string) : $string);
-        }
-    }
-    return $string;
-}
-
-if (!function_exists('daddslashes'))
-{
-
-    function daddslashes($string, $force = 0)
-    {
-        return uc_addslashes($string, $force);
-    }
-
-}
-
-if (!function_exists('dhtmlspecialchars'))
-{
-
-    function dhtmlspecialchars($string, $flags = null)
-    {
-        if (is_array($string))
-        {
-            foreach ($string as $key => $val)
-            {
-                $string[$key] = dhtmlspecialchars($val, $flags);
-            }
-        }
-        else
-        {
-            if ($flags === null)
-            {
-                $string = str_replace(array('&', '"', '<', '>'), array('&', '"', '<', '>'), $string);
-                if (strpos($string, '&#') !== false)
-                {
-                    $string = preg_replace('/&((#(\d{3,5}|x[a-fA-F0-9]{4}));)/', '&\\1', $string);
-                }
-            }
-            else
-            {
-                if (PHP_VERSION < '5.4.0')
-                {
-                    $string = htmlspecialchars($string, $flags);
-                }
-                else
-                {
-                    if (strtolower(CHARSET) == 'utf-8')
-                    {
-                        $charset = 'UTF-8';
-                    }
-                    else
-                    {
-                        $charset = 'ISO-8859-1';
-                    }
-                    $string = htmlspecialchars($string, $flags, $charset);
-                }
-            }
-        }
-        return $string;
-    }
-
-}
-
-if (!function_exists('fsocketopen'))
-{
-
-    function fsocketopen($hostname, $port = 80, &$errno, &$errstr, $timeout = 15)
-    {
-        $fp = '';
-        if (function_exists('fsockopen'))
-        {
-            $fp = @fsockopen($hostname, $port, $errno, $errstr, $timeout);
-        }
-        elseif (function_exists('pfsockopen'))
-        {
-            $fp = @pfsockopen($hostname, $port, $errno, $errstr, $timeout);
-        }
-        elseif (function_exists('stream_socket_client'))
-        {
-            $fp = @stream_socket_client($hostname . ':' . $port, $errno, $errstr, $timeout);
-        }
-        return $fp;
-    }
-
-}
-
-function uc_stripslashes($string)
-{
-    !defined('MAGIC_QUOTES_GPC') && define('MAGIC_QUOTES_GPC', get_magic_quotes_gpc());
-    if (MAGIC_QUOTES_GPC)
-    {
-        return stripslashes($string);
-    }
-    else
-    {
-        return $string;
-    }
-}
-
-// 采用POST请求形式
-function uc_api_post($module, $action, $arg = array())
-{
-    $s = $sep = '';
-    foreach ($arg as $k => $v)
-    {
-        $k = urlencode($k);
-        if (is_array($v))
-        {
-            $s2 = $sep2 = '';
-            foreach ($v as $k2 => $v2)
-            {
-                $k2 = urlencode($k2);
-                $s2 .= "$sep2{$k}[$k2]=" . urlencode(uc_stripslashes($v2));
-                $sep2 = '&';
-            }
-            $s .= $sep . $s2;
-        }
-        else
-        {
-            $s .= "$sep$k=" . urlencode(uc_stripslashes($v));
-        }
-        $sep = '&';
-    }
-    $postdata = uc_api_requestdata($module, $action, $s);
-    return uc_fopen2(UC_API . '/index.php', 500000, $postdata, '', TRUE, UC_IP, 20);
-}
-
-function uc_api_requestdata($module, $action, $arg = '', $extra = '')
-{
-    $input = uc_api_input($arg);
-    $post = "m=$module&a=$action&inajax=2&release=" . UC_CLIENT_RELEASE . "&input=$input&appid=" . UC_APPID . $extra;
-    return $post;
-}
-
-function uc_api_url($module, $action, $arg = '', $extra = '')
-{
-    $url = UC_API . '/index.php?' . uc_api_requestdata($module, $action, $arg, $extra);
-    return $url;
-}
-
-function uc_api_input($data)
-{
-    $s = urlencode(uc_authcode($data . '&agent=' . md5($_SERVER['HTTP_USER_AGENT']) . "&time=" . time(), 'ENCODE', UC_KEY));
-    return $s;
-}
-
-// 直连数据库的形式
-function uc_api_mysql($model, $action, $args = array())
-{
-    global $uc_controls;
-    if (empty($uc_controls[$model]))
-    {
-        // 优先使用mysqli
-        if (function_exists("mysqli_connect"))
-        {
-            include_once UC_ROOT . './lib/dbi.class.php';
-        }
-        else
-        {
-            include_once UC_ROOT . './lib/db.class.php';
-        }
-        include_once UC_ROOT . './model/base.php';
-        include_once UC_ROOT . "./control/$model.php";
-        $classname = $model . 'control';
-        $uc_controls[$model] = new $classname();
-    }
-    if ($action{0} != '_')
-    {
-        $args = uc_addslashes($args, 1, TRUE);
-        $action = 'on' . $action;
-        $uc_controls[$model]->input = $args;
-        return $uc_controls[$model]->$action($args);
-    }
-    else
-    {
-        return '';
-    }
-}
-
-function uc_serialize($arr, $htmlon = 0)
-{
-    include_once UC_ROOT . './lib/xml.class.php';
-    return xml_serialize($arr, $htmlon);
-}
-
-function uc_unserialize($s)
-{
-    include_once UC_ROOT . './lib/xml.class.php';
-    return @xml_unserialize($s);
-}
-
-function uc_authcode($string, $operation = 'DECODE', $key = '', $expiry = 0)
-{
-
-    $ckey_length = 4;
-
-    $key = md5($key ? $key : UC_KEY);
-    $keya = md5(substr($key, 0, 16));
-    $keyb = md5(substr($key, 16, 16));
-    $keyc = $ckey_length ? ($operation == 'DECODE' ? substr($string, 0, $ckey_length) : substr(md5(microtime()), -$ckey_length)) : '';
-
-    $cryptkey = $keya . md5($keya . $keyc);
-    $key_length = strlen($cryptkey);
-
-    $string = $operation == 'DECODE' ? base64_decode(substr($string, $ckey_length)) : sprintf('%010d', $expiry ? $expiry + time() : 0) . substr(md5($string . $keyb), 0, 16) . $string;
-    $string_length = strlen($string);
-
-    $result = '';
-    $box = range(0, 255);
-
-    $rndkey = array();
-    for ($i = 0; $i <= 255; $i++)
-    {
-        $rndkey[$i] = ord($cryptkey[$i % $key_length]);
-    }
-
-    for ($j = $i = 0; $i < 256; $i++)
-    {
-        $j = ($j + $box[$i] + $rndkey[$i]) % 256;
-        $tmp = $box[$i];
-        $box[$i] = $box[$j];
-        $box[$j] = $tmp;
-    }
-
-    for ($a = $j = $i = 0; $i < $string_length; $i++)
-    {
-        $a = ($a + 1) % 256;
-        $j = ($j + $box[$a]) % 256;
-        $tmp = $box[$a];
-        $box[$a] = $box[$j];
-        $box[$j] = $tmp;
-        $result .= chr(ord($string[$i]) ^ ($box[($box[$a] + $box[$j]) % 256]));
-    }
-
-    if ($operation == 'DECODE')
-    {
-        if ((substr($result, 0, 10) == 0 || substr($result, 0, 10) - time() > 0) && substr($result, 10, 16) == substr(md5(substr($result, 26) . $keyb), 0, 16))
-        {
-            return substr($result, 26);
-        }
-        else
-        {
-            return '';
-        }
-    }
-    else
-    {
-        return $keyc . str_replace('=', '', base64_encode($result));
-    }
-}
-
-function uc_fopen2($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE)
-{
-    $__times__ = isset($_GET['__times__']) ? intval($_GET['__times__']) + 1 : 1;
-    if ($__times__ > 2)
-    {
-        return '';
-    }
-    $url .= (strpos($url, '?') === FALSE ? '?' : '&') . "__times__=$__times__";
-    return uc_fopen($url, $limit, $post, $cookie, $bysocket, $ip, $timeout, $block);
-}
-
-function uc_fopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE)
-{
-    $return = '';
-    $matches = parse_url($url);
-    !isset($matches['scheme']) && $matches['scheme'] = '';
-    !isset($matches['host']) && $matches['host'] = '';
-    !isset($matches['path']) && $matches['path'] = '';
-    !isset($matches['query']) && $matches['query'] = '';
-    !isset($matches['port']) && $matches['port'] = '';
-    $scheme = $matches['scheme'];
-    $host = $matches['host'];
-    $path = $matches['path'] ? $matches['path'] . ($matches['query'] ? '?' . $matches['query'] : '') : '/';
-    $port = !empty($matches['port']) ? $matches['port'] : 80;
-    if ($post)
-    {
-        $out = "POST $path HTTP/1.0\r\n";
-        $header = "Accept: */*\r\n";
-        $header .= "Accept-Language: zh-cn\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n";
-        $header .= "Host: $host\r\n";
-        $header .= 'Content-Length: ' . strlen($post) . "\r\n";
-        $header .= "Connection: Close\r\n";
-        $header .= "Cache-Control: no-cache\r\n";
-        $header .= "Cookie: $cookie\r\n\r\n";
-        $out .= $header . $post;
-    }
-    else
-    {
-        $out = "GET $path HTTP/1.0\r\n";
-        $header = "Accept: */*\r\n";
-        $header .= "Accept-Language: zh-cn\r\n";
-        $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n";
-        $header .= "Host: $host\r\n";
-        $header .= "Connection: Close\r\n";
-        $header .= "Cookie: $cookie\r\n\r\n";
-        $out .= $header;
-    }
-
-    $fpflag = 0;
-    if (!$fp = @fsocketopen(($ip ? $ip : $host), $port, $errno, $errstr, $timeout))
-    {
-        $context = array(
-            'http' => array(
-                'method'  => $post ? 'POST' : 'GET',
-                'header'  => $header,
-                'content' => $post,
-                'timeout' => $timeout,
-            ),
-        );
-        $context = stream_context_create($context);
-        $fp = @fopen($scheme . '://' . ($ip ? $ip : $host) . ':' . $port . $path, 'b', false, $context);
-        $fpflag = 1;
-    }
-
-    if (!$fp)
-    {
-        return '';
-    }
-    else
-    {
-        stream_set_blocking($fp, $block);
-        stream_set_timeout($fp, $timeout);
-        @fwrite($fp, $out);
-        $status = stream_get_meta_data($fp);
-        if (!$status['timed_out'])
-        {
-            while (!feof($fp) && !$fpflag)
-            {
-                if (($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n"))
-                {
-                    break;
-                }
-            }
-
-            $stop = false;
-            while (!feof($fp) && !$stop)
-            {
-                $data = fread($fp, ($limit == 0 || $limit > 8192 ? 8192 : $limit));
-                $return .= $data;
-                if ($limit)
-                {
-                    $limit -= strlen($data);
-                    $stop = $limit <= 0;
-                }
-            }
-        }
-        @fclose($fp);
-        return $return;
-    }
-}
-
-function uc_app_ls()
-{
-    $return = call_user_func(UC_API_FUNC, 'app', 'ls', array());
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_feed_add($icon, $uid, $username, $title_template = '', $title_data = '', $body_template = '', $body_data = '', $body_general = '', $target_ids = '', $images = array())
-{
-    return call_user_func(UC_API_FUNC, 'feed', 'add', array(
-        'icon'           => $icon,
-        'appid'          => UC_APPID,
-        'uid'            => $uid,
-        'username'       => $username,
-        'title_template' => $title_template,
-        'title_data'     => $title_data,
-        'body_template'  => $body_template,
-        'body_data'      => $body_data,
-        'body_general'   => $body_general,
-        'target_ids'     => $target_ids,
-        'image_1'        => $images[0]['url'],
-        'image_1_link'   => $images[0]['link'],
-        'image_2'        => $images[1]['url'],
-        'image_2_link'   => $images[1]['link'],
-        'image_3'        => $images[2]['url'],
-        'image_3_link'   => $images[2]['link'],
-        'image_4'        => $images[3]['url'],
-        'image_4_link'   => $images[3]['link']
-            )
-    );
-}
-
-function uc_feed_get($limit = 100, $delete = TRUE)
-{
-    $return = call_user_func(UC_API_FUNC, 'feed', 'get', array('limit' => $limit, 'delete' => $delete));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_friend_add($uid, $friendid, $comment = '')
-{
-    return call_user_func(UC_API_FUNC, 'friend', 'add', array('uid' => $uid, 'friendid' => $friendid, 'comment' => $comment));
-}
-
-function uc_friend_delete($uid, $friendids)
-{
-    return call_user_func(UC_API_FUNC, 'friend', 'delete', array('uid' => $uid, 'friendids' => $friendids));
-}
-
-function uc_friend_totalnum($uid, $direction = 0)
-{
-    return call_user_func(UC_API_FUNC, 'friend', 'totalnum', array('uid' => $uid, 'direction' => $direction));
-}
-
-function uc_friend_ls($uid, $page = 1, $pagesize = 10, $totalnum = 10, $direction = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'friend', 'ls', array('uid' => $uid, 'page' => $page, 'pagesize' => $pagesize, 'totalnum' => $totalnum, 'direction' => $direction));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_user_register($username, $password, $email = '', $mobile = '', $extend = [])
-{
-    return call_user_func(UC_API_FUNC, 'user', 'register', array('username' => $username, 'password' => $password, 'email' => $email, 'mobile' => $mobile, 'extend' => $extend));
-}
-
-function uc_user_login($username, $password, $isuid = 0, $extend = [])
-{
-    $isuid = intval($isuid);
-    $return = call_user_func(UC_API_FUNC, 'user', 'login', array('username' => $username, 'password' => $password, 'isuid' => $isuid, 'extend' => $extend));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_user_synregister($uid, $password)
-{
-    $uid = intval($uid);
-    if (@include UC_ROOT . './data/cache/apps.php')
-    {
-        if (count($_CACHE['apps']) > 1)
-        {
-            $return = uc_api_post('user', 'synregister', array('uid' => $uid, 'password' => $password));
-        }
-        else
-        {
-            $return = '';
-        }
-    }
-    return $return;
-}
-
-function uc_user_synlogin($uid)
-{
-    $uid = intval($uid);
-    if (@include UC_ROOT . './data/cache/apps.php')
-    {
-        if (count($_CACHE['apps']) > 1)
-        {
-            $return = uc_api_post('user', 'synlogin', array('uid' => $uid));
-        }
-        else
-        {
-            $return = '';
-        }
-    }
-    return $return;
-}
-
-function uc_user_synlogout()
-{
-    if (@include UC_ROOT . './data/cache/apps.php')
-    {
-        if (count($_CACHE['apps']) > 1)
-        {
-            $return = uc_api_post('user', 'synlogout', array());
-        }
-        else
-        {
-            $return = '';
-        }
-    }
-    return $return;
-}
-
-function uc_user_edit($uid, $username, $password, $email = '', $mobile = '', $extend = [])
-{
-    return call_user_func(UC_API_FUNC, 'user', 'edit', array('uid' => $uid, 'username' => $username, 'password' => $password, 'email' => $email, 'mobile' => $mobile, 'extend' => $extend));
-}
-
-function uc_user_delete($uid)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'delete', array('uid' => $uid));
-}
-
-function uc_user_deleteavatar($uid)
-{
-    uc_api_post('user', 'deleteavatar', array('uid' => $uid));
-}
-
-function uc_user_checkname($username)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'check_username', array('username' => $username));
-}
-
-function uc_user_checkemail($email)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'check_email', array('email' => $email));
-}
-
-function uc_user_checkmobile($mobile)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'check_mobile', array('mobile' => $mobile));
-}
-
-function uc_user_addprotected($username, $admin = '')
-{
-    return call_user_func(UC_API_FUNC, 'user', 'addprotected', array('username' => $username, 'admin' => $admin));
-}
-
-function uc_user_deleteprotected($username)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'deleteprotected', array('username' => $username));
-}
-
-function uc_user_getprotected()
-{
-    $return = call_user_func(UC_API_FUNC, 'user', 'getprotected', array('1' => 1));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_get_user($username, $isuid = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'user', 'get_user', array('username' => $username, 'isuid' => $isuid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_user_merge($oldusername, $newusername, $uid, $password, $email)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'merge', array('oldusername' => $oldusername, 'newusername' => $newusername, 'uid' => $uid, 'password' => $password, 'email' => $email));
-}
-
-function uc_user_merge_remove($username)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'merge_remove', array('username' => $username));
-}
-
-function uc_user_getcredit($appid, $uid, $credit)
-{
-    return uc_api_post('user', 'getcredit', array('appid' => $appid, 'uid' => $uid, 'credit' => $credit));
-}
-
-function uc_user_logincheck($username, $ip)
-{
-    return call_user_func(UC_API_FUNC, 'user', 'logincheck', array('username' => $username, 'ip' => $ip));
-}
-
-function uc_pm_location($uid, $newpm = 0)
-{
-    $apiurl = uc_api_url('pm_client', 'ls', "uid=$uid", ($newpm ? '&folder=newbox' : ''));
-    @header("Expires: 0");
-    @header("Cache-Control: private, post-check=0, pre-check=0, max-age=0", FALSE);
-    @header("Pragma: no-cache");
-    @header("location: $apiurl");
-}
-
-function uc_pm_checknew($uid, $more = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'pm', 'check_newpm', array('uid' => $uid, 'more' => $more));
-    return (!$more || UC_CONNECT == 'mysql') ? $return : uc_unserialize($return);
-}
-
-function uc_pm_send($fromuid, $msgto, $subject, $message, $instantly = 1, $replypmid = 0, $isusername = 0, $type = 0)
-{
-    if ($instantly)
-    {
-        $replypmid = @is_numeric($replypmid) ? $replypmid : 0;
-        return call_user_func(UC_API_FUNC, 'pm', 'sendpm', array('fromuid' => $fromuid, 'msgto' => $msgto, 'subject' => $subject, 'message' => $message, 'replypmid' => $replypmid, 'isusername' => $isusername, 'type' => $type));
-    }
-    else
-    {
-        $fromuid = intval($fromuid);
-        $subject = rawurlencode($subject);
-        $msgto = rawurlencode($msgto);
-        $message = rawurlencode($message);
-        $replypmid = @is_numeric($replypmid) ? $replypmid : 0;
-        $replyadd = $replypmid ? "&pmid=$replypmid&do=reply" : '';
-        $apiurl = uc_api_url('pm_client', 'send', "uid=$fromuid", "&msgto=$msgto&subject=$subject&message=$message$replyadd");
-        @header("Expires: 0");
-        @header("Cache-Control: private, post-check=0, pre-check=0, max-age=0", FALSE);
-        @header("Pragma: no-cache");
-        @header("location: " . $apiurl);
-    }
-}
-
-function uc_pm_delete($uid, $folder, $pmids)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'delete', array('uid' => $uid, 'pmids' => $pmids));
-}
-
-function uc_pm_deleteuser($uid, $touids)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'deleteuser', array('uid' => $uid, 'touids' => $touids));
-}
-
-function uc_pm_deletechat($uid, $plids, $type = 0)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'deletechat', array('uid' => $uid, 'plids' => $plids, 'type' => $type));
-}
-
-function uc_pm_readstatus($uid, $uids, $plids = array(), $status = 0)
-{
-    return call_user_func(UC_API_FUNC, 'pm', 'readstatus', array('uid' => $uid, 'uids' => $uids, 'plids' => $plids, 'status' => $status));
-}
-
-function uc_pm_list($uid, $page = 1, $pagesize = 10, $folder = 'inbox', $filter = 'newpm', $msglen = 0)
-{
-    $uid = intval($uid);
-    $page = intval($page);
-    $pagesize = intval($pagesize);
-    $return = call_user_func(UC_API_FUNC, 'pm', 'ls', array('uid' => $uid, 'page' => $page, 'pagesize' => $pagesize, 'filter' => $filter, 'msglen' => $msglen));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_ignore($uid)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'ignore', array('uid' => $uid));
-}
-
-function uc_pm_view($uid, $pmid = 0, $touid = 0, $daterange = 1, $page = 0, $pagesize = 10, $type = 0, $isplid = 0)
-{
-    $uid = intval($uid);
-    $touid = intval($touid);
-    $page = intval($page);
-    $pagesize = intval($pagesize);
-    $pmid = @is_numeric($pmid) ? $pmid : 0;
-    $return = call_user_func(UC_API_FUNC, 'pm', 'view', array('uid' => $uid, 'pmid' => $pmid, 'touid' => $touid, 'daterange' => $daterange, 'page' => $page, 'pagesize' => $pagesize, 'type' => $type, 'isplid' => $isplid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_view_num($uid, $touid, $isplid)
-{
-    $uid = intval($uid);
-    $touid = intval($touid);
-    $isplid = intval($isplid);
-    return call_user_func(UC_API_FUNC, 'pm', 'viewnum', array('uid' => $uid, 'touid' => $touid, 'isplid' => $isplid));
-}
-
-function uc_pm_viewnode($uid, $type, $pmid)
-{
-    $uid = intval($uid);
-    $type = intval($type);
-    $pmid = @is_numeric($pmid) ? $pmid : 0;
-    $return = call_user_func(UC_API_FUNC, 'pm', 'viewnode', array('uid' => $uid, 'type' => $type, 'pmid' => $pmid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_chatpmmemberlist($uid, $plid = 0)
-{
-    $uid = intval($uid);
-    $plid = intval($plid);
-    $return = call_user_func(UC_API_FUNC, 'pm', 'chatpmmemberlist', array('uid' => $uid, 'plid' => $plid));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_pm_kickchatpm($plid, $uid, $touid)
-{
-    $uid = intval($uid);
-    $plid = intval($plid);
-    $touid = intval($touid);
-    return call_user_func(UC_API_FUNC, 'pm', 'kickchatpm', array('uid' => $uid, 'plid' => $plid, 'touid' => $touid));
-}
-
-function uc_pm_appendchatpm($plid, $uid, $touid)
-{
-    $uid = intval($uid);
-    $plid = intval($plid);
-    $touid = intval($touid);
-    return call_user_func(UC_API_FUNC, 'pm', 'appendchatpm', array('uid' => $uid, 'plid' => $plid, 'touid' => $touid));
-}
-
-function uc_pm_blackls_get($uid)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_get', array('uid' => $uid));
-}
-
-function uc_pm_blackls_set($uid, $blackls)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_set', array('uid' => $uid, 'blackls' => $blackls));
-}
-
-function uc_pm_blackls_add($uid, $username)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_add', array('uid' => $uid, 'username' => $username));
-}
-
-function uc_pm_blackls_delete($uid, $username)
-{
-    $uid = intval($uid);
-    return call_user_func(UC_API_FUNC, 'pm', 'blackls_delete', array('uid' => $uid, 'username' => $username));
-}
-
-function uc_domain_ls()
-{
-    $return = call_user_func(UC_API_FUNC, 'domain', 'ls', array('1' => 1));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_credit_exchange_request($uid, $from, $to, $toappid, $amount)
-{
-    $uid = intval($uid);
-    $from = intval($from);
-    $toappid = intval($toappid);
-    $to = intval($to);
-    $amount = intval($amount);
-    return uc_api_post('credit', 'request', array('uid' => $uid, 'from' => $from, 'to' => $to, 'toappid' => $toappid, 'amount' => $amount));
-}
-
-function uc_tag_get($tagname, $nums = 0)
-{
-    $return = call_user_func(UC_API_FUNC, 'tag', 'gettag', array('tagname' => $tagname, 'nums' => $nums));
-    return UC_CONNECT == 'mysql' ? $return : uc_unserialize($return);
-}
-
-function uc_avatar($uid, $type = 'virtual', $returnhtml = 1)
-{
-    $uid = intval($uid);
-    $uc_input = uc_api_input("uid=$uid");
-    $uc_avatarflash = UC_API . '/images/camera.swf?inajax=1&appid=' . UC_APPID . '&input=' . $uc_input . '&agent=' . md5($_SERVER['HTTP_USER_AGENT']) . '&ucapi=' . urlencode(str_replace('http://', '', UC_API)) . '&avatartype=' . $type . '&uploadSize=2048';
-    if ($returnhtml)
-    {
-        return '
-			
-			
-			
-			
-			
-			
-			
-			
-		';
-    }
-    else
-    {
-        return array(
-            'width', '450',
-            'height', '253',
-            'scale', 'exactfit',
-            'src', $uc_avatarflash,
-            'id', 'mycamera',
-            'name', 'mycamera',
-            'quality', 'high',
-            'bgcolor', '#ffffff',
-            'menu', 'false',
-            'swLiveConnect', 'true',
-            'allowScriptAccess', 'always'
-        );
-    }
-}
-
-function uc_mail_queue($uids, $emails, $subject, $message, $frommail = '', $charset = 'gbk', $htmlon = FALSE, $level = 1)
-{
-    return call_user_func(UC_API_FUNC, 'mail', 'add', array('uids' => $uids, 'emails' => $emails, 'subject' => $subject, 'message' => $message, 'frommail' => $frommail, 'charset' => $charset, 'htmlon' => $htmlon, 'level' => $level));
-}
-
-function uc_check_avatar($uid, $size = 'middle', $type = 'virtual')
-{
-    $url = UC_API . "/avatar.php?uid=$uid&size=$size&type=$type&check_file_exists=1";
-    $res = uc_fopen2($url, 500000, '', '', TRUE, UC_IP, 20);
-    if ($res == 1)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-function uc_check_version()
-{
-    $return = uc_api_post('version', 'check', array());
-    $data = uc_unserialize($return);
-    return is_array($data) ? $data : $return;
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/domain.php b/extend/fast/ucenter/client/uc_client/control/domain.php
deleted file mode 100644
index a7c76a94..00000000
--- a/extend/fast/ucenter/client/uc_client/control/domain.php
+++ /dev/null
@@ -1,31 +0,0 @@
-domaincontrol();
-    }
-
-    function domaincontrol()
-    {
-        parent::__construct();
-        $this->init_input();
-        $this->load('domain');
-    }
-
-    function onls()
-    {
-        return $_ENV['domain']->get_list(1, 9999, 9999);
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/feed.php b/extend/fast/ucenter/client/uc_client/control/feed.php
deleted file mode 100644
index 86a58b39..00000000
--- a/extend/fast/ucenter/client/uc_client/control/feed.php
+++ /dev/null
@@ -1,114 +0,0 @@
-feedcontrol();
-    }
-
-    function feedcontrol()
-    {
-        parent::__construct();
-        $this->init_input();
-    }
-
-    function onadd()
-    {
-        $this->load('misc');
-        $appid = intval($this->input('appid'));
-        $icon = $this->input('icon');
-        $uid = intval($this->input('uid'));
-        $username = $this->input('username');
-        $body_data = $_ENV['misc']->array2string($this->input('body_data'));
-        $title_data = $_ENV['misc']->array2string($this->input('title_data'));
-
-        $title_template = $this->_parsetemplate($this->input('title_template'));
-        $body_template = $this->_parsetemplate($this->input('body_template'));
-        $body_general = $this->input('body_general');
-        $target_ids = $this->input('target_ids');
-        $image_1 = $this->input('image_1');
-        $image_1_link = $this->input('image_1_link');
-        $image_2 = $this->input('image_2');
-        $image_2_link = $this->input('image_2_link');
-        $image_3 = $this->input('image_3');
-        $image_3_link = $this->input('image_3_link');
-        $image_4 = $this->input('image_4');
-        $image_4_link = $this->input('image_4_link');
-
-        $hash_template = md5($title_template . $body_template);
-        $hash_data = md5($title_template . $title_data . $body_template . $body_data);
-        $dateline = $this->time;
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "feeds SET appid='$appid', icon='$icon', uid='$uid', username='$username',
-			title_template='$title_template', title_data='$title_data', body_template='$body_template', body_data='$body_data', body_general='$body_general',
-			image_1='$image_1', image_1_link='$image_1_link', image_2='$image_2', image_2_link='$image_2_link',
-			image_3='$image_3', image_3_link='$image_3_link', image_4='$image_4', image_4_link='$image_4_link',
-			hash_template='$hash_template', hash_data='$hash_data', target_ids='$target_ids', dateline='$dateline'");
-        return $this->db->insert_id();
-    }
-
-    function ondelete()
-    {
-        $start = $this->input('start');
-        $limit = $this->input('limit');
-        $end = $start + $limit;
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "feeds WHERE feedid>'$start' AND feedid<'$end'");
-    }
-
-    function onget()
-    {
-        $this->load('misc');
-        $limit = intval($this->input('limit'));
-        $delete = $this->input('delete');
-        $feedlist = $this->db->fetch_all("SELECT * FROM " . UC_DBTABLEPRE . "feeds ORDER BY feedid DESC LIMIT $limit");
-        if ($feedlist)
-        {
-            $maxfeedid = $feedlist[0]['feedid'];
-            foreach ($feedlist as $key => $feed)
-            {
-                $feed['body_data'] = $_ENV['misc']->string2array($feed['body_data']);
-                $feed['title_data'] = $_ENV['misc']->string2array($feed['title_data']);
-                $feedlist[$key] = $feed;
-            }
-        }
-        if (!empty($feedlist))
-        {
-            if (!isset($delete) || $delete)
-            {
-                $this->_delete(0, $maxfeedid);
-            }
-        }
-        return $feedlist;
-    }
-
-    function _delete($start, $end)
-    {
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "feeds WHERE feedid>='$start' AND feedid<='$end'");
-    }
-
-    function _parsetemplate($template)
-    {
-        $template = str_replace(array("\r", "\n"), '', $template);
-        $template = str_replace(array('
                ', '
                ', '
                ', '
                '), "\n", $template);
-        $template = str_replace(array('', ''), '[B]', $template);
-        $template = str_replace(array('', ''), '[I]', $template);
-        $template = str_replace(array('', ''), '[U]', $template);
-        $template = str_replace(array('', ''), '[/B]', $template);
-        $template = str_replace(array('', ''), '[/I]', $template);
-        $template = str_replace(array('', ''), '[/U]', $template);
-        $template = dhtmlspecialchars($template);
-        $template = nl2br($template);
-        $template = str_replace(array('[B]', '[I]', '[U]', '[/B]', '[/I]', '[/U]'), array('', '', '', '', '', ''), $template);
-        return $template;
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/friend.php b/extend/fast/ucenter/client/uc_client/control/friend.php
deleted file mode 100644
index 01768b54..00000000
--- a/extend/fast/ucenter/client/uc_client/control/friend.php
+++ /dev/null
@@ -1,64 +0,0 @@
-friendcontrol();
-    }
-
-    function friendcontrol()
-    {
-        parent::__construct();
-        $this->init_input();
-        $this->load('friend');
-    }
-
-    function ondelete()
-    {
-        $uid = intval($this->input('uid'));
-        $friendids = $this->input('friendids');
-        $id = $_ENV['friend']->delete($uid, $friendids);
-        return $id;
-    }
-
-    function onadd()
-    {
-        $uid = intval($this->input('uid'));
-        $friendid = $this->input('friendid');
-        $comment = $this->input('comment');
-        $id = $_ENV['friend']->add($uid, $friendid, $comment);
-        return $id;
-    }
-
-    function ontotalnum()
-    {
-        $uid = intval($this->input('uid'));
-        $direction = intval($this->input('direction'));
-        $totalnum = $_ENV['friend']->get_totalnum_by_uid($uid, $direction);
-        return $totalnum;
-    }
-
-    function onls()
-    {
-        $uid = intval($this->input('uid'));
-        $page = intval($this->input('page'));
-        $pagesize = intval($this->input('pagesize'));
-        $totalnum = intval($this->input('totalnum'));
-        $direction = intval($this->input('direction'));
-        $pagesize = $pagesize ? $pagesize : UC_PPP;
-        $totalnum = $totalnum ? $totalnum : $_ENV['friend']->get_totalnum_by_uid($uid);
-        $data = $_ENV['friend']->get_list($uid, $page, $pagesize, $totalnum, $direction);
-        return $data;
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/index.htm b/extend/fast/ucenter/client/uc_client/control/index.htm
deleted file mode 100644
index 0519ecba..00000000
--- a/extend/fast/ucenter/client/uc_client/control/index.htm
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/control/mail.php b/extend/fast/ucenter/client/uc_client/control/mail.php
deleted file mode 100644
index 28bdedda..00000000
--- a/extend/fast/ucenter/client/uc_client/control/mail.php
+++ /dev/null
@@ -1,42 +0,0 @@
-mailcontrol();
-    }
-
-    function mailcontrol()
-    {
-        parent::__construct();
-        $this->init_input();
-    }
-
-    function onadd()
-    {
-        $this->load('mail');
-        $mail = array();
-        $mail['appid'] = UC_APPID;
-        $mail['uids'] = explode(',', $this->input('uids'));
-        $mail['emails'] = explode(',', $this->input('emails'));
-        $mail['subject'] = $this->input('subject');
-        $mail['message'] = $this->input('message');
-        $mail['charset'] = $this->input('charset');
-        $mail['htmlon'] = intval($this->input('htmlon'));
-        $mail['level'] = abs(intval($this->input('level')));
-        $mail['frommail'] = $this->input('frommail');
-        $mail['dateline'] = $this->time;
-        return $_ENV['mail']->add($mail);
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/pm.php b/extend/fast/ucenter/client/uc_client/control/pm.php
deleted file mode 100644
index 940d3987..00000000
--- a/extend/fast/ucenter/client/uc_client/control/pm.php
+++ /dev/null
@@ -1,463 +0,0 @@
-pmcontrol();
-    }
-
-    function pmcontrol()
-    {
-        parent::__construct();
-        $this->load('user');
-        $this->load('pm');
-    }
-
-    function oncheck_newpm()
-    {
-        $this->init_input();
-        $uid = intval($this->input('uid'));
-        $more = intval($this->input('more'));
-        if (!$_ENV['pm']->isnewpm($uid) && !$more)
-        {
-            return 0;
-        }
-        $newprvpm = $_ENV['pm']->getpmnum($uid, 1, 1);
-        $newchatpm = $_ENV['pm']->getpmnum($uid, 2, 1);
-        $newpm = $newprvpm + $newchatpm;
-        if ($more == 0)
-        {
-            return $newpm;
-        }
-        elseif ($more == 1)
-        {
-            return array('newpm' => $newpm, 'newprivatepm' => $newprvpm);
-        }
-        elseif ($more == 2 || $more == 3)
-        {
-            if ($more == 2)
-            {
-                return array('newpm' => $newpm, 'newprivatepm' => $newprvpm, 'newchatpm' => $newchatpm);
-            }
-            else
-            {
-                $lastpm = $_ENV['pm']->lastpm($uid);
-                require_once UC_ROOT . 'lib/uccode.class.php';
-                $this->uccode = new uccode();
-                $lastpm['lastsummary'] = $this->uccode->complie($lastpm['lastsummary']);
-                return array('newpm' => $newpm, 'newprivatepm' => $newprvpm, 'newchatpm' => $newchatpm, 'lastdate' => $lastpm['lastdateline'], 'lastmsgfromid' => $lastpm['lastauthorid'], 'lastmsgfrom' => $lastpm['lastauthorusername'], 'lastmsg' => $lastpm['lastsummary']);
-            }
-        }
-        elseif ($more == 4)
-        {
-            return array('newpm' => $newpm, 'newprivatepm' => $newprvpm, 'newchatpm' => $newchatpm);
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    function onsendpm()
-    {
-        $this->init_input();
-        $fromuid = $this->input('fromuid');
-        $msgto = $this->input('msgto');
-        $subject = $this->input('subject');
-        $message = $this->input('message');
-        $replypmid = $this->input('replypmid');
-        $isusername = $this->input('isusername');
-        $type = $this->input('type');
-
-        if (!$fromuid)
-        {
-            return 0;
-        }
-
-        $user = $_ENV['user']->get_user_by_uid($fromuid);
-        $user = daddslashes($user, 1);
-        if (!$user)
-        {
-            return 0;
-        }
-        $this->user['uid'] = $user['uid'];
-        $this->user['username'] = $user['username'];
-
-        if ($replypmid)
-        {
-            $isusername = 0;
-            $plid = $_ENV['pm']->getplidbypmid($replypmid);
-            $msgto = $_ENV['pm']->getuidbyplid($plid);
-            unset($msgto[$this->user['uid']]);
-        }
-        else
-        {
-            if (!empty($msgto))
-            {
-                $msgto = array_unique(explode(',', $msgto));
-            }
-        }
-
-        if ($isusername)
-        {
-            $msgto = $_ENV['user']->name2id($msgto);
-        }
-        $countmsgto = count($msgto);
-
-        if ($this->settings['pmsendregdays'])
-        {
-            if ($user['regdate'] > $this->time - $this->settings['pmsendregdays'] * 86400)
-            {
-                return PMSENDREGDAYS;
-            }
-        }
-        if ($this->settings['chatpmmemberlimit'])
-        {
-            if ($type == 1 && ($countmsgto > ($this->settings['chatpmmemberlimit'] - 1)))
-            {
-                return CHATPMMEMBERLIMIT_ERROR;
-            }
-        }
-        if ($this->settings['pmfloodctrl'])
-        {
-            if (!$_ENV['pm']->ispminterval($this->user['uid'], $this->settings['pmfloodctrl']))
-            {
-                return PMFLOODCTRL_ERROR;
-            }
-        }
-        if ($this->settings['privatepmthreadlimit'])
-        {
-            if (!$_ENV['pm']->isprivatepmthreadlimit($this->user['uid'], $this->settings['privatepmthreadlimit']))
-            {
-                return PRIVATEPMTHREADLIMIT_ERROR;
-            }
-        }
-        if ($this->settings['chatpmthreadlimit'])
-        {
-            if (!$_ENV['pm']->ischatpmthreadlimit($this->user['uid'], $this->settings['chatpmthreadlimit']))
-            {
-                return CHATPMTHREADLIMIT_ERROR;
-            }
-        }
-
-        $lastpmid = 0;
-        if ($replypmid)
-        {
-            $lastpmid = $_ENV['pm']->replypm($plid, $this->user['uid'], $this->user['username'], $message);
-        }
-        else
-        {
-            $lastpmid = $_ENV['pm']->sendpm($this->user['uid'], $this->user['username'], $msgto, $subject, $message, $type);
-        }
-        return $lastpmid;
-    }
-
-    function ondelete()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $pmids = $this->input('pmids');
-        if (empty($pmids))
-        {
-            return 0;
-        }
-        if (is_array($pmids))
-        {
-            $this->apps = $this->cache('apps');
-            if ($this->apps[$this->app['appid']]['type'] == 'UCHOME')
-            {
-                $id = $_ENV['pm']->deletepmbyplids($this->user['uid'], $this->input('pmids'));
-            }
-            else
-            {
-                $id = $_ENV['pm']->deletepmbypmids($this->user['uid'], $this->input('pmids'));
-            }
-        }
-        else
-        {
-            $id = $_ENV['pm']->deletepmbypmid($this->user['uid'], $this->input('pmids'));
-        }
-        return $id;
-    }
-
-    function ondeletechat()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $plids = $this->input('plids');
-        $type = intval($this->input('type'));
-        if ($type == 1)
-        {
-            return $_ENV['pm']->deletepmbyplids($this->user['uid'], $plids);
-        }
-        else
-        {
-            return $_ENV['pm']->quitchatpm($this->user['uid'], $plids);
-        }
-    }
-
-    function ondeleteuser()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $id = $_ENV['pm']->deletepmbyplids($this->user['uid'], $this->input('touids'), 1);
-        return $id;
-    }
-
-    function onreadstatus()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $_ENV['pm']->setpmstatus($this->user['uid'], $this->input('uids'), $this->input('plids'), $this->input('status'));
-    }
-
-    function onignore()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        return $_ENV['pm']->set_ignore($this->user['uid']);
-    }
-
-    function onls()
-    {
-        $this->init_input();
-        $pagesize = $this->input('pagesize');
-        $filter = $this->input('filter');
-        $page = $this->input('page');
-        $msglen = $this->input('msglen');
-        $this->user['uid'] = intval($this->input('uid'));
-
-        $filter = $filter ? (in_array($filter, array('newpm', 'privatepm')) ? $filter : '') : '';
-        if ($filter == 'newpm')
-        {
-            $type = 0;
-            $new = 1;
-        }
-        elseif ($filter == 'privatepm')
-        {
-            $type = 0;
-            $new = 0;
-        }
-        else
-        {
-            return array();
-        }
-        $pmnum = $_ENV['pm']->getpmnum($this->user['uid'], $type, $new);
-        $start = $this->page_get_start($page, $pagesize, $pmnum);
-
-        if ($pagesize > 0)
-        {
-            $pms = $_ENV['pm']->getpmlist($this->user['uid'], $filter, $start, $pagesize);
-            if (is_array($pms) && !empty($pms))
-            {
-                foreach ($pms as $key => $pm)
-                {
-                    if ($msglen)
-                    {
-                        $pms[$key]['lastsummary'] = $_ENV['pm']->removecode($pms[$key]['lastsummary'], $msglen);
-                    }
-                    else
-                    {
-                        unset($pms[$key]['lastsummary']);
-                    }
-                }
-            }
-            $result['data'] = $pms;
-        }
-        $result['count'] = $pmnum;
-        return $result;
-    }
-
-    function onview()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $pmid = $this->input('pmid');
-        $touid = $this->input('touid');
-        $daterange = $this->input('daterange');
-        $page = $this->input('page');
-        $pagesize = $this->input('pagesize');
-        $isplid = $this->input('isplid');
-        $type = $this->input('type');
-
-        $daterange = empty($daterange) ? 1 : $daterange;
-        $today = $this->time - ($this->time + $this->settings['timeoffset']) % 86400;
-        if ($daterange == 1)
-        {
-            $starttime = $today;
-        }
-        elseif ($daterange == 2)
-        {
-            $starttime = $today - 86400;
-        }
-        elseif ($daterange == 3)
-        {
-            $starttime = $today - 172800;
-        }
-        elseif ($daterange == 4)
-        {
-            $starttime = $today - 604800;
-        }
-        elseif ($daterange == 5)
-        {
-            $starttime = 0;
-        }
-        $endtime = $this->time;
-
-        if (!$isplid)
-        {
-            $plid = $_ENV['pm']->getplidbytouid($this->user['uid'], $touid);
-        }
-        else
-        {
-            $plid = $touid;
-        }
-        if ($page)
-        {
-            $pmnum = $_ENV['pm']->getpmnumbyplid($this->user['uid'], $plid);
-            $start = $this->page_get_start($page, $pagesize, $pmnum);
-            $ppp = $pagesize;
-        }
-        else
-        {
-            $pmnum = 0;
-            $start = 0;
-            $ppp = 0;
-        }
-
-        if ($pmid)
-        {
-            $pms = $_ENV['pm']->getpmbypmid($this->user['uid'], $pmid);
-        }
-        else
-        {
-            $pms = $_ENV['pm']->getpmbyplid($this->user['uid'], $plid, $starttime, $endtime, $start, $ppp, $type);
-        }
-
-        require_once UC_ROOT . 'lib/uccode.class.php';
-        $this->uccode = new uccode();
-        if ($pms)
-        {
-            foreach ($pms as $key => $pm)
-            {
-                $pms[$key]['message'] = $this->uccode->complie($pms[$key]['message']);
-            }
-        }
-        return $pms;
-    }
-
-    function onviewnum()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $touid = $this->input('touid');
-        $isplid = $this->input('isplid');
-        if (!$isplid)
-        {
-            $plid = $_ENV['pm']->getplidbytouid($this->user['uid'], $touid);
-        }
-        else
-        {
-            $plid = $touid;
-        }
-        $pmnum = $_ENV['pm']->getpmnumbyplid($this->user['uid'], $plid);
-        return $pmnum;
-    }
-
-    function onviewnode()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $type = $this->input('type');
-        $pmid = $this->input('pmid');
-        $type = 0;
-        $pms = $_ENV['pm']->getpmbypmid($this->user['uid'], $pmid);
-
-        require_once UC_ROOT . 'lib/uccode.class.php';
-        $this->uccode = new uccode();
-        if ($pms)
-        {
-            foreach ($pms as $key => $pm)
-            {
-                $pms[$key]['message'] = $this->uccode->complie($pms[$key]['message']);
-            }
-        }
-        $pms = $pms[0];
-        return $pms;
-    }
-
-    function onchatpmmemberlist()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $plid = intval($this->input('plid'));
-        return $_ENV['pm']->chatpmmemberlist($this->user['uid'], $plid);
-    }
-
-    function onkickchatpm()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $plid = intval($this->input('plid'));
-        $touid = intval($this->input('touid'));
-        return $_ENV['pm']->kickchatpm($plid, $this->user['uid'], $touid);
-    }
-
-    function onappendchatpm()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $plid = intval($this->input('plid'));
-        $touid = intval($this->input('touid'));
-        return $_ENV['pm']->appendchatpm($plid, $this->user['uid'], $touid);
-    }
-
-    function onblackls_get()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        return $_ENV['pm']->get_blackls($this->user['uid']);
-    }
-
-    function onblackls_set()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $blackls = $this->input('blackls');
-        return $_ENV['pm']->set_blackls($this->user['uid'], $blackls);
-    }
-
-    function onblackls_add()
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $username = $this->input('username');
-        return $_ENV['pm']->update_blackls($this->user['uid'], $username, 1);
-    }
-
-    function onblackls_delete($arr)
-    {
-        $this->init_input();
-        $this->user['uid'] = intval($this->input('uid'));
-        $username = $this->input('username');
-        return $_ENV['pm']->update_blackls($this->user['uid'], $username, 2);
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/tag.php b/extend/fast/ucenter/client/uc_client/control/tag.php
deleted file mode 100644
index 8fc80aa2..00000000
--- a/extend/fast/ucenter/client/uc_client/control/tag.php
+++ /dev/null
@@ -1,102 +0,0 @@
-tagcontrol();
-    }
-
-    function tagcontrol()
-    {
-        parent::__construct();
-        $this->init_input();
-        $this->load('tag');
-        $this->load('misc');
-    }
-
-    function ongettag()
-    {
-        $appid = $this->input('appid');
-        $tagname = $this->input('tagname');
-        $nums = $this->input('nums');
-        if (empty($tagname))
-        {
-            return NULL;
-        }
-        $return = $apparray = $appadd = array();
-
-        if ($nums && is_array($nums))
-        {
-            foreach ($nums as $k => $num)
-            {
-                $apparray[$k] = $k;
-            }
-        }
-
-        $data = $_ENV['tag']->get_tag_by_name($tagname);
-        if ($data)
-        {
-            $apparraynew = array();
-            foreach ($data as $tagdata)
-            {
-                $row = $r = array();
-                $tmp = explode("\t", $tagdata['data']);
-                $type = $tmp[0];
-                array_shift($tmp);
-                foreach ($tmp as $tmp1)
-                {
-                    $tmp1 != '' && $r[] = $_ENV['misc']->string2array($tmp1);
-                }
-                if (in_array($tagdata['appid'], $apparray))
-                {
-                    if ($tagdata['expiration'] > 0 && $this->time - $tagdata['expiration'] > 3600)
-                    {
-                        $appadd[] = $tagdata['appid'];
-                        $_ENV['tag']->formatcache($tagdata['appid'], $tagname);
-                    }
-                    else
-                    {
-                        $apparraynew[] = $tagdata['appid'];
-                    }
-                    $datakey = array();
-                    $count = 0;
-                    foreach ($r as $data)
-                    {
-                        $return[$tagdata['appid']]['data'][] = $data;
-                        $return[$tagdata['appid']]['type'] = $type;
-                        $count++;
-                        if ($count >= $nums[$tagdata['appid']])
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-            $apparray = array_diff($apparray, $apparraynew);
-        }
-        else
-        {
-            foreach ($apparray as $appid)
-            {
-                $_ENV['tag']->formatcache($appid, $tagname);
-            }
-        }
-        if ($apparray)
-        {
-            $this->load('note');
-            $_ENV['note']->add('gettag', "id=$tagname", '', $appadd, -1);
-        }
-        return $return;
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/control/user.php b/extend/fast/ucenter/client/uc_client/control/user.php
deleted file mode 100644
index 42d0b4e8..00000000
--- a/extend/fast/ucenter/client/uc_client/control/user.php
+++ /dev/null
@@ -1,443 +0,0 @@
-usercontrol();
-    }
-
-    function usercontrol()
-    {
-        parent::__construct();
-        $this->load('user');
-        $this->app = $this->cache['apps'][UC_APPID];
-    }
-
-    // 同步注册
-    function onsynregister()
-    {
-        $this->init_input();
-        $uid = $this->input('uid');
-        $password = $this->input('password');
-        if ($this->app['synlogin'])
-        {
-            if ($this->user = $_ENV['user']->get_user_by_uid($uid))
-            {
-                $params = 'action=synregister' .
-                        '&username=' . $this->user['username'] .
-                        '&uid=' . $this->user['uid'] .
-                        '&password=' . $password .
-                        '&email=' . $this->user['email'] .
-                        '&mobile=' . $this->user['mobile'] .
-                        '&time=' . $this->time;
-                $synstr = '';
-                foreach ($this->cache['apps'] as $appid => $app)
-                {
-                    if ($app['synlogin'] && $app['appid'] != $this->app['appid'])
-                    {
-                        $synstr .= '';
-                    }
-                }
-                return $synstr;
-            }
-        }
-        return '';
-    }
-
-    // 同步登录
-    function onsynlogin()
-    {
-        $this->init_input();
-        $uid = $this->input('uid');
-        if ($this->app['synlogin'])
-        {
-            if ($this->user = $_ENV['user']->get_user_by_uid($uid))
-            {
-                $params = 'action=synlogin' .
-                        '&username=' . $this->user['username'] .
-                        '&uid=' . $this->user['uid'] .
-                        '&password=' . $this->user['password'] .
-                        '&time=' . $this->time;
-                $synstr = '';
-                foreach ($this->cache['apps'] as $appid => $app)
-                {
-                    if ($app['synlogin'] && $app['appid'] != $this->app['appid'])
-                    {
-                        $synstr .= '';
-                    }
-                }
-                return $synstr;
-            }
-        }
-        return '';
-    }
-
-    // 同步退出
-    function onsynlogout()
-    {
-        $this->init_input();
-        if ($this->app['synlogin'])
-        {
-            $synstr = '';
-            foreach ($this->cache['apps'] as $appid => $app)
-            {
-                if ($app['synlogin'] && $app['appid'] != $this->app['appid'])
-                {
-                    $synstr .= '';
-                }
-            }
-            return $synstr;
-        }
-        return '';
-    }
-
-    // 同步注册
-    function onregister()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $password = $this->input('password');
-        $email = $this->input('email');
-        $mobile = $this->input('mobile');
-        $extend = $this->input('extend');
-        $extend = $extend ? $extend : [];
-        if (($status = $this->_check_username($username)) < 0)
-        {
-            return $status;
-        }
-        if ($email && ($status = $this->_check_email($email)) < 0)
-        {
-            return $status;
-        }
-        if ($mobile && ($status = $this->_check_mobile($mobile)) < 0)
-        {
-            return $status;
-        }
-        $uid = $_ENV['user']->add_user($username, $password, $email, $mobile, 0, $extend);
-        return $uid;
-    }
-
-    // 编辑ucenter中信息
-    function onedit()
-    {
-        $this->init_input();
-        $uid = intval($this->input('uid'));
-        $username = $this->input('username');
-        $password = $this->input('password');
-        $email = $this->input('email');
-        $mobile = $this->input('mobile');
-        $extend = $this->input('extend');
-        $extend = $extend ? $extend : [];
-
-        $status = $_ENV['user']->edit_user($username, $password, $email, $mobile, $uid, $extend);
-
-        if ($status > 0)
-        {
-            if (@include UC_ROOT . './data/cache/apps.php')
-            {
-                if (count($_CACHE['apps']) > 1)
-                {
-                    //手动调用一次同步到所有应用
-                    uc_api_post('user', 'edit', $this->input);
-                }
-            }
-            return $status;
-            $this->load('note');
-            $_ENV['note']->add('updateinfo', http_build_query($this->input));
-        }
-        return $status;
-    }
-
-    // 登录ucenter账号
-    function onlogin()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $password = $this->input('password');
-        $isuid = $this->input('isuid'); //0用户名 1UID 2邮箱 3手机
-
-        if ($isuid == 1)
-        {
-            $user = $_ENV['user']->get_user_by_uid($username);
-        }
-        elseif ($isuid == 2)
-        {
-            $user = $_ENV['user']->get_user_by_email($username);
-        }
-        elseif ($isuid == 3)
-        {
-            $user = $_ENV['user']->get_user_by_mobile($username);
-        }
-        else
-        {
-            $user = $_ENV['user']->get_user_by_username($username);
-        }
-
-        $passwordmd5 = preg_match('/^\w{32}$/', $password) ? $password : md5($password);
-        if (empty($user))
-        {
-            $status = -1;
-        }
-        elseif ($user['password'] != md5($passwordmd5 . $user['salt']))
-        {
-            $status = -2;
-        }
-        else
-        {
-            $status = $user['uid'];
-        }
-        $merge = $status != -1 && !$isuid && $_ENV['user']->check_mergeuser($username) ? 1 : 0;
-        return [
-            'status'   => $status,
-            'uid'      => isset($user['uid']) ? $user['uid'] : 0,
-            'username' => isset($user['username']) ? $user['username'] : '',
-            'password' => $password,
-            'email'    => isset($user['email']) ? $user['email'] : '',
-            'mobile'   => isset($user['mobile']) ? $user['mobile'] : '',
-            'merge'    => $merge
-        ];
-    }
-
-    function onlogincheck()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $ip = $this->input('ip');
-        return $_ENV['user']->can_do_login($username, $ip);
-    }
-
-    function oncheck_email()
-    {
-        $this->init_input();
-        $email = $this->input('email');
-        return $this->_check_email($email);
-    }
-
-    function oncheck_username()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        if (($status = $this->_check_username($username)) < 0)
-        {
-            return $status;
-        }
-        else
-        {
-            return 1;
-        }
-    }
-
-    function onget_user()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $isuid = $this->input('isuid'); //0用户名 1UID 2邮箱 3手机
-        if ($isuid == 1)
-        {
-            $member = $_ENV['user']->get_user_by_uid($username);
-        }
-        else if ($isuid == 2)
-        {
-            $member = $_ENV['user']->get_user_by_email($username);
-        }
-        else if ($isuid == 3)
-        {
-            $member = $_ENV['user']->get_user_by_mobile($username);
-        }
-        else
-        {
-            $member = $_ENV['user']->get_user_by_username($username);
-        }
-        if ($member)
-        {
-            // 加载扩展表
-            $memberfields = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "memberfields WHERE uid='{$member['uid']}'");
-
-            $memberfields = $memberfields ? $memberfields : [];
-            $member = [
-                'uid'      => $member['uid'],
-                'username' => $member['username'],
-                'email'    => $member['email'],
-                'mobile'   => $member['mobile']
-            ];
-            return array_merge($member, $memberfields);
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    function ongetprotected()
-    {
-        $this->init_input();
-        $protectedmembers = $this->db->fetch_all("SELECT uid,username FROM " . UC_DBTABLEPRE . "protectedmembers GROUP BY username");
-        return $protectedmembers;
-    }
-
-    function ondelete()
-    {
-        $this->init_input();
-        $uid = $this->input('uid');
-        return $_ENV['user']->delete_user($uid);
-    }
-
-    function onaddprotected()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $admin = $this->input('admin');
-        $appid = $this->app['appid'];
-        $usernames = (array) $username;
-        foreach ($usernames as $username)
-        {
-            $user = $_ENV['user']->get_user_by_username($username);
-            $uid = $user['uid'];
-            $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "protectedmembers SET uid='$uid', username='$username', appid='$appid', dateline='{$this->time}', admin='$admin'", 'SILENT');
-        }
-        return $this->db->errno() ? -1 : 1;
-    }
-
-    function ondeleteprotected()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $appid = $this->app['appid'];
-        $usernames = (array) $username;
-        foreach ($usernames as $username)
-        {
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "protectedmembers WHERE username='$username' AND appid='$appid'");
-        }
-        return $this->db->errno() ? -1 : 1;
-    }
-
-    function onmerge()
-    {
-        $this->init_input();
-        $uid = $this->input('uid');
-        $oldusername = $this->input('oldusername');
-        $newusername = $this->input('newusername');
-        $password = $this->input('password');
-        $email = $this->input('email');
-        $mobile = $this->input('mobile');
-        $extend = $this->input('extend');
-        $extend = $extend ? $extend : [];
-        if (($status = $this->_check_username($newusername)) < 0)
-        {
-            return $status;
-        }
-        $uid = $_ENV['user']->add_user($newusername, $password, $email, $mobile, $uid, $extend);
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "mergemembers WHERE appid='" . $this->app['appid'] . "' AND username='$oldusername'");
-        return $uid;
-    }
-
-    function onmerge_remove()
-    {
-        $this->init_input();
-        $username = $this->input('username');
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "mergemembers WHERE appid='" . $this->app['appid'] . "' AND username='$username'");
-        return NULL;
-    }
-
-    function _check_username($username)
-    {
-        $username = addslashes(trim(stripslashes($username)));
-        if (!$_ENV['user']->check_username($username))
-        {
-            return UC_USER_CHECK_USERNAME_FAILED;
-        }
-        elseif (!$_ENV['user']->check_usernamecensor($username))
-        {
-            return UC_USER_USERNAME_BADWORD;
-        }
-        elseif ($_ENV['user']->check_usernameexists($username))
-        {
-            return UC_USER_USERNAME_EXISTS;
-        }
-        return 1;
-    }
-
-    function _check_email($email, $username = '')
-    {
-        if (empty($this->settings))
-        {
-            $this->settings = $this->cache('settings');
-        }
-        if (!$_ENV['user']->check_emailformat($email))
-        {
-            return UC_USER_EMAIL_FORMAT_ILLEGAL;
-        }
-        elseif (!$_ENV['user']->check_emailaccess($email))
-        {
-            return UC_USER_EMAIL_ACCESS_ILLEGAL;
-        }
-        elseif (!$this->settings['doublee'] && $_ENV['user']->check_emailexists($email, $username))
-        {
-            return UC_USER_EMAIL_EXISTS;
-        }
-        else
-        {
-            return 1;
-        }
-    }
-
-    function _check_mobile($mobile, $username = '')
-    {
-        if (empty($this->settings))
-        {
-            $this->settings = $this->cache('settings');
-        }
-        if (!$_ENV['user']->check_mobileformat($mobile))
-        {
-            return UC_USER_EMAIL_FORMAT_ILLEGAL;
-        }
-        elseif (!$_ENV['user']->check_mobileaccess($mobile))
-        {
-            return UC_USER_EMAIL_ACCESS_ILLEGAL;
-        }
-        elseif (!$this->settings['doublee'] && $_ENV['user']->check_mobileexists($mobile, $username))
-        {
-            return UC_USER_EMAIL_EXISTS;
-        }
-        else
-        {
-            return 1;
-        }
-    }
-
-    function onuploadavatar()
-    {
-
-    }
-
-    function onrectavatar()
-    {
-
-    }
-
-    function flashdata_decode($s)
-    {
-
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/data/cache/apps.php b/extend/fast/ucenter/client/uc_client/data/cache/apps.php
deleted file mode 100644
index b0f1f519..00000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/apps.php
+++ /dev/null
@@ -1,40 +0,0 @@
- 
-  array (
-    'appid' => '1',
-    'type' => 'OTHER',
-    'name' => 'FastAdmin',
-    'url' => 'http://www.fa.com/index/ucenter',
-    'ip' => '',
-    'viewprourl' => '',
-    'apifilename' => 'index',
-    'charset' => '',
-    'synlogin' => '1',
-    'extra' => 
-    array (
-      'apppath' => '',
-      'extraurl' => '			',
-    ),
-    'recvnote' => '1',
-  ),
-  2 => 
-  array (
-    'appid' => '2',
-    'type' => 'DISCUZX',
-    'name' => 'Discuz!',
-    'url' => 'http://www.discuz.com',
-    'ip' => '',
-    'viewprourl' => '',
-    'apifilename' => 'uc.php',
-    'charset' => 'utf-8',
-    'synlogin' => '1',
-    'extra' => 
-    array (
-      'apppath' => '',
-      'extraurl' => '			',
-    ),
-    'recvnote' => '1',
-  ),
-  'UC_API' => 'http://www.ucenter.com',
-);
diff --git a/extend/fast/ucenter/client/uc_client/data/cache/badwords.php b/extend/fast/ucenter/client/uc_client/data/cache/badwords.php
deleted file mode 100644
index c3ca52b4..00000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/badwords.php
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/data/cache/index.htm b/extend/fast/ucenter/client/uc_client/data/cache/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/extend/fast/ucenter/client/uc_client/data/cache/settings.php b/extend/fast/ucenter/client/uc_client/data/cache/settings.php
deleted file mode 100644
index 069021ea..00000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/settings.php
+++ /dev/null
@@ -1,32 +0,0 @@
- '',
-  'censoremail' => '',
-  'censorusername' => '',
-  'dateformat' => 'y-n-j',
-  'doublee' => '0',
-  'nextnotetime' => '0',
-  'timeoffset' => '28800',
-  'privatepmthreadlimit' => '25',
-  'chatpmthreadlimit' => '30',
-  'chatpmmemberlimit' => '35',
-  'pmfloodctrl' => '15',
-  'pmcenter' => '1',
-  'sendpmseccode' => '1',
-  'pmsendregdays' => '0',
-  'maildefault' => 'username@21cn.com',
-  'mailsend' => '1',
-  'mailserver' => 'smtp.21cn.com',
-  'mailport' => '25',
-  'mailauth' => '1',
-  'mailfrom' => 'UCenter ',
-  'mailauth_username' => 'username@21cn.com',
-  'mailauth_password' => 'password',
-  'maildelimiter' => '0',
-  'mailusername' => '1',
-  'mailsilent' => '1',
-  'version' => '1.6.0',
-  'credits' => 'N;',
-);
-
-?>
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/data/index.htm b/extend/fast/ucenter/client/uc_client/data/index.htm
deleted file mode 100644
index e69de29b..00000000
diff --git a/extend/fast/ucenter/client/uc_client/index.htm b/extend/fast/ucenter/client/uc_client/index.htm
deleted file mode 100644
index 0519ecba..00000000
--- a/extend/fast/ucenter/client/uc_client/index.htm
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/lib/db.class.php b/extend/fast/ucenter/client/uc_client/lib/db.class.php
deleted file mode 100644
index 0c1f20bc..00000000
--- a/extend/fast/ucenter/client/uc_client/lib/db.class.php
+++ /dev/null
@@ -1,210 +0,0 @@
-dbhost = $dbhost;
-        $this->dbuser = $dbuser;
-        $this->dbpw = $dbpw;
-        $this->dbname = $dbname;
-        $this->dbcharset = $dbcharset;
-        $this->pconnect = $pconnect;
-        $this->tablepre = $tablepre;
-        $this->time = $time;
-
-        if ($pconnect)
-        {
-            if (!$this->link = mysql_pconnect($dbhost, $dbuser, $dbpw))
-            {
-                $this->halt('Can not connect to MySQL server');
-            }
-        }
-        else
-        {
-            if (!$this->link = mysql_connect($dbhost, $dbuser, $dbpw))
-            {
-                $this->halt('Can not connect to MySQL server');
-            }
-        }
-
-        if ($this->version() > '4.1')
-        {
-            if ($dbcharset)
-            {
-                mysql_query("SET character_set_connection=" . $dbcharset . ", character_set_results=" . $dbcharset . ", character_set_client=binary", $this->link);
-            }
-
-            if ($this->version() > '5.0.1')
-            {
-                mysql_query("SET sql_mode=''", $this->link);
-            }
-        }
-
-        if ($dbname)
-        {
-            mysql_select_db($dbname, $this->link);
-        }
-    }
-
-    function fetch_array($query, $result_type = MYSQL_ASSOC)
-    {
-        return mysql_fetch_array($query, $result_type);
-    }
-
-    function result_first($sql)
-    {
-        $query = $this->query($sql);
-        return $this->result($query, 0);
-    }
-
-    function fetch_first($sql)
-    {
-        $query = $this->query($sql);
-        return $this->fetch_array($query);
-    }
-
-    function fetch_all($sql, $id = '')
-    {
-        $arr = array();
-        $query = $this->query($sql);
-        while ($data = $this->fetch_array($query))
-        {
-            $id ? $arr[$data[$id]] = $data : $arr[] = $data;
-        }
-        return $arr;
-    }
-
-    function cache_gc()
-    {
-        $this->query("DELETE FROM {$this->tablepre}sqlcaches WHERE expiry<$this->time");
-    }
-
-    function query($sql, $type = '', $cachetime = FALSE)
-    {
-        $func = $type == 'UNBUFFERED' && @function_exists('mysql_unbuffered_query') ? 'mysql_unbuffered_query' : 'mysql_query';
-        if (!($query = $func($sql, $this->link)) && $type != 'SILENT')
-        {
-            $this->halt('MySQL Query Error', $sql);
-        }
-        $this->querynum++;
-        $this->histories[] = $sql;
-        return $query;
-    }
-
-    function affected_rows()
-    {
-        return mysql_affected_rows($this->link);
-    }
-
-    function error()
-    {
-        return (($this->link) ? mysql_error($this->link) : mysql_error());
-    }
-
-    function errno()
-    {
-        return intval(($this->link) ? mysql_errno($this->link) : mysql_errno());
-    }
-
-    function result($query, $row)
-    {
-        $query = @mysql_result($query, $row);
-        return $query;
-    }
-
-    function num_rows($query)
-    {
-        $query = mysql_num_rows($query);
-        return $query;
-    }
-
-    function num_fields($query)
-    {
-        return mysql_num_fields($query);
-    }
-
-    function free_result($query)
-    {
-        return mysql_free_result($query);
-    }
-
-    function insert_id()
-    {
-        return ($id = mysql_insert_id($this->link)) >= 0 ? $id : $this->result($this->query("SELECT last_insert_id()"), 0);
-    }
-
-    function fetch_row($query)
-    {
-        $query = mysql_fetch_row($query);
-        return $query;
-    }
-
-    function fetch_fields($query)
-    {
-        return mysql_fetch_field($query);
-    }
-
-    function version()
-    {
-        return mysql_get_server_info($this->link);
-    }
-
-    function escape_string($str)
-    {
-        return mysql_escape_string($str);
-    }
-
-    function close()
-    {
-        return mysql_close($this->link);
-    }
-
-    function halt($message = '', $sql = '')
-    {
-        $error = mysql_error();
-        $errorno = mysql_errno();
-        if ($errorno == 2006 && $this->goneaway-- > 0)
-        {
-            $this->connect($this->dbhost, $this->dbuser, $this->dbpw, $this->dbname, $this->dbcharset, $this->pconnect, $this->tablepre, $this->time);
-            $this->query($sql);
-        }
-        else
-        {
-            $s = '';
-            if ($message)
-            {
-                $s = "UCenter info: $message
                ";
-            }
-            if ($sql)
-            {
-                $s .= 'SQL:' . htmlspecialchars($sql) . '
                ';
-            }
-            $s .= 'Error:' . $error . '
                ';
-            $s .= 'Errno:' . $errorno . '
                ';
-            $s = str_replace(UC_DBTABLEPRE, '[Table]', $s);
-            exit($s);
-        }
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/lib/dbi.class.php b/extend/fast/ucenter/client/uc_client/lib/dbi.class.php
deleted file mode 100644
index 2972e92c..00000000
--- a/extend/fast/ucenter/client/uc_client/lib/dbi.class.php
+++ /dev/null
@@ -1,200 +0,0 @@
-dbhost = $dbhost;
-        $this->dbuser = $dbuser;
-        $this->dbpw = $dbpw;
-        $this->dbname = $dbname;
-        $this->dbcharset = $dbcharset;
-        $this->pconnect = $pconnect;
-        $this->tablepre = $tablepre;
-        $this->time = $time;
-
-        if (!$this->link = new mysqli($dbhost, $dbuser, $dbpw, $dbname))
-        {
-            $this->halt('Can not connect to MySQL server');
-        }
-
-        if ($this->version() > '4.1')
-        {
-            if ($dbcharset)
-            {
-                $this->link->set_charset($dbcharset);
-            }
-
-            if ($this->version() > '5.0.1')
-            {
-                $this->link->query("SET sql_mode=''");
-            }
-        }
-    }
-
-    function fetch_array($query, $result_type = MYSQLI_ASSOC)
-    {
-        return $query ? $query->fetch_array($result_type) : null;
-    }
-
-    function result_first($sql)
-    {
-        $query = $this->query($sql);
-        return $this->result($query, 0);
-    }
-
-    function fetch_first($sql)
-    {
-        $query = $this->query($sql);
-        return $this->fetch_array($query);
-    }
-
-    function fetch_all($sql, $id = '')
-    {
-        $arr = array();
-        $query = $this->query($sql);
-        while ($data = $this->fetch_array($query))
-        {
-            $id ? $arr[$data[$id]] = $data : $arr[] = $data;
-        }
-        return $arr;
-    }
-
-    function cache_gc()
-    {
-        $this->query("DELETE FROM {$this->tablepre}sqlcaches WHERE expiry<$this->time");
-    }
-
-    function query($sql, $type = '', $cachetime = FALSE)
-    {
-        $resultmode = $type == 'UNBUFFERED' ? MYSQLI_USE_RESULT : MYSQLI_STORE_RESULT;
-        if (!($query = $this->link->query($sql, $resultmode)) && $type != 'SILENT')
-        {
-            $this->halt('MySQL Query Error', $sql);
-        }
-        $this->querynum++;
-        $this->histories[] = $sql;
-        return $query;
-    }
-
-    function affected_rows()
-    {
-        return $this->link->affected_rows;
-    }
-
-    function error()
-    {
-        return (($this->link) ? $this->link->error : mysqli_error());
-    }
-
-    function errno()
-    {
-        return intval(($this->link) ? $this->link->errno : mysqli_errno());
-    }
-
-    function result($query, $row)
-    {
-        if (!$query || $query->num_rows == 0)
-        {
-            return null;
-        }
-        $query->data_seek($row);
-        $assocs = $query->fetch_row();
-        return $assocs[0];
-    }
-
-    function num_rows($query)
-    {
-        $query = $query ? $query->num_rows : 0;
-        return $query;
-    }
-
-    function num_fields($query)
-    {
-        return $query ? $query->field_count : 0;
-    }
-
-    function free_result($query)
-    {
-        return $query ? $query->free() : false;
-    }
-
-    function insert_id()
-    {
-        return ($id = $this->link->insert_id) >= 0 ? $id : $this->result($this->query("SELECT last_insert_id()"), 0);
-    }
-
-    function fetch_row($query)
-    {
-        $query = $query ? $query->fetch_row() : null;
-        return $query;
-    }
-
-    function fetch_fields($query)
-    {
-        return $query ? $query->fetch_field() : null;
-    }
-
-    function version()
-    {
-        return $this->link->server_info;
-    }
-
-    function escape_string($str)
-    {
-        return $this->link->escape_string($str);
-    }
-
-    function close()
-    {
-        return $this->link->close();
-    }
-
-    function halt($message = '', $sql = '')
-    {
-        $error = $this->error();
-        $errorno = $this->errno();
-        if ($errorno == 2006 && $this->goneaway-- > 0)
-        {
-            $this->connect($this->dbhost, $this->dbuser, $this->dbpw, $this->dbname, $this->dbcharset, $this->pconnect, $this->tablepre, $this->time);
-            $this->query($sql);
-        }
-        else
-        {
-            $s = '';
-            if ($message)
-            {
-                $s = "UCenter info: $message
                ";
-            }
-            if ($sql)
-            {
-                $s .= 'SQL:' . htmlspecialchars($sql) . '
                ';
-            }
-            $s .= 'Error:' . $error . '
                ';
-            $s .= 'Errno:' . $errorno . '
                ';
-            $s = str_replace(UC_DBTABLEPRE, '[Table]', $s);
-            exit($s);
-        }
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/lib/index.htm b/extend/fast/ucenter/client/uc_client/lib/index.htm
deleted file mode 100644
index 0519ecba..00000000
--- a/extend/fast/ucenter/client/uc_client/lib/index.htm
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/lib/sendmail.inc.php b/extend/fast/ucenter/client/uc_client/lib/sendmail.inc.php
deleted file mode 100644
index dcc165da..00000000
--- a/extend/fast/ucenter/client/uc_client/lib/sendmail.inc.php
+++ /dev/null
@@ -1,159 +0,0 @@
-base->cache['apps'][$mail['appid']]['name'];
-$mail['subject'] = '=?' . $mail['charset'] . '?B?' . base64_encode(str_replace("\r", '', str_replace("\n", '', '[' . $appname . '] ' . $mail['subject']))) . '?=';
-$mail['message'] = chunk_split(base64_encode(str_replace("\r\n.", " \r\n..", str_replace("\n", "\r\n", str_replace("\r", "\n", str_replace("\r\n", "\n", str_replace("\n\r", "\r", $mail['message'])))))));
-
-$email_from = $mail['frommail'] == '' ? '=?' . $mail['charset'] . '?B?' . base64_encode($appname) . "?= <$mail_setting[maildefault]>" : (preg_match('/^(.+?) \<(.+?)\>$/', $email_from, $from) ? '=?' . $mail['charset'] . '?B?' . base64_encode($from[1]) . "?= <$from[2]>" : $mail['frommail']);
-
-foreach (explode(',', $mail['email_to']) as $touser)
-{
-    $tousers[] = preg_match('/^(.+?) \<(.+?)\>$/', $touser, $to) ? ($mailusername ? '=?' . $mail['charset'] . '?B?' . base64_encode($to[1]) . "?= <$to[2]>" : $to[2]) : $touser;
-}
-
-$mail['email_to'] = implode(',', $tousers);
-
-$headers = "From: $email_from{$maildelimiter}X-Priority: 3{$maildelimiter}X-Mailer: Discuz! $version{$maildelimiter}MIME-Version: 1.0{$maildelimiter}Content-type: text/" . ($mail['htmlon'] ? 'html' : 'plain') . "; charset=$mail[charset]{$maildelimiter}Content-Transfer-Encoding: base64{$maildelimiter}";
-
-$mail_setting['mailport'] = $mail_setting['mailport'] ? $mail_setting['mailport'] : 25;
-
-if ($mail_setting['mailsend'] == 1 && function_exists('mail'))
-{
-
-    return @mail($mail['email_to'], $mail['subject'], $mail['message'], $headers);
-}
-elseif ($mail_setting['mailsend'] == 2)
-{
-
-    if (!$fp = fsocketopen($mail_setting['mailserver'], $mail_setting['mailport'], $errno, $errstr, 30))
-    {
-        return false;
-    }
-
-    stream_set_blocking($fp, true);
-
-    $lastmessage = fgets($fp, 512);
-    if (substr($lastmessage, 0, 3) != '220')
-    {
-        return false;
-    }
-
-    fputs($fp, ($mail_setting['mailauth'] ? 'EHLO' : 'HELO') . " discuz\r\n");
-    $lastmessage = fgets($fp, 512);
-    if (substr($lastmessage, 0, 3) != 220 && substr($lastmessage, 0, 3) != 250)
-    {
-        return false;
-    }
-
-    while (1)
-    {
-        if (substr($lastmessage, 3, 1) != '-' || empty($lastmessage))
-        {
-            break;
-        }
-        $lastmessage = fgets($fp, 512);
-    }
-
-    if ($mail_setting['mailauth'])
-    {
-        fputs($fp, "AUTH LOGIN\r\n");
-        $lastmessage = fgets($fp, 512);
-        if (substr($lastmessage, 0, 3) != 334)
-        {
-            return false;
-        }
-
-        fputs($fp, base64_encode($mail_setting['mailauth_username']) . "\r\n");
-        $lastmessage = fgets($fp, 512);
-        if (substr($lastmessage, 0, 3) != 334)
-        {
-            return false;
-        }
-
-        fputs($fp, base64_encode($mail_setting['mailauth_password']) . "\r\n");
-        $lastmessage = fgets($fp, 512);
-        if (substr($lastmessage, 0, 3) != 235)
-        {
-            return false;
-        }
-
-        $email_from = $mail_setting['mailfrom'];
-    }
-
-    fputs($fp, "MAIL FROM: <" . preg_replace("/.*\<(.+?)\>.*/", "\\1", $email_from) . ">\r\n");
-    $lastmessage = fgets($fp, 512);
-    if (substr($lastmessage, 0, 3) != 250)
-    {
-        fputs($fp, "MAIL FROM: <" . preg_replace("/.*\<(.+?)\>.*/", "\\1", $email_from) . ">\r\n");
-        $lastmessage = fgets($fp, 512);
-        if (substr($lastmessage, 0, 3) != 250)
-        {
-            return false;
-        }
-    }
-
-    $email_tos = array();
-    foreach (explode(',', $mail['email_to']) as $touser)
-    {
-        $touser = trim($touser);
-        if ($touser)
-        {
-            fputs($fp, "RCPT TO: <" . preg_replace("/.*\<(.+?)\>.*/", "\\1", $touser) . ">\r\n");
-            $lastmessage = fgets($fp, 512);
-            if (substr($lastmessage, 0, 3) != 250)
-            {
-                fputs($fp, "RCPT TO: <" . preg_replace("/.*\<(.+?)\>.*/", "\\1", $touser) . ">\r\n");
-                $lastmessage = fgets($fp, 512);
-                return false;
-            }
-        }
-    }
-
-    fputs($fp, "DATA\r\n");
-    $lastmessage = fgets($fp, 512);
-    if (substr($lastmessage, 0, 3) != 354)
-    {
-        return false;
-    }
-
-    $headers .= 'Message-ID: <' . gmdate('YmdHs') . '.' . substr(md5($mail['message'] . microtime()), 0, 6) . rand(100000, 999999) . '@' . $_SERVER['HTTP_HOST'] . ">{$maildelimiter}";
-
-    fputs($fp, "Date: " . gmdate('r') . "\r\n");
-    fputs($fp, "To: " . $mail['email_to'] . "\r\n");
-    fputs($fp, "Subject: " . $mail['subject'] . "\r\n");
-    fputs($fp, $headers . "\r\n");
-    fputs($fp, "\r\n\r\n");
-    fputs($fp, "$mail[message]\r\n.\r\n");
-    $lastmessage = fgets($fp, 512);
-    if (substr($lastmessage, 0, 3) != 250)
-    {
-        return false;
-    }
-
-    fputs($fp, "QUIT\r\n");
-    return true;
-}
-elseif ($mail_setting['mailsend'] == 3)
-{
-
-    ini_set('SMTP', $mail_setting['mailserver']);
-    ini_set('smtp_port', $mail_setting['mailport']);
-    ini_set('sendmail_from', $email_from);
-
-    return @mail($mail['email_to'], $mail['subject'], $mail['message'], $headers);
-}
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/lib/uccode.class.php b/extend/fast/ucenter/client/uc_client/lib/uccode.class.php
deleted file mode 100644
index 47150b54..00000000
--- a/extend/fast/ucenter/client/uc_client/lib/uccode.class.php
+++ /dev/null
@@ -1,174 +0,0 @@
-uccode();
-    }
-
-    function uccode()
-    {
-        $this->uccode = array(
-            'pcodecount' => -1,
-            'codecount'  => 0,
-            'codehtml'   => ''
-        );
-    }
-
-    function codedisp($code)
-    {
-        $this->uccode['pcodecount'] ++;
-        $code = str_replace('\\"', '"', preg_replace("/^[\n\r]*(.+?)[\n\r]*$/is", "\\1", $code));
-        $this->uccode['codehtml'][$this->uccode['pcodecount']] = $this->tpl_codedisp($code);
-        $this->uccode['codecount'] ++;
-        return "[\tUCENTER_CODE_" . $this->uccode[pcodecount] . "\t]";
-    }
-
-    function complie($message)
-    {
-        $message = dhtmlspecialchars($message);
-        if (strpos($message, '[/code]') !== FALSE)
-        {
-            $message = preg_replace("/\s*\[code\](.+?)\[\/code\]\s*/ies", "\$this->codedisp('\\1')", $message);
-        }
-        if (strpos($message, '[/url]') !== FALSE)
-        {
-            $message = preg_replace("/\[url(=((https?|ftp|gopher|news|telnet|rtsp|mms|callto|bctp|ed2k|thunder|synacast){1}:\/\/|www\.)([^\[\"']+?))?\](.+?)\[\/url\]/ies", "\$this->parseurl('\\1', '\\5')", $message);
-        }
-        if (strpos($message, '[/email]') !== FALSE)
-        {
-            $message = preg_replace("/\[email(=([a-z0-9\-_.+]+)@([a-z0-9\-_]+[.][a-z0-9\-_.]+))?\](.+?)\[\/email\]/ies", "\$this->parseemail('\\1', '\\4')", $message);
-        }
-        $message = str_replace(array(
-            '[/color]', '[/size]', '[/font]', '[/align]', '[b]', '[/b]',
-            '[i]', '[/i]', '[u]', '[/u]', '[list]', '[list=1]', '[list=a]',
-            '[list=A]', '[*]', '[/list]', '[indent]', '[/indent]', '[/float]'
-                ), array(
-            '', '', '', '
                ', '', '', '',
-            '', '', '', '
                  ', '
                    ', '
                      ',
-            '
                        ', '
                      • ', '
                      ', '
                      ', '
                      ', ''
-                ), preg_replace(array(
-            "/\[color=([#\w]+?)\]/i",
-            "/\[size=(\d+?)\]/i",
-            "/\[size=(\d+(\.\d+)?(px|pt|in|cm|mm|pc|em|ex|%)+?)\]/i",
-            "/\[font=([^\[\<]+?)\]/i",
-            "/\[align=(left|center|right)\]/i",
-            "/\[float=(left|right)\]/i"
-                        ), array(
-            "",
-            "",
-            "",
-            "",
-            "
                      ",
-            ""
-                        ), $message));
-        if (strpos($message, '[/quote]') !== FALSE)
-        {
-            $message = preg_replace("/\s*\[quote\][\n\r]*(.+?)[\n\r]*\[\/quote\]\s*/is", $this->tpl_quote(), $message);
-        }
-        if (strpos($message, '[/img]') !== FALSE)
-        {
-            $message = preg_replace(array(
-                "/\[img\]\s*([^\[\<\r\n]+?)\s*\[\/img\]/ies",
-                "/\[img=(\d{1,4})[x|\,](\d{1,4})\]\s*([^\[\<\r\n]+?)\s*\[\/img\]/ies"
-                    ), array(
-                "\$this->bbcodeurl('\\1', '\"\"')",
-                "\$this->bbcodeurl('\\3', '\"\"')"
-                    ), $message);
-        }
-        for ($i = 0; $i <= $this->uccode['pcodecount']; $i++)
-        {
-            $message = str_replace("[\tUCENTER_CODE_$i\t]", $this->uccode['codehtml'][$i], $message);
-        }
-        return nl2br(str_replace(array("\t", '   ', '  '), array('        ', '   ', '  '), $message));
-    }
-
-    function parseurl($url, $text)
-    {
-        if (!$url && preg_match("/((https?|ftp|gopher|news|telnet|rtsp|mms|callto|bctp|ed2k|thunder|synacast){1}:\/\/|www\.)[^\[\"']+/i", trim($text), $matches))
-        {
-            $url = $matches[0];
-            $length = 65;
-            if (strlen($url) > $length)
-            {
-                $text = substr($url, 0, intval($length * 0.5)) . ' ... ' . substr($url, - intval($length * 0.3));
-            }
-            return '' . $text . '';
-        }
-        else
-        {
-            $url = substr($url, 1);
-            if (substr(strtolower($url), 0, 4) == 'www.')
-            {
-                $url = 'http://' . $url;
-            }
-            return '' . $text . '';
-        }
-    }
-
-    function parseemail($email, $text)
-    {
-        $text = str_replace('\"', '"', $text);
-        if (!$email && preg_match("/\s*([a-z0-9\-_.+]+)@([a-z0-9\-_]+[.][a-z0-9\-_.]+)\s*/i", $text, $matches))
-        {
-            $email = trim($matches[0]);
-            return '' . $email . '';
-        }
-        else
-        {
-            return '' . $text . '';
-        }
-    }
-
-    function bbcodeurl($url, $tags)
-    {
-        if (!preg_match("/<.+?>/s", $url))
-        {
-            if (!in_array(strtolower(substr($url, 0, 6)), array('http:/', 'https:', 'ftp://', 'rtsp:/', 'mms://')))
-            {
-                $url = 'http://' . $url;
-            }
-            return str_replace(array('submit', 'logging.php'), array('', ''), sprintf($tags, $url, addslashes($url)));
-        }
-        else
-        {
-            return ' ' . $url;
-        }
-    }
-
-    function tpl_codedisp($code)
-    {
-        return '
                      ' . $code . '
                      ';
-    }
-
-    function tpl_quote()
-    {
-        return '
                      \\1
                      ';
-    }
-
-}
-
-/*
-
-Usage:
-$str = <<uccode = new uccode();
-echo $this->uccode->complie($str);
-
-*/
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/lib/xml.class.php b/extend/fast/ucenter/client/uc_client/lib/xml.class.php
deleted file mode 100644
index 73c528bb..00000000
--- a/extend/fast/ucenter/client/uc_client/lib/xml.class.php
+++ /dev/null
@@ -1,129 +0,0 @@
-parse($xml);
-    $xml_parser->destruct();
-    return $data;
-}
-
-function xml_serialize($arr, $htmlon = FALSE, $isnormal = FALSE, $level = 1)
-{
-    $s = $level == 1 ? "\r\n\r\n" : '';
-    $space = str_repeat("\t", $level);
-    foreach ($arr as $k => $v)
-    {
-        if (!is_array($v))
-        {
-            $s .= $space . "" . ($htmlon ? '' : '') . "\r\n";
-        }
-        else
-        {
-            $s .= $space . "\r\n" . xml_serialize($v, $htmlon, $isnormal, $level + 1) . $space . "\r\n";
-        }
-    }
-    $s = preg_replace("/([\x01-\x08\x0b-\x0c\x0e-\x1f])+/", ' ', $s);
-    return $level == 1 ? $s . "" : $s;
-}
-
-class XML
-{
-
-    var $parser;
-    var $document;
-    var $stack;
-    var $data;
-    var $last_opened_tag;
-    var $isnormal;
-    var $attrs = array();
-    var $failed = FALSE;
-
-    function __construct($isnormal)
-    {
-        $this->XML($isnormal);
-    }
-
-    function XML($isnormal)
-    {
-        $this->isnormal = $isnormal;
-        $this->parser = xml_parser_create('ISO-8859-1');
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, false);
-        xml_set_object($this->parser, $this);
-        xml_set_element_handler($this->parser, 'open', 'close');
-        xml_set_character_data_handler($this->parser, 'data');
-    }
-
-    function destruct()
-    {
-        xml_parser_free($this->parser);
-    }
-
-    function parse(&$data)
-    {
-        $this->document = array();
-        $this->stack = array();
-        return xml_parse($this->parser, $data, true) && !$this->failed ? $this->document : '';
-    }
-
-    function open(&$parser, $tag, $attributes)
-    {
-        $this->data = '';
-        $this->failed = FALSE;
-        if (!$this->isnormal)
-        {
-            if (isset($attributes['id']) && !is_string($this->document[$attributes['id']]))
-            {
-                $this->document = &$this->document[$attributes['id']];
-            }
-            else
-            {
-                $this->failed = TRUE;
-            }
-        }
-        else
-        {
-            if (!isset($this->document[$tag]) || !is_string($this->document[$tag]))
-            {
-                $this->document = &$this->document[$tag];
-            }
-            else
-            {
-                $this->failed = TRUE;
-            }
-        }
-        $this->stack[] = &$this->document;
-        $this->last_opened_tag = $tag;
-        $this->attrs = $attributes;
-    }
-
-    function data(&$parser, $data)
-    {
-        if ($this->last_opened_tag != NULL)
-        {
-            $this->data .= $data;
-        }
-    }
-
-    function close(&$parser, $tag)
-    {
-        if ($this->last_opened_tag == $tag)
-        {
-            $this->document = $this->data;
-            $this->last_opened_tag = NULL;
-        }
-        array_pop($this->stack);
-        if ($this->stack)
-        {
-            $this->document = &$this->stack[count($this->stack) - 1];
-        }
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/app.php b/extend/fast/ucenter/client/uc_client/model/app.php
deleted file mode 100644
index a3fdac59..00000000
--- a/extend/fast/ucenter/client/uc_client/model/app.php
+++ /dev/null
@@ -1,40 +0,0 @@
-appmodel($base);
-    }
-
-    function appmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function get_apps($col = '*', $where = '')
-    {
-        $arr = $this->db->fetch_all("SELECT $col FROM " . UC_DBTABLEPRE . "applications" . ($where ? ' WHERE ' . $where : ''), 'appid');
-        foreach ($arr as $k => $v)
-        {
-            isset($v['extra']) && !empty($v['extra']) && $v['extra'] = unserialize($v['extra']);
-            unset($v['authkey']);
-            $arr[$k] = $v;
-        }
-        return $arr;
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/base.php b/extend/fast/ucenter/client/uc_client/model/base.php
deleted file mode 100644
index 32dcf161..00000000
--- a/extend/fast/ucenter/client/uc_client/model/base.php
+++ /dev/null
@@ -1,347 +0,0 @@
-base();
-    }
-
-    function base()
-    {
-        $this->init_var();
-        $this->init_db();
-        $this->init_cache();
-        $this->init_note();
-        $this->init_mail();
-    }
-
-    function init_var()
-    {
-        $this->time = time();
-        $cip = getenv('HTTP_CLIENT_IP');
-        $xip = getenv('HTTP_X_FORWARDED_FOR');
-        $rip = getenv('REMOTE_ADDR');
-        $srip = $_SERVER['REMOTE_ADDR'];
-        if ($cip && strcasecmp($cip, 'unknown'))
-        {
-            $this->onlineip = $cip;
-        }
-        elseif ($xip && strcasecmp($xip, 'unknown'))
-        {
-            $this->onlineip = $xip;
-        }
-        elseif ($rip && strcasecmp($rip, 'unknown'))
-        {
-            $this->onlineip = $rip;
-        }
-        elseif ($srip && strcasecmp($srip, 'unknown'))
-        {
-            $this->onlineip = $srip;
-        }
-        preg_match("/[\d\.]{7,15}/", $this->onlineip, $match);
-        $this->onlineip = $match[0] ? $match[0] : 'unknown';
-        $this->app['appid'] = UC_APPID;
-    }
-
-    function init_input()
-    {
-
-    }
-
-    function init_db()
-    {
-        if (function_exists("mysqli_connect"))
-        {
-            require_once UC_ROOT . 'lib/dbi.class.php';
-        }
-        else
-        {
-            require_once UC_ROOT . 'lib/db.class.php';
-        }
-        $this->db = new ucclient_db();
-        $this->db->connect(UC_DBHOST, UC_DBUSER, UC_DBPW, '', UC_DBCHARSET, UC_DBCONNECT, UC_DBTABLEPRE);
-    }
-
-    function load($model, $base = NULL)
-    {
-        $base = $base ? $base : $this;
-        if (empty($_ENV[$model]))
-        {
-            require_once UC_ROOT . "./model/{$model}.php";
-            $classname = $model . 'model';
-            $_ENV[$model] = new $classname($base);
-        }
-        return $_ENV[$model];
-    }
-
-    function date($time, $type = 3)
-    {
-        if (!$this->settings)
-        {
-            $this->settings = $this->cache('settings');
-        }
-        $format[] = $type & 2 ? (!empty($this->settings['dateformat']) ? $this->settings['dateformat'] : 'Y-n-j') : '';
-        $format[] = $type & 1 ? (!empty($this->settings['timeformat']) ? $this->settings['timeformat'] : 'H:i') : '';
-        return gmdate(implode(' ', $format), $time + $this->settings['timeoffset']);
-    }
-
-    function page_get_start($page, $ppp, $totalnum)
-    {
-        $totalpage = ceil($totalnum / $ppp);
-        $page = max(1, min($totalpage, intval($page)));
-        return ($page - 1) * $ppp;
-    }
-
-    function implode($arr)
-    {
-        return "'" . implode("','", (array) $arr) . "'";
-    }
-
-    function &cache($cachefile)
-    {
-        static $_CACHE = array();
-        if (!isset($_CACHE[$cachefile]))
-        {
-            $cachepath = UC_DATADIR . './cache/' . $cachefile . '.php';
-            if (!file_exists($cachepath))
-            {
-                $this->load('cache');
-                $_ENV['cache']->updatedata($cachefile);
-            }
-            else
-            {
-                include_once $cachepath;
-            }
-        }
-        return $_CACHE[$cachefile];
-    }
-
-    function get_setting($k = array(), $decode = FALSE)
-    {
-        $return = array();
-        $sqladd = $k ? "WHERE k IN (" . $this->implode($k) . ")" : '';
-        $settings = $this->db->fetch_all("SELECT * FROM " . UC_DBTABLEPRE . "settings $sqladd");
-        if (is_array($settings))
-        {
-            foreach ($settings as $arr)
-            {
-                $return[$arr['k']] = $decode ? unserialize($arr['v']) : $arr['v'];
-            }
-        }
-        return $return;
-    }
-
-    function init_cache()
-    {
-        $this->settings = $this->cache('settings');
-        $this->cache['apps'] = $this->cache('apps');
-
-        if (PHP_VERSION > '5.1')
-        {
-            $timeoffset = intval($this->settings['timeoffset'] / 3600);
-            @date_default_timezone_set('Etc/GMT' . ($timeoffset > 0 ? '-' : '+') . (abs($timeoffset)));
-        }
-    }
-
-    function cutstr($string, $length, $dot = ' ...')
-    {
-        if (strlen($string) <= $length)
-        {
-            return $string;
-        }
-
-        $string = str_replace(array('&', '"', '<', '>'), array('&', '"', '<', '>'), $string);
-
-        $strcut = '';
-        if (strtolower(UC_CHARSET) == 'utf-8')
-        {
-
-            $n = $tn = $noc = 0;
-            while ($n < strlen($string))
-            {
-
-                $t = ord($string[$n]);
-                if ($t == 9 || $t == 10 || (32 <= $t && $t <= 126))
-                {
-                    $tn = 1;
-                    $n++;
-                    $noc++;
-                }
-                elseif (194 <= $t && $t <= 223)
-                {
-                    $tn = 2;
-                    $n += 2;
-                    $noc += 2;
-                }
-                elseif (224 <= $t && $t < 239)
-                {
-                    $tn = 3;
-                    $n += 3;
-                    $noc += 2;
-                }
-                elseif (240 <= $t && $t <= 247)
-                {
-                    $tn = 4;
-                    $n += 4;
-                    $noc += 2;
-                }
-                elseif (248 <= $t && $t <= 251)
-                {
-                    $tn = 5;
-                    $n += 5;
-                    $noc += 2;
-                }
-                elseif ($t == 252 || $t == 253)
-                {
-                    $tn = 6;
-                    $n += 6;
-                    $noc += 2;
-                }
-                else
-                {
-                    $n++;
-                }
-
-                if ($noc >= $length)
-                {
-                    break;
-                }
-            }
-            if ($noc > $length)
-            {
-                $n -= $tn;
-            }
-
-            $strcut = substr($string, 0, $n);
-        }
-        else
-        {
-            for ($i = 0; $i < $length; $i++)
-            {
-                $strcut .= ord($string[$i]) > 127 ? $string[$i] . $string[++$i] : $string[$i];
-            }
-        }
-
-        $strcut = str_replace(array('&', '"', '<', '>'), array('&', '"', '<', '>'), $strcut);
-
-        return $strcut . $dot;
-    }
-
-    function init_note()
-    {
-        if ($this->note_exists())
-        {
-            $this->load('note');
-            $_ENV['note']->send();
-        }
-    }
-
-    function note_exists()
-    {
-        $noteexists = $this->db->result_first("SELECT value FROM " . UC_DBTABLEPRE . "vars WHERE name='noteexists" . UC_APPID . "'");
-        if (empty($noteexists))
-        {
-            return FALSE;
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function init_mail()
-    {
-        if ($this->mail_exists() && !getgpc('inajax'))
-        {
-            $this->load('mail');
-            $_ENV['mail']->send();
-        }
-    }
-
-    function authcode($string, $operation = 'DECODE', $key = '', $expiry = 0)
-    {
-        return uc_authcode($string, $operation, $key, $expiry);
-    }
-
-    function unserialize($s)
-    {
-        return uc_unserialize($s);
-    }
-
-    function input($k)
-    {
-        return isset($this->input[$k]) ? (is_array($this->input[$k]) ? $this->input[$k] : trim($this->input[$k])) : NULL;
-    }
-
-    function mail_exists()
-    {
-        $mailexists = $this->db->result_first("SELECT value FROM " . UC_DBTABLEPRE . "vars WHERE name='mailexists'");
-        if (empty($mailexists))
-        {
-            return FALSE;
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function dstripslashes($string)
-    {
-        if (is_array($string))
-        {
-            foreach ($string as $key => $val)
-            {
-                $string[$key] = $this->dstripslashes($val);
-            }
-        }
-        else
-        {
-            $string = stripslashes($string);
-        }
-        return $string;
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/cache.php b/extend/fast/ucenter/client/uc_client/model/cache.php
deleted file mode 100644
index d0851ede..00000000
--- a/extend/fast/ucenter/client/uc_client/model/cache.php
+++ /dev/null
@@ -1,119 +0,0 @@
-cachemodel($base);
-    }
-
-    function cachemodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-        $this->map = array(
-            'settings' => array('settings'),
-            'badwords' => array('badwords'),
-            'apps'     => array('apps')
-        );
-    }
-
-    function updatedata($cachefile = '')
-    {
-        if ($cachefile)
-        {
-            foreach ((array) $this->map[$cachefile] as $modules)
-            {
-                $s = "$method(), TRUE) . ";\r\n";
-                }
-                $s .= "\r\n?>";
-                @file_put_contents(UC_DATADIR . "./cache/$cachefile.php", $s);
-            }
-        }
-        else
-        {
-            foreach ((array) $this->map as $file => $modules)
-            {
-                $s = "$method(), TRUE) . ";\r\n";
-                }
-                $s .= "\r\n?>";
-                @file_put_contents(UC_DATADIR . "./cache/$file.php", $s);
-            }
-        }
-    }
-
-    function updatetpl()
-    {
-
-    }
-
-    function _get_badwords()
-    {
-        $data = $this->db->fetch_all("SELECT * FROM " . UC_DBTABLEPRE . "badwords");
-        $return = array();
-        if (is_array($data))
-        {
-            foreach ($data as $k => $v)
-            {
-                $return['findpattern'][$k] = $v['findpattern'];
-                $return['replace'][$k] = $v['replacement'];
-            }
-        }
-        return $return;
-    }
-
-    function _get_apps()
-    {
-        $this->base->load('app');
-        $apps = $_ENV['app']->get_apps();
-        $apps2 = array();
-        if (is_array($apps))
-        {
-            foreach ($apps as $v)
-            {
-                $v['extra'] = unserialize($v['extra']);
-                $apps2[$v['appid']] = $v;
-            }
-        }
-        return $apps2;
-    }
-
-    function _get_settings()
-    {
-        return $this->base->get_setting();
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/domain.php b/extend/fast/ucenter/client/uc_client/model/domain.php
deleted file mode 100644
index 6fc966fe..00000000
--- a/extend/fast/ucenter/client/uc_client/model/domain.php
+++ /dev/null
@@ -1,63 +0,0 @@
-domainmodel($base);
-    }
-
-    function domainmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function add_domain($domain, $ip)
-    {
-        if ($domain)
-        {
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "domains SET domain='$domain', ip='$ip'");
-        }
-        return $this->db->insert_id();
-    }
-
-    function get_total_num()
-    {
-        $data = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "domains");
-        return $data;
-    }
-
-    function get_list($page, $ppp, $totalnum)
-    {
-        $start = $this->base->page_get_start($page, $ppp, $totalnum);
-        $data = $this->db->fetch_all("SELECT * FROM " . UC_DBTABLEPRE . "domains LIMIT $start, $ppp");
-        return $data;
-    }
-
-    function delete_domain($arr)
-    {
-        $domainids = $this->base->implode($arr);
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "domains WHERE id IN ($domainids)");
-        return $this->db->affected_rows();
-    }
-
-    function update_domain($domain, $ip, $id)
-    {
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "domains SET domain='$domain', ip='$ip' WHERE id='$id'");
-        return $this->db->affected_rows();
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/friend.php b/extend/fast/ucenter/client/uc_client/model/friend.php
deleted file mode 100644
index 58c641aa..00000000
--- a/extend/fast/ucenter/client/uc_client/model/friend.php
+++ /dev/null
@@ -1,148 +0,0 @@
-friendmodel($base);
-    }
-
-    function friendmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function add($uid, $friendid, $comment = '')
-    {
-        $direction = $this->db->result_first("SELECT direction FROM " . UC_DBTABLEPRE . "friends WHERE uid='$friendid' AND friendid='$uid' LIMIT 1");
-        if ($direction == 1)
-        {
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "friends SET uid='$uid', friendid='$friendid', comment='$comment', direction='3'", 'SILENT');
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "friends SET direction='3' WHERE uid='$friendid' AND friendid='$uid'");
-            return 1;
-        }
-        elseif ($direction == 2)
-        {
-            return 1;
-        }
-        elseif ($direction == 3)
-        {
-            return -1;
-        }
-        else
-        {
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "friends SET uid='$uid', friendid='$friendid', comment='$comment', direction='1'", 'SILENT');
-            return $this->db->insert_id();
-        }
-    }
-
-    function delete($uid, $friendids)
-    {
-        $friendids = $this->base->implode($friendids);
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "friends WHERE uid='$uid' AND friendid IN ($friendids)");
-        $affectedrows = $this->db->affected_rows();
-        if ($affectedrows > 0)
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "friends SET direction=1 WHERE uid IN ($friendids) AND friendid='$uid' AND direction='3'");
-        }
-        return $affectedrows;
-    }
-
-    function get_totalnum_by_uid($uid, $direction = 0)
-    {
-        $sqladd = '';
-        if ($direction == 0)
-        {
-            $sqladd = "uid='$uid'";
-        }
-        elseif ($direction == 1)
-        {
-            $sqladd = "uid='$uid' AND direction='1'";
-        }
-        elseif ($direction == 2)
-        {
-            $sqladd = "friendid='$uid' AND direction='1'";
-        }
-        elseif ($direction == 3)
-        {
-            $sqladd = "uid='$uid' AND direction='3'";
-        }
-        $totalnum = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "friends WHERE $sqladd");
-        return $totalnum;
-    }
-
-    function get_list($uid, $page, $pagesize, $totalnum, $direction = 0)
-    {
-        $start = $this->base->page_get_start($page, $pagesize, $totalnum);
-        $sqladd = '';
-        if ($direction == 0)
-        {
-            $sqladd = "f.uid='$uid'";
-        }
-        elseif ($direction == 1)
-        {
-            $sqladd = "f.uid='$uid' AND f.direction='1'";
-        }
-        elseif ($direction == 2)
-        {
-            $sqladd = "f.friendid='$uid' AND f.direction='1'";
-        }
-        elseif ($direction == 3)
-        {
-            $sqladd = "f.uid='$uid' AND f.direction='3'";
-        }
-        if ($sqladd)
-        {
-            $data = $this->db->fetch_all("SELECT f.*, m.username FROM " . UC_DBTABLEPRE . "friends f LEFT JOIN " . UC_DBTABLEPRE . "members m ON f.friendid=m.uid WHERE $sqladd LIMIT $start, $pagesize");
-            return $data;
-        }
-        else
-        {
-            return array();
-        }
-    }
-
-    function is_friend($uid, $friendids, $direction = 0)
-    {
-        $friendid_str = implode("', '", $friendids);
-        $sqladd = '';
-        if ($direction == 0)
-        {
-            $sqladd = "uid='$uid'";
-        }
-        elseif ($direction == 1)
-        {
-            $sqladd = "uid='$uid' AND friendid IN ('$friendid_str') AND direction='1'";
-        }
-        elseif ($direction == 2)
-        {
-            $sqladd = "friendid='$uid' AND uid IN ('$friendid_str') AND direction='1'";
-        }
-        elseif ($direction == 3)
-        {
-            $sqladd = "uid='$uid' AND friendid IN ('$friendid_str') AND direction='3'";
-        }
-        if ($this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "friends WHERE $sqladd") == count($friendids))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/index.htm b/extend/fast/ucenter/client/uc_client/model/index.htm
deleted file mode 100644
index 0519ecba..00000000
--- a/extend/fast/ucenter/client/uc_client/model/index.htm
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/extend/fast/ucenter/client/uc_client/model/mail.php b/extend/fast/ucenter/client/uc_client/model/mail.php
deleted file mode 100644
index 46e9983d..00000000
--- a/extend/fast/ucenter/client/uc_client/model/mail.php
+++ /dev/null
@@ -1,181 +0,0 @@
-mailmodel($base);
-    }
-
-    function mailmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-        $this->apps = &$this->base->cache['apps'];
-    }
-
-    function get_total_num()
-    {
-        $data = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "mailqueue");
-        return $data;
-    }
-
-    function get_list($page, $ppp, $totalnum)
-    {
-        $start = $this->base->page_get_start($page, $ppp, $totalnum);
-        $data = $this->db->fetch_all("SELECT m.*, u.username, u.email FROM " . UC_DBTABLEPRE . "mailqueue m LEFT JOIN " . UC_DBTABLEPRE . "members u ON m.touid=u.uid ORDER BY dateline DESC LIMIT $start, $ppp");
-        foreach ((array) $data as $k => $v)
-        {
-            $data[$k]['subject'] = dhtmlspecialchars($v['subject']);
-            $data[$k]['tomail'] = empty($v['tomail']) ? $v['email'] : $v['tomail'];
-            $data[$k]['dateline'] = $v['dateline'] ? $this->base->date($data[$k]['dateline']) : '';
-            $data[$k]['appname'] = $this->base->cache['apps'][$v['appid']]['name'];
-        }
-        return $data;
-    }
-
-    function delete_mail($ids)
-    {
-        $ids = $this->base->implode($ids);
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "mailqueue WHERE mailid IN ($ids)");
-        return $this->db->affected_rows();
-    }
-
-    function add($mail)
-    {
-        if ($mail['level'])
-        {
-            $sql = "INSERT INTO " . UC_DBTABLEPRE . "mailqueue (touid, tomail, subject, message, frommail, charset, htmlon, level, dateline, failures, appid) VALUES ";
-            $values_arr = array();
-            foreach ($mail['uids'] as $uid)
-            {
-                if (empty($uid))
-                    continue;
-                $values_arr[] = "('$uid', '', '$mail[subject]', '$mail[message]', '$mail[frommail]', '$mail[charset]', '$mail[htmlon]', '$mail[level]', '$mail[dateline]', '0', '$mail[appid]')";
-            }
-            foreach ($mail['emails'] as $email)
-            {
-                if (empty($email))
-                    continue;
-                $values_arr[] = "('', '$email', '$mail[subject]', '$mail[message]', '$mail[frommail]', '$mail[charset]', '$mail[htmlon]', '$mail[level]', '$mail[dateline]', '0', '$mail[appid]')";
-            }
-            $sql .= implode(',', $values_arr);
-            $this->db->query($sql);
-            $insert_id = $this->db->insert_id();
-            $insert_id && $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "vars SET name='mailexists', value='1'");
-            return $insert_id;
-        } else
-        {
-            $mail['email_to'] = array();
-            $uids = 0;
-            foreach ($mail['uids'] as $uid)
-            {
-                if (empty($uid))
-                    continue;
-                $uids .= ',' . $uid;
-            }
-            $users = $this->db->fetch_all("SELECT uid, username, email FROM " . UC_DBTABLEPRE . "members WHERE uid IN ($uids)");
-            foreach ($users as $v)
-            {
-                $mail['email_to'][] = $v['username'] . '<' . $v['email'] . '>';
-            }
-            foreach ($mail['emails'] as $email)
-            {
-                if (empty($email))
-                    continue;
-                $mail['email_to'][] = $email;
-            }
-            $mail['message'] = str_replace('\"', '"', $mail['message']);
-            $mail['email_to'] = implode(',', $mail['email_to']);
-            return $this->send_one_mail($mail);
-        }
-    }
-
-    function send()
-    {
-        register_shutdown_function(array($this, '_send'));
-    }
-
-    function _send()
-    {
-
-        $mail = $this->_get_mail();
-        if (empty($mail))
-        {
-            $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "vars SET name='mailexists', value='0'");
-            return NULL;
-        }
-        else
-        {
-            $mail['email_to'] = $mail['tomail'] ? $mail['tomail'] : $mail['username'] . '<' . $mail['email'] . '>';
-            if ($this->send_one_mail($mail))
-            {
-                $this->_delete_one_mail($mail['mailid']);
-                return true;
-            }
-            else
-            {
-                $this->_update_failures($mail['mailid']);
-                return false;
-            }
-        }
-    }
-
-    function send_by_id($mailid)
-    {
-        if ($this->send_one_mail($this->_get_mail_by_id($mailid)))
-        {
-            $this->_delete_one_mail($mailid);
-            return true;
-        }
-    }
-
-    function send_one_mail($mail)
-    {
-        if (empty($mail))
-            return;
-        $mail['email_to'] = $mail['email_to'] ? $mail['email_to'] : $mail['username'] . '<' . $mail['email'] . '>';
-        $mail_setting = $this->base->settings;
-        return include UC_ROOT . 'lib/sendmail.inc.php';
-    }
-
-    function _get_mail()
-    {
-        $data = $this->db->fetch_first("SELECT m.*, u.username, u.email FROM " . UC_DBTABLEPRE . "mailqueue m LEFT JOIN " . UC_DBTABLEPRE . "members u ON m.touid=u.uid WHERE failures<'" . UC_MAIL_REPEAT . "' ORDER BY level DESC, mailid ASC LIMIT 1");
-        return $data;
-    }
-
-    function _get_mail_by_id($mailid)
-    {
-        $data = $this->db->fetch_first("SELECT m.*, u.username, u.email FROM " . UC_DBTABLEPRE . "mailqueue m LEFT JOIN " . UC_DBTABLEPRE . "members u ON m.touid=u.uid WHERE mailid='$mailid'");
-        return $data;
-    }
-
-    function _delete_one_mail($mailid)
-    {
-        $mailid = intval($mailid);
-        return $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "mailqueue WHERE mailid='$mailid'");
-    }
-
-    function _update_failures($mailid)
-    {
-        $mailid = intval($mailid);
-        return $this->db->query("UPDATE " . UC_DBTABLEPRE . "mailqueue SET failures=failures+1 WHERE mailid='$mailid'");
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/misc.php b/extend/fast/ucenter/client/uc_client/model/misc.php
deleted file mode 100644
index bb83ab50..00000000
--- a/extend/fast/ucenter/client/uc_client/model/misc.php
+++ /dev/null
@@ -1,198 +0,0 @@
-miscmodel($base);
-    }
-
-    function miscmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function get_apps($col = '*', $where = '')
-    {
-        $arr = $this->db->fetch_all("SELECT $col FROM " . UC_DBTABLEPRE . "applications" . ($where ? ' WHERE ' . $where : ''));
-        return $arr;
-    }
-
-    function delete_apps($appids)
-    {
-
-    }
-
-    function update_app($appid, $name, $url, $authkey, $charset, $dbcharset)
-    {
-
-    }
-
-    function alter_app_table($appid, $operation = 'ADD')
-    {
-
-    }
-
-    function get_host_by_url($url)
-    {
-
-    }
-
-    function check_url($url)
-    {
-
-    }
-
-    function check_ip($url)
-    {
-
-    }
-
-    function test_api($url, $ip = '')
-    {
-
-    }
-
-    function dfopen2($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE, $encodetype = 'URLENCODE')
-    {
-        $__times__ = isset($_GET['__times__']) ? intval($_GET['__times__']) + 1 : 1;
-        if ($__times__ > 2)
-        {
-            return '';
-        }
-        $url .= (strpos($url, '?') === FALSE ? '?' : '&') . "__times__=$__times__";
-        return $this->dfopen($url, $limit, $post, $cookie, $bysocket, $ip, $timeout, $block, $encodetype);
-    }
-
-    function dfopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE, $encodetype = 'URLENCODE')
-    {
-        $return = '';
-        $matches = parse_url($url);
-        $scheme = $matches['scheme'];
-        $host = $matches['host'];
-        $path = $matches['path'] ? $matches['path'] . ($matches['query'] ? '?' . $matches['query'] : '') : '/';
-        $port = !empty($matches['port']) ? $matches['port'] : 80;
-
-        if ($post)
-        {
-            $out = "POST $path HTTP/1.0\r\n";
-            $header = "Accept: */*\r\n";
-            $header .= "Accept-Language: zh-cn\r\n";
-            $boundary = $encodetype == 'URLENCODE' ? '' : ';' . substr($post, 0, trim(strpos($post, "\n")));
-            $header .= $encodetype == 'URLENCODE' ? "Content-Type: application/x-www-form-urlencoded\r\n" : "Content-Type: multipart/form-data$boundary\r\n";
-            $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n";
-            $header .= "Host: $host:$port\r\n";
-            $header .= 'Content-Length: ' . strlen($post) . "\r\n";
-            $header .= "Connection: Close\r\n";
-            $header .= "Cache-Control: no-cache\r\n";
-            $header .= "Cookie: $cookie\r\n\r\n";
-            $out .= $header . $post;
-        }
-        else
-        {
-            $out = "GET $path HTTP/1.0\r\n";
-            $header = "Accept: */*\r\n";
-            $header .= "Accept-Language: zh-cn\r\n";
-            $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n";
-            $header .= "Host: $host:$port\r\n";
-            $header .= "Connection: Close\r\n";
-            $header .= "Cookie: $cookie\r\n\r\n";
-            $out .= $header;
-        }
-
-        $fpflag = 0;
-        if (!$fp = @fsocketopen(($ip ? $ip : $host), $port, $errno, $errstr, $timeout))
-        {
-            $context = array(
-                'http' => array(
-                    'method'  => $post ? 'POST' : 'GET',
-                    'header'  => $header,
-                    'content' => $post,
-                    'timeout' => $timeout,
-                ),
-            );
-            $context = stream_context_create($context);
-            $fp = @fopen($scheme . '://' . ($ip ? $ip : $host) . ':' . $port . $path, 'b', false, $context);
-            $fpflag = 1;
-        }
-
-        if (!$fp)
-        {
-            return '';
-        }
-        else
-        {
-            stream_set_blocking($fp, $block);
-            stream_set_timeout($fp, $timeout);
-            @fwrite($fp, $out);
-            $status = stream_get_meta_data($fp);
-            if (!$status['timed_out'])
-            {
-                while (!feof($fp) && !$fpflag)
-                {
-                    if (($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n"))
-                    {
-                        break;
-                    }
-                }
-
-                $stop = false;
-                while (!feof($fp) && !$stop)
-                {
-                    $data = fread($fp, ($limit == 0 || $limit > 8192 ? 8192 : $limit));
-                    $return .= $data;
-                    if ($limit)
-                    {
-                        $limit -= strlen($data);
-                        $stop = $limit <= 0;
-                    }
-                }
-            }
-            @fclose($fp);
-            return $return;
-        }
-    }
-
-    function array2string($arr)
-    {
-        $s = $sep = '';
-        if ($arr && is_array($arr))
-        {
-            foreach ($arr as $k => $v)
-            {
-                $s .= $sep . addslashes($k) . UC_ARRAY_SEP_1 . $v;
-                $sep = UC_ARRAY_SEP_2;
-            }
-        }
-        return $s;
-    }
-
-    function string2array($s)
-    {
-        $arr = explode(UC_ARRAY_SEP_2, $s);
-        $arr2 = array();
-        foreach ($arr as $k => $v)
-        {
-            list($key, $val) = explode(UC_ARRAY_SEP_1, $v);
-            $arr2[$key] = $val;
-        }
-        return $arr2;
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/note.php b/extend/fast/ucenter/client/uc_client/model/note.php
deleted file mode 100644
index 0ca5141e..00000000
--- a/extend/fast/ucenter/client/uc_client/model/note.php
+++ /dev/null
@@ -1,230 +0,0 @@
-notemodel($base);
-    }
-
-    function notemodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-        $this->apps = $this->base->cache('apps');
-        $this->operations = array(
-            'test'                 => array('', 'action=test'),
-            'deleteuser'           => array('', 'action=deleteuser'),
-            'deletefriend'         => array('', 'action=deletefriend'),
-            'gettag'               => array('', 'action=gettag', 'tag', 'updatedata'),
-            'getcreditsettings'    => array('', 'action=getcreditsettings'),
-            'getcredit'            => array('', 'action=getcredit'),
-            'updatecreditsettings' => array('', 'action=updatecreditsettings'),
-            'updateclient'         => array('', 'action=updateclient'),
-            'updatepw'             => array('', 'action=updatepw'),
-            'updateinfo'           => array('', 'action=updateinfo'),
-            'updatebadwords'       => array('', 'action=updatebadwords'),
-            'updatehosts'          => array('', 'action=updatehosts'),
-            'updateapps'           => array('', 'action=updateapps'),
-            'updatecredit'         => array('', 'action=updatecredit'),
-        );
-    }
-
-    function get_total_num($all = TRUE)
-    {
-
-    }
-
-    function get_list($page, $ppp, $totalnum, $all = TRUE)
-    {
-
-    }
-
-    function delete_note($ids)
-    {
-
-    }
-
-    function add($operation, $getdata = '', $postdata = '', $appids = array(), $pri = 0)
-    {
-        $extra = $varextra = '';
-        $appadd = $varadd = array();
-        foreach ((array) $this->apps as $appid => $app)
-        {
-            $appid = $app['appid'];
-            if ($appid == intval($appid))
-            {
-                if ($appids && !in_array($appid, $appids))
-                {
-                    $appadd[] = 'app' . $appid . "='1'";
-                }
-                else
-                {
-                    $varadd[] = "('noteexists{$appid}', '1')";
-                }
-            }
-        }
-        if ($appadd)
-        {
-            $extra = implode(',', $appadd);
-            $extra = $extra ? ', ' . $extra : '';
-        }
-        if ($varadd)
-        {
-            $varextra = implode(', ', $varadd);
-            $varextra = $varextra ? ', ' . $varextra : '';
-        }
-
-        $getdata = addslashes($getdata);
-        $postdata = addslashes($postdata);
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "notelist SET getdata='$getdata', operation='$operation', pri='$pri', postdata='$postdata'$extra");
-        $insert_id = $this->db->insert_id();
-        $insert_id && $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "vars (name, value) VALUES ('noteexists', '1')$varextra");
-        $this->noteid = $insert_id;
-        return $insert_id;
-    }
-
-    function send()
-    {
-        register_shutdown_function(array($this, '_send'));
-    }
-
-    function _send()
-    {
-        $note = $this->_get_note();
-        if (empty($note))
-        {
-            $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "vars SET name='noteexists" . UC_APPID . "', value='0'");
-            return NULL;
-        }
-        $this->sendone(UC_APPID, 0, $note);
-        $this->_gc();
-    }
-
-    function sendone($appid, $noteid = 0, $note = '')
-    {
-        require_once UC_ROOT . './lib/xml.class.php';
-        $return = FALSE;
-        $app = $this->apps[$appid];
-        if ($noteid)
-        {
-            $note = $this->_get_note_by_id($noteid);
-        }
-        $this->base->load('misc');
-        $apifilename = isset($app['apifilename']) && $app['apifilename'] ? $app['apifilename'] : 'uc.php';
-        if ($app['extra']['apppath'] && @include $app['extra']['apppath'] . './api/' . $apifilename)
-        {
-            $uc_note = new uc_note();
-            $method = $note['operation'];
-            if (is_string($method) && !empty($method))
-            {
-                parse_str($note['getdata'], $note['getdata']);
-                if (get_magic_quotes_gpc())
-                {
-                    $note['getdata'] = $this->base->dstripslashes($note['getdata']);
-                }
-                $note['postdata'] = @xml_unserialize($note['postdata']);
-                $response = $uc_note->$method($note['getdata'], $note['postdata']);
-            }
-            unset($uc_note);
-        }
-        else
-        {
-            $url = $this->get_url_code($note['operation'], $note['getdata'], $appid);
-            $note['postdata'] = str_replace(array("\n", "\r"), '', $note['postdata']);
-            $response = trim($_ENV['misc']->dfopen2($url, 0, $note['postdata'], '', 1, $app['ip'], UC_NOTE_TIMEOUT, TRUE));
-        }
-
-        $returnsucceed = $response != '' && ($response == 1 || is_array(@xml_unserialize($response)));
-
-        $closedsqladd = $this->_close_note($note, $this->apps, $returnsucceed, $appid) ? ",closed='1'" : '';
-
-        if ($returnsucceed)
-        {
-            if ($this->operations[$note['operation']][2])
-            {
-                $this->base->load($this->operations[$note['operation']][2]);
-                $func = $this->operations[$note['operation']][3];
-                $_ENV[$this->operations[$note['operation']][2]]->$func($appid, $response);
-            }
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "notelist SET app$appid='1', totalnum=totalnum+1, succeednum=succeednum+1, dateline='{$this->base->time}' $closedsqladd WHERE noteid='$note[noteid]'", 'SILENT');
-            $return = TRUE;
-        }
-        else
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "notelist SET app$appid = app$appid-'1', totalnum=totalnum+1, dateline='{$this->base->time}' $closedsqladd WHERE noteid='$note[noteid]'", 'SILENT');
-            $return = FALSE;
-        }
-        return $return;
-    }
-
-    function _get_note()
-    {
-        $app_field = 'app' . UC_APPID;
-        $data = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "notelist WHERE closed='0' AND $app_field<'1' AND $app_field>'-" . UC_NOTE_REPEAT . "' LIMIT 1");
-        return $data;
-    }
-
-    function _gc()
-    {
-        rand(0, UC_NOTE_GC) == 0 && $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "notelist WHERE closed='1'");
-    }
-
-    function _close_note($note, $apps, $returnsucceed, $appid)
-    {
-        $note['app' . $appid] = $returnsucceed ? 1 : $note['app' . $appid] - 1;
-        $appcount = count($apps);
-        foreach ($apps as $key => $app)
-        {
-            $appstatus = $note['app' . $app['appid']];
-            if (!$app['recvnote'] || $appstatus == 1 || $appstatus <= -UC_NOTE_REPEAT)
-            {
-                $appcount--;
-            }
-        }
-        if ($appcount < 1)
-        {
-            return TRUE;
-        }
-    }
-
-    function _get_note_by_id($noteid)
-    {
-        $data = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "notelist WHERE noteid='$noteid'");
-        return $data;
-    }
-
-    function get_url_code($operation, $getdata, $appid)
-    {
-        $app = $this->apps[$appid];
-        $authkey = UC_KEY;
-        $url = $app['url'];
-        $apifilename = isset($app['apifilename']) && $app['apifilename'] ? $app['apifilename'] : 'uc.php';
-        $action = $this->operations[$operation][1];
-        $code = urlencode($this->base->authcode("$action&" . ($getdata ? "$getdata&" : '') . "time=" . $this->base->time, 'ENCODE', $authkey));
-        return $url . "/api/$apifilename?code=$code";
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/pm.php b/extend/fast/ucenter/client/uc_client/model/pm.php
deleted file mode 100644
index 672ec0f8..00000000
--- a/extend/fast/ucenter/client/uc_client/model/pm.php
+++ /dev/null
@@ -1,1261 +0,0 @@
-pmmodel($base);
-    }
-
-    function pmmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function pmintval($pmid)
-    {
-        return @is_numeric($pmid) ? $pmid : 0;
-    }
-
-    function getpmbypmid($uid, $pmid)
-    {
-        if (!$pmid)
-        {
-            return array();
-        }
-        $arr = array();
-        $pm = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_indexes i LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON t.plid=i.plid WHERE i.pmid='$pmid'");
-        if ($this->isprivilege($pm['plid'], $uid))
-        {
-            $pms = $this->db->fetch_all("SELECT t.*, p.*, t.authorid as founderuid, t.dateline as founddateline FROM " . UC_DBTABLEPRE . $this->getposttablename($pm['plid']) . " p LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON t.plid=p.plid WHERE p.pmid='$pm[pmid]'");
-            $arr = $this->getpostlist($pms);
-        }
-        return $arr;
-    }
-
-    function isprivilege($plid, $uid)
-    {
-        if (!$plid || !$uid)
-        {
-            return true;
-        }
-        $query = $this->db->query("SELECT * FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid' AND uid='$uid'");
-        if ($this->db->fetch_array($query))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    function getpmbyplid($uid, $plid, $starttime, $endtime, $start, $ppp, $type = 0)
-    {
-        if (!$type)
-        {
-            $pm = $this->getprivatepmbyplid($uid, $plid, $starttime, $endtime, $start, $ppp);
-        }
-        else
-        {
-            $pm = $this->getchatpmbyplid($uid, $plid, $starttime, $endtime, $start, $ppp);
-        }
-        return $this->getpostlist($pm);
-    }
-
-    function getpostlist($list)
-    {
-        if (empty($list))
-        {
-            return array();
-        }
-        $authoridarr = $authorarr = array();
-        foreach ($list as $key => $value)
-        {
-            $authoridarr[$value['authorid']] = $value['authorid'];
-        }
-        if ($authoridarr)
-        {
-            $this->base->load('user');
-            $authorarr = $_ENV['user']->id2name($authoridarr);
-        }
-        foreach ($list as $key => $value)
-        {
-            if ($value['pmtype'] == 1)
-            {
-                $users = explode('_', $value['min_max']);
-                if ($value['authorid'] == $users[0])
-                {
-                    $value['touid'] = $users[1];
-                }
-                else
-                {
-                    $value['touid'] = $users[0];
-                }
-            }
-            else
-            {
-                $value['touid'] = 0;
-            }
-            $value['author'] = $authorarr[$value['authorid']];
-
-            $value['msgfromid'] = $value['authorid'];
-            $value['msgfrom'] = $value['author'];
-            $value['msgtoid'] = $value['touid'];
-
-            unset($value['min_max']);
-            unset($value['delstatus']);
-            unset($value['lastmessage']);
-            $list[$key] = $value;
-        }
-        return $list;
-    }
-
-    function setpmstatus($uid, $touids, $plids, $status = 0)
-    {
-        if (!$uid)
-        {
-            return false;
-        }
-        if (!$status)
-        {
-            $oldstatus = 1;
-            $newstatus = 0;
-        }
-        else
-        {
-            $oldstatus = 0;
-            $newstatus = 1;
-        }
-        if ($touids)
-        {
-            foreach ($touids as $key => $value)
-            {
-                if ($uid == $value || !$value)
-                {
-                    return false;
-                }
-                $relastionship[] = $this->relationship($uid, $value);
-            }
-            $plid = $plidpostarr = array();
-            $query = $this->db->query("SELECT plid FROM " . UC_DBTABLEPRE . "pm_lists WHERE min_max IN (" . $this->base->implode($relationship) . ")");
-            while ($thread = $this->db->fetch_array($query))
-            {
-                $plidarr[] = $thread['plid'];
-            }
-            if ($plidarr)
-            {
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew='$newstatus' WHERE plid IN (" . $this->base->implode($plidarr) . ") AND uid='$uid' AND isnew='$oldstatus'");
-            }
-        }
-        if ($plids)
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew='$newstatus' WHERE plid IN (" . $this->base->implode($plids) . ") AND uid='$uid' AND isnew='$oldstatus'");
-        }
-        return true;
-    }
-
-    function set_ignore($uid)
-    {
-        return $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "newpm WHERE uid='$uid'");
-    }
-
-    function isnewpm($uid)
-    {
-        return $this->db->result_first("SELECT uid FROM " . UC_DBTABLEPRE . "newpm WHERE uid='$uid'");
-    }
-
-    function lastpm($uid)
-    {
-        $lastpm = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_members m LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON m.plid=t.plid WHERE m.uid='$uid' ORDER BY m.lastdateline DESC LIMIT 1");
-        $lastmessage = unserialize($lastpm['lastmessage']);
-        if ($lastmessage['lastauthorid'])
-        {
-            $lastpm['lastauthorid'] = $lastmessage['lastauthorid'];
-            $lastpm['lastauthor'] = $lastmessage['lastauthor'];
-            $lastpm['lastsummary'] = $lastmessage['lastsummary'];
-        }
-        else
-        {
-            $lastpm['lastauthorid'] = $lastmessage['firstauthorid'];
-            $lastpm['lastauthor'] = $lastmessage['firstauthor'];
-            $lastpm['lastsummary'] = $lastmessage['firstsummary'];
-        }
-        return $lastpm;
-    }
-
-    function getpmnum($uid, $type = 0, $isnew = 0)
-    {
-        $newsql = '';
-        $newnum = 0;
-
-        if ($isnew)
-        {
-            $newsql = 'AND m.isnew=1';
-        }
-        if (!$type)
-        {
-            $newnum = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "pm_members m WHERE m.uid='$uid' $newsql");
-        }
-        else
-        {
-            $newnum = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "pm_members m LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON t.plid=m.plid WHERE m.uid='$uid' $newsql AND t.pmtype='$type'");
-        }
-        return $newnum;
-    }
-
-    function getpmnumbyplid($uid, $plid)
-    {
-        return $this->db->result_first("SELECT pmnum FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid' AND uid='$uid'");
-    }
-
-    function sendpm($fromuid, $fromusername, $touids, $subject, $message, $type = 0)
-    {
-        if (!$fromuid || !$fromusername || !$touids || !$message)
-        {
-            return 0;
-        }
-        $touids = array_unique($touids);
-        $relationship = $existplid = $pm_member_insertsql = array();
-        $this->base->load('user');
-        $tmptouidarr = $touids;
-        $blackls = $this->get_blackls($fromuid, $touids);
-
-        foreach ($tmptouidarr as $key => $value)
-        {
-            if ($fromuid == $value || !$value)
-            {
-                return PMSENDSELF_ERROR;
-            }
-
-            if (in_array('{ALL}', $blackls[$value]))
-            {
-                unset($touids[$key]);
-                continue;
-            }
-            $blackls[$value] = $_ENV['user']->name2id($blackls[$value]);
-            if (!(isset($blackls[$value]) && !in_array($fromuid, $blackls[$value])))
-            {
-                unset($touids[$key]);
-            }
-            else
-            {
-                $relationship[$value] = $this->relationship($fromuid, $value);
-            }
-        }
-        if (empty($touids))
-        {
-            return PMSENDNONE_ERROR;
-        }
-        if ($type == 1 && count($touids) < 2)
-        {
-            return PMSENDCHATNUM_ERROR;
-        }
-
-        $_CACHE['badwords'] = $this->base->cache('badwords');
-        if ($_CACHE['badwords']['findpattern'])
-        {
-            $subject = @preg_replace($_CACHE['badwords']['findpattern'], $_CACHE['badwords']['replace'], $subject);
-            $message = @preg_replace($_CACHE['badwords']['findpattern'], $_CACHE['badwords']['replace'], $message);
-        }
-        if (!$subject)
-        {
-            $subject = $this->removecode(trim($message), 80);
-        }
-        else
-        {
-            $subject = dhtmlspecialchars($subject);
-        }
-        $lastsummary = $this->removecode(trim(stripslashes($message)), 150);
-
-        if (!$type)
-        {
-            $query = $this->db->query("SELECT plid, min_max FROM " . UC_DBTABLEPRE . "pm_lists WHERE min_max IN (" . $this->base->implode($relationship) . ")");
-            while ($thread = $this->db->fetch_array($query))
-            {
-                $existplid[$thread['min_max']] = $thread['plid'];
-            }
-            $lastmessage = array('lastauthorid' => $fromuid, 'lastauthor' => $fromusername, 'lastsummary' => $lastsummary);
-            $lastmessage = addslashes(serialize($lastmessage));
-            foreach ($relationship as $key => $value)
-            {
-                if (!isset($existplid[$value]))
-                {
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_lists(authorid, pmtype, subject, members, min_max, dateline, lastmessage) VALUES('$fromuid', '1', '$subject', 2, '$value', '" . $this->base->time . "', '$lastmessage')");
-                    $plid = $this->db->insert_id();
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_indexes(plid) VALUES('$plid')");
-                    $pmid = $this->db->insert_id();
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . $this->getposttablename($plid) . "(pmid, plid, authorid, message, dateline, delstatus) VALUES('$pmid', '$plid', '$fromuid', '$message', '" . $this->base->time . "', 0)");
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES('$plid', '$key', '1', '1', '0', '" . $this->base->time . "')");
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES('$plid', '$fromuid', '0', '1', '" . $this->base->time . "', '" . $this->base->time . "')");
-                }
-                else
-                {
-                    $plid = $existplid[$value];
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_indexes(plid) VALUES('$plid')");
-                    $pmid = $this->db->insert_id();
-                    $this->db->query("INSERT INTO " . UC_DBTABLEPRE . $this->getposttablename($plid) . "(pmid, plid, authorid, message, dateline, delstatus) VALUES('$pmid', '$plid', '$fromuid', '$message', '" . $this->base->time . "', 0)");
-                    $result = $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES('$plid', '$key', '1', '1', '0', '" . $this->base->time . "')", 'SILENT');
-                    if (!$result)
-                    {
-                        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=1, pmnum=pmnum+1, lastdateline='" . $this->base->time . "' WHERE plid='$plid' AND uid='$key'");
-                    }
-                    $result = $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES('$plid', '$fromuid', '0', '1', '" . $this->base->time . "', '" . $this->base->time . "')", 'SILENT');
-                    if (!$result)
-                    {
-                        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=0, pmnum=pmnum+1, lastupdate='" . $this->base->time . "', lastdateline='" . $this->base->time . "' WHERE plid='$plid' AND uid='$fromuid'");
-                    }
-                    $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_lists SET lastmessage='$lastmessage' WHERE plid='$plid'");
-                }
-            }
-        }
-        else
-        {
-            $lastmessage = array('firstauthorid' => $fromuid, 'firstauthor' => $fromusername, 'firstsummary' => $lastsummary);
-            $lastmessage = addslashes(serialize($lastmessage));
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_lists(authorid, pmtype, subject, members, min_max, dateline, lastmessage) VALUES('$fromuid', '2', '$subject', '" . (count($touids) + 1) . "', '', '" . $this->base->time . "', '$lastmessage')");
-            $plid = $this->db->insert_id();
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_indexes(plid) VALUES('$plid')");
-            $pmid = $this->db->insert_id();
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . $this->getposttablename($plid) . "(pmid, plid, authorid, message, dateline, delstatus) VALUES('$pmid', '$plid', '$fromuid', '$message', '" . $this->base->time . "', 0)");
-            $pm_member_insertsql[] = "('$plid', '$fromuid', '0', '1', '" . $this->base->time . "', '" . $this->base->time . "')";
-            foreach ($touids as $key => $value)
-            {
-                $pm_member_insertsql[] = "('$plid', '$value', '1', '1', '0', '" . $this->base->time . "')";
-            }
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES " . implode(',', $pm_member_insertsql));
-        }
-
-        $newpm = array();
-        foreach ($touids as $key => $value)
-        {
-            $newpm[] = "('$value')";
-        }
-        $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "newpm(uid) VALUES " . implode(',', $newpm));
-        return $pmid;
-    }
-
-    function replypm($plid, $fromuid, $fromusername, $message)
-    {
-        if (!$plid || !$fromuid || !$fromusername || !$message)
-        {
-            return 0;
-        }
-
-        $threadpm = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$plid'");
-        if (empty($threadpm))
-        {
-            return PMTHREADNONE_ERROR;
-        }
-
-        if ($threadpm['pmtype'] == 1)
-        {
-            $users = explode('_', $threadpm['min_max']);
-            if ($users[0] == $fromuid)
-            {
-                $touid = $users[1];
-            }
-            elseif ($users[1] == $fromuid)
-            {
-                $touid = $users[0];
-            }
-            else
-            {
-                return PMPRIVILEGENONE_ERROR;
-            }
-
-            $blackls = $this->get_blackls($fromuid, $touid);
-            if (in_array('{ALL}', $blackls[$touid]))
-            {
-                return PMINBALCKLIST_ERROR;
-            }
-            $this->base->load('user');
-            $blackls[$touid] = $_ENV['user']->name2id($blackls[$touid]);
-            if (!(isset($blackls[$touid]) && !in_array($fromuid, $blackls[$touid])))
-            {
-                return PMINBALCKLIST_ERROR;
-            }
-        }
-
-        $memberuid = array();
-        $query = $this->db->query("SELECT * FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid'");
-        while ($member = $this->db->fetch_array($query))
-        {
-            $memberuid[$member['uid']] = "('$member[uid]')";
-        }
-        if (!isset($memberuid[$fromuid]))
-        {
-            return PMPRIVILEGENONE_ERROR;
-        }
-
-        $_CACHE['badwords'] = $this->base->cache('badwords');
-        if ($_CACHE['badwords']['findpattern'])
-        {
-            $message = @preg_replace($_CACHE['badwords']['findpattern'], $_CACHE['badwords']['replace'], $message);
-        }
-        $lastsummary = $this->removecode(trim(stripslashes($message)), 150);
-
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_indexes(plid) VALUES('$plid')");
-        $pmid = $this->db->insert_id();
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . $this->getposttablename($plid) . "(pmid, plid, authorid, message, dateline, delstatus) VALUES('$pmid', '$plid', '$fromuid', '$message', '" . $this->base->time . "', 0)");
-        if ($threadpm['pmtype'] == 1)
-        {
-            $lastmessage = array('lastauthorid' => $fromuid, 'lastauthor' => $fromusername, 'lastsummary' => $lastsummary);
-            $lastmessage = addslashes(serialize($lastmessage));
-            $result = $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES('$plid', '$touid', '1', '1', '0', '" . $this->base->time . "')", 'SILENT');
-            if (!$result)
-            {
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=1, pmnum=pmnum+1, lastdateline='" . $this->base->time . "' WHERE plid='$plid' AND uid='$touid'");
-            }
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=0, pmnum=pmnum+1, lastupdate='" . $this->base->time . "', lastdateline='" . $this->base->time . "' WHERE plid='$plid' AND uid='$fromuid'");
-        }
-        else
-        {
-            $lastmessage = unserialize($threadpm['lastmessage']);
-            $lastmessage = array('firstauthorid' => $lastmessage['firstauthorid'], 'firstauthor' => $lastmessage['firstauthor'], 'firstsummary' => $lastmessage['firstsummary'], 'lastauthorid' => $fromuid, 'lastauthor' => $fromusername, 'lastsummary' => $lastsummary);
-            $lastmessage = addslashes(serialize($lastmessage));
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=1, pmnum=pmnum+1, lastdateline='" . $this->base->time . "' WHERE plid='$plid'");
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=0, lastupdate='" . $this->base->time . "' WHERE plid='$plid' AND uid='$fromuid'");
-        }
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_lists SET lastmessage='$lastmessage' WHERE plid='$plid'");
-
-        $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "newpm(uid) VALUES " . implode(',', $memberuid) . "");
-
-        return $pmid;
-    }
-
-    function appendchatpm($plid, $uid, $touid)
-    {
-        if (!$plid || !$uid || !$touid)
-        {
-            return 0;
-        }
-        $threadpm = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$plid'");
-        if (empty($threadpm))
-        {
-            return PMTHREADNONE_ERROR;
-        }
-        if ($threadpm['pmtype'] != 2)
-        {
-            return PMCHATTYPE_ERROR;
-        }
-        if ($threadpm['authorid'] != $uid)
-        {
-            return PMPRIVILEGENONE_ERROR;
-        }
-
-        $blackls = $this->get_blackls($uid, $touid);
-        if (in_array('{ALL}', $blackls[$touid]))
-        {
-            return PMINBALCKLIST_ERROR;
-        }
-        $this->base->load('user');
-        $blackls[$touid] = $_ENV['user']->name2id($blackls[$touid]);
-        if (!(isset($blackls[$touid]) && !in_array($uid, $blackls[$touid])))
-        {
-            return PMINBALCKLIST_ERROR;
-        }
-
-        $pmnum = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . $this->getposttablename($plid) . " WHERE plid='$plid'");
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "pm_members(plid, uid, isnew, pmnum, lastupdate, lastdateline) VALUES('$plid', '$touid', '1', '$pmnum', '0', '0')", 'SILENT');
-        $num = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid'");
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_lists SET members='$num' WHERE plid='$plid'");
-
-        return 1;
-    }
-
-    function kickchatpm($plid, $uid, $touid)
-    {
-        if (!$uid || !$touid || !$plid || $uid == $touid)
-        {
-            return 0;
-        }
-        $threadpm = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$plid'");
-        if ($threadpm['pmtype'] != 2)
-        {
-            return PMCHATTYPE_ERROR;
-        }
-        if ($threadpm['authorid'] != $uid)
-        {
-            return PMPRIVILEGENONE_ERROR;
-        }
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid' AND uid='$touid'");
-        $num = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid'");
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_lists SET members='$num' WHERE plid='$plid'");
-        return 1;
-    }
-
-    function quitchatpm($uid, $plids)
-    {
-        if (!$uid || !$plids)
-        {
-            return 0;
-        }
-        $list = array();
-        $query = $this->db->query("SELECT * FROM " . UC_DBTABLEPRE . "pm_members m LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON m.plid=t.plid WHERE m.plid IN (" . $this->base->implode($plids) . ") AND m.uid='$uid'");
-        while ($threadpm = $this->db->fetch_array($query))
-        {
-            if ($threadpm['pmtype'] != 2)
-            {
-                return PMCHATTYPE_ERROR;
-            }
-            if ($threadpm['authorid'] == $uid)
-            {
-                return PMPRIVILEGENONE_ERROR;
-            }
-            $list[] = $threadpm['plid'];
-        }
-
-        if ($list)
-        {
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_members WHERE plid IN (" . $this->base->implode($list) . ") AND uid='$uid'");
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_lists SET members=members-1 WHERE plid IN (" . $this->base->implode($list) . ")");
-        }
-
-        return 1;
-    }
-
-    function deletepmbypmid($uid, $pmid)
-    {
-        if (!$uid || !$pmid)
-        {
-            return 0;
-        }
-        $index = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_indexes i LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON i.plid=t.plid WHERE i.pmid='$pmid'");
-        if ($index['pmtype'] != 1)
-        {
-            return PMUIDTYPE_ERROR;
-        }
-        $users = explode('_', $index['min_max']);
-        if (!in_array($uid, $users))
-        {
-            return PMPRIVILEGENONE_ERROR;
-        }
-        if ($index['authorid'] != $uid)
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . $this->getposttablename($index['plid']) . " SET delstatus=2 WHERE pmid='$pmid' AND delstatus=0");
-            $updatenum = $this->db->affected_rows();
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . $this->getposttablename($index['plid']) . " WHERE pmid='$pmid' AND delstatus=1");
-            $deletenum = $this->db->affected_rows();
-        }
-        else
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . $this->getposttablename($index['plid']) . " SET delstatus=1 WHERE pmid='$pmid' AND delstatus=0");
-            $updatenum = $this->db->affected_rows();
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . $this->getposttablename($index['plid']) . " WHERE pmid='$pmid' AND delstatus=2");
-            $deletenum = $this->db->affected_rows();
-        }
-
-        if (!$this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . $this->getposttablename($index['plid']) . " WHERE plid='$index[plid]'"))
-        {
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$index[plid]'");
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$index[plid]'");
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_indexes WHERE plid='$index[plid]'");
-        }
-        else
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET pmnum=pmnum-" . ($updatenum + $deletenum) . " WHERE plid='" . $index['plid'] . "' AND uid='$uid'");
-        }
-        return 1;
-    }
-
-    function deletepmbypmids($uid, $pmids)
-    {
-        if ($pmids)
-        {
-            foreach ($pmids as $key => $pmid)
-            {
-                $this->deletepmbypmid($uid, $pmid);
-            }
-        }
-        return 1;
-    }
-
-    /*
-      function deletepmbypmids($uid, $pmids) {
-      if(!$uid || !$pmids) {
-      return 0;
-      }
-      $pmplid = $delstatus1pm = $delstatus2pm = $pmplidpost = array();
-      $existplid = array();
-      $query = $this->db->query("SELECT * FROM ".UC_DBTABLEPRE."pm_indexes i LEFT JOIN ".UC_DBTABLEPRE."pm_lists t ON i.plid=t.plid WHERE i.pmid IN (".$this->base->implode($pmids).") AND t.pmtype=1");
-      while($index = $this->db->fetch_array($query)) {
-      $users = explode('_', $index['min_max']);
-      if(!in_array($uid, $users)) {
-      return PMPRIVILEGENONE_ERROR;
-      }
-      if($index['authorid'] == $uid) {
-      $delstatus1pm[$this->getposttablename($index['plid'])][] = $index['pmid'];
-      } else {
-      $delstatus2pm[$this->getposttablename($index['plid'])][] = $index['pmid'];
-      }
-      $pmplidpost[$this->getposttablename($index['plid'])][] = $index['plid'];
-      $pmplid[$index['plid']] = $index['plid'];
-      }
-      if(empty($pmplidpost)) {
-      return 0;
-      }
-
-      if($delstatus1pm) {
-      foreach($delstatus1pm as $key => $value) {
-      $this->db->query("UPDATE ".UC_DBTABLEPRE."$key SET delstatus=1 WHERE pmid IN (".$this->base->implode($value).") AND delstatus=0");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."$key WHERE pmid IN (".$this->base->implode($value).") AND delstatus=2");
-      }
-      }
-
-      if($delstatus2pm) {
-      foreach($delstatus2pm as $key => $value) {
-      $this->db->query("UPDATE ".UC_DBTABLEPRE."$key SET delstatus=2 WHERE pmid IN (".$this->base->implode($value).") AND delstatus=0");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."$key WHERE pmid IN (".$this->base->implode($value).") AND delstatus=1");
-      }
-      }
-
-      foreach($pmplidpost as $key => $value) {
-      $query = $this->db->query("SELECT DISTINCT plid FROM ".UC_DBTABLEPRE."$key WHERE plid IN (".$this->base->implode($value).")");
-      while($pmpostarr = $this->db->fetch_array($query)) {
-      $existplid[] = $pmpostarr['plid'];
-      }
-      }
-      $pmplid = array_diff($pmplid, $existplid);
-      if($pmplid) {
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_lists WHERE plid IN (".$this->base->implode($pmplid).")");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_members WHERE plid IN (".$this->base->implode($pmplid).")");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_indexes WHERE plid IN (".$this->base->implode($pmplid).")");
-      }
-      return 1;
-      }
-     */
-
-    function deletepmbyplid($uid, $plid, $isuser = 0)
-    {
-        if (!$uid || !$plid)
-        {
-            return 0;
-        }
-
-        if ($isuser)
-        {
-            $relationship = $this->relationship($uid, $plid);
-            $sql = "SELECT * FROM " . UC_DBTABLEPRE . "pm_lists WHERE min_max='$relationship'";
-        }
-        else
-        {
-            $sql = "SELECT * FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$plid'";
-        }
-
-        $query = $this->db->query($sql);
-        if ($list = $this->db->fetch_array($query))
-        {
-            if ($list['pmtype'] == 1)
-            {
-                $user = explode('_', $list['min_max']);
-                if (!in_array($uid, $user))
-                {
-                    return PMPRIVILEGENONE_ERROR;
-                }
-            }
-            else
-            {
-                if ($uid != $list['authorid'])
-                {
-                    return PMPRIVILEGENONE_ERROR;
-                }
-            }
-        }
-        else
-        {
-            return PMTHREADNONE_ERROR;
-        }
-
-        if ($list['pmtype'] == 1)
-        {
-            if ($uid == $list['authorid'])
-            {
-                $this->db->query("DELETE FROM " . UC_DBTABLEPRE . $this->getposttablename($list['plid']) . " WHERE plid='$list[plid]' AND delstatus=2");
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . $this->getposttablename($list['plid']) . " SET delstatus=1 WHERE plid='$list[plid]' AND delstatus=0");
-            }
-            else
-            {
-                $this->db->query("DELETE FROM " . UC_DBTABLEPRE . $this->getposttablename($list['plid']) . " WHERE plid='$list[plid]' AND delstatus=1");
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . $this->getposttablename($list['plid']) . " SET delstatus=2 WHERE plid='$list[plid]' AND delstatus=0");
-            }
-            $count = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . $this->getposttablename($list['plid']) . " WHERE plid='$list[plid]'");
-            if (!$count)
-            {
-                $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$list[plid]'");
-                $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$list[plid]'");
-                $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_indexes WHERE plid='$list[plid]'");
-            }
-            else
-            {
-                $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$list[plid]' AND uid='$uid'");
-            }
-        }
-        else
-        {
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . $this->getposttablename($list['plid']) . " WHERE plid='$list[plid]'");
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$list[plid]'");
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$list[plid]'");
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "pm_indexes WHERE plid='$list[plid]'");
-        }
-        return 1;
-    }
-
-    function deletepmbyplids($uid, $plids, $isuser = 0)
-    {
-        if ($plids)
-        {
-            foreach ($plids as $key => $plid)
-            {
-                $this->deletepmbyplid($uid, $plid, $isuser);
-            }
-        }
-        return 1;
-    }
-
-    /*
-      function deletepmbyplid($uid, $plids, $isuser = 0) {
-      if(!$uid || !$plids) {
-      return 0;
-      }
-
-      $privatepm = $chatpm = array();
-      $privatepmauthorpost = $privatepmpost = $privatepmpostall = array();
-      $existplid = array();
-      if($isuser) {
-      $relationship = array();
-      foreach($plids as $key => $value) {
-      if($uid == $value || !$value) {
-      return PMDATA_ERROR;
-      }
-      $relationship[] = $this->relationship($uid, $value);
-      }
-      $sql = "SELECT * FROM ".UC_DBTABLEPRE."pm_lists WHERE min_max IN (".$this->base->implode($relationship).")";
-      } else {
-      $sql = "SELECT * FROM ".UC_DBTABLEPRE."pm_lists WHERE plid IN (".$this->base->implode($plids).")";
-      }
-      $query = $this->db->query($sql);
-      while($threadpm = $this->db->fetch_array($query)) {
-      if($threadpm['pmtype'] == 1) {
-      $users = explode('_', $threadpm['min_max']);
-      if($users[0] == $uid) {
-      $touid = $users[1];
-      } elseif($users[1] == $uid) {
-      $touid = $users[0];
-      } else {
-      continue;
-      }
-
-      if($threadpm['authorid'] == $uid) {
-      $privatepmauthorpost[$this->getposttablename($threadpm['plid'])][] = $threadpm['plid'];
-      } else {
-      $privatepmpost[$this->getposttablename($threadpm['plid'])][] = $threadpm['plid'];
-      }
-      $privatepmpostall[$this->getposttablename($threadpm['plid'])][] = $threadpm['plid'];
-      $privatepm[] = $threadpm['plid'];
-      } else {
-      if($uid != $threadpm['authorid']) {
-      continue;
-      }
-      $chatpm[] = $threadpm['plid'];
-      $chatpmpost[$this->getposttablename($threadpm['plid'])][] = $threadpm['plid'];
-      }
-      }
-
-      if($privatepmauthorpost) {
-      foreach($privatepmauthorpost as $key => $value) {
-      $this->db->query("UPDATE ".UC_DBTABLEPRE."$key SET delstatus=1 WHERE plid IN (".$this->base->implode($value).") AND delstatus=0");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."$key WHERE plid IN (".$this->base->implode($value).") AND delstatus=2");
-      }
-      }
-
-      if($privatepmpost) {
-      foreach($privatepmpost as $key => $value) {
-      $this->db->query("UPDATE ".UC_DBTABLEPRE."$key SET delstatus=2 WHERE plid IN (".$this->base->implode($value).") AND delstatus=0");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."$key WHERE plid IN (".$this->base->implode($value).") AND delstatus=1");
-      }
-      }
-      if($privatepmpostall) {
-      foreach($privatepmpostall as $key => $value) {
-      $query = $this->db->query("SELECT DISTINCT plid FROM ".UC_DBTABLEPRE."$key WHERE plid IN (".$this->base->implode($value).")");
-      while($postpm = $this->db->fetch_array($query)) {
-      $existplid[] = $postpm['plid'];
-      }
-      }
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_members WHERE plid IN (".$this->base->implode($privatepm).") AND uid='$uid'");
-      $privatepm = array_diff($privatepm, $existplid);
-      if(!empty($privatepm)) {
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_lists WHERE plid IN (".$this->base->implode($privatepm).")");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_members WHERE plid IN (".$this->base->implode($privatepm).")");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_indexes WHERE plid IN (".$this->base->implode($privatepm).")");
-      }
-      }
-      if($chatpmpost) {
-      foreach($chatpmpost as $key => $value) {
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."$key WHERE plid IN (".$this->base->implode($value).")");
-      }
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_lists WHERE plid IN (".$this->base->implode($chatpm).")");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_members WHERE plid IN (".$this->base->implode($chatpm).")");
-      $this->db->query("DELETE FROM ".UC_DBTABLEPRE."pm_indexes WHERE plid IN (".$this->base->implode($chatpm).")");
-      }
-      return 1;
-      }
-     */
-
-    function getprivatepmbyplid($uid, $plid, $starttime = 0, $endtime = 0, $start = 0, $ppp = 0)
-    {
-        if (!$uid || !$plid)
-        {
-            return 0;
-        }
-        if (!$this->isprivilege($plid, $uid))
-        {
-            return 0;
-        }
-        $thread = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$plid'");
-        if ($thread['pmtype'] != 1)
-        {
-            return 0;
-        }
-        $pms = $addsql = array();
-        $addsql[] = "p.plid='$plid'";
-        if ($thread['authorid'] == $uid)
-        {
-            $addsql[] = 'p.delstatus IN (0,2)';
-        }
-        else
-        {
-            $addsql[] = 'p.delstatus IN (0,1)';
-        }
-        if ($starttime)
-        {
-            $addsql[] = "p.dateline>'$starttime'";
-        }
-        if ($endtime)
-        {
-            $addsql[] = "p.dateline<'$endtime'";
-        }
-        if ($addsql)
-        {
-            $addsql = implode(' AND ', $addsql);
-        }
-        else
-        {
-            $addsql = '';
-        }
-        if ($ppp)
-        {
-            $limitsql = 'LIMIT ' . intval($start) . ', ' . intval($ppp);
-        }
-        else
-        {
-            $limitsql = '';
-        }
-        $pms = $this->db->fetch_all("SELECT t.*, p.*, t.authorid as founderuid, t.dateline as founddateline FROM " . UC_DBTABLEPRE . $this->getposttablename($plid) . " p LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON p.plid=t.plid WHERE $addsql ORDER BY p.dateline DESC $limitsql");
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=0 WHERE plid='$plid' AND uid='$uid' AND isnew=1");
-        return array_reverse($pms);
-    }
-
-    function getchatpmbyplid($uid, $plid, $starttime = 0, $endtime = 0, $start = 0, $ppp = 0)
-    {
-        if (!$uid || !$plid)
-        {
-            return 0;
-        }
-        if (!$this->isprivilege($plid, $uid))
-        {
-            return 0;
-        }
-        $pms = $addsql = array();
-        $addsql[] = "p.plid='$plid'";
-        if ($starttime)
-        {
-            $addsql[] = "p.dateline>'$starttime'";
-        }
-        if ($endtime)
-        {
-            $addsql[] = "p.dateline<'$endtime'";
-        }
-        if ($addsql)
-        {
-            $addsql = implode(' AND ', $addsql);
-        }
-        else
-        {
-            $addsql = '';
-        }
-        if ($ppp)
-        {
-            $limitsql = 'LIMIT ' . intval($start) . ', ' . intval($ppp);
-        }
-        else
-        {
-            $limitsql = '';
-        }
-        $query = $this->db->query("SELECT t.*, p.*, t.authorid as founderuid, t.dateline as founddateline FROM " . UC_DBTABLEPRE . $this->getposttablename($plid) . " p LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON p.plid=t.plid WHERE $addsql ORDER BY p.dateline DESC $limitsql");
-        while ($pm = $this->db->fetch_array($query))
-        {
-            if ($pm['pmtype'] != 2)
-            {
-                return 0;
-            }
-            $pms[] = $pm;
-        }
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "pm_members SET isnew=0 WHERE plid='$plid' AND uid='$uid' AND isnew=1");
-        return array_reverse($pms);
-    }
-
-    function getpmlist($uid, $filter, $start, $ppp = 10)
-    {
-        if (!$uid)
-        {
-            return 0;
-        }
-        $members = $touidarr = $tousernamearr = array();
-
-        if ($filter == 'newpm')
-        {
-            $addsql = 'm.isnew=1 AND ';
-        }
-        else
-        {
-            $addsql = '';
-        }
-        $query = $this->db->query("SELECT * FROM " . UC_DBTABLEPRE . "pm_members m LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON t.plid=m.plid WHERE $addsql m.uid='$uid' ORDER BY m.lastdateline DESC LIMIT $start, $ppp");
-        while ($member = $this->db->fetch_array($query))
-        {
-            if ($member['pmtype'] == 1)
-            {
-                $users = explode('_', $member['min_max']);
-                $member['touid'] = $users[0] == $uid ? $users[1] : $users[0];
-            }
-            else
-            {
-                $member['touid'] = 0;
-            }
-            $touidarr[$member['touid']] = $member['touid'];
-            $members[] = $member;
-        }
-
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "newpm WHERE uid='$uid'");
-
-        $array = array();
-        if ($members)
-        {
-            $today = $this->base->time - $this->base->time % 86400;
-            $this->base->load('user');
-            $tousernamearr = $_ENV['user']->id2name($touidarr);
-            foreach ($members as $key => $data)
-            {
-
-                $daterange = 5;
-                $data['founddateline'] = $data['dateline'];
-                $data['dateline'] = $data['lastdateline'];
-                $data['pmid'] = $data['plid'];
-                $lastmessage = unserialize($data['lastmessage']);
-                if ($lastmessage['firstauthorid'])
-                {
-                    $data['firstauthorid'] = $lastmessage['firstauthorid'];
-                    $data['firstauthor'] = $lastmessage['firstauthor'];
-                    $data['firstsummary'] = $lastmessage['firstsummary'];
-                }
-                if ($lastmessage['lastauthorid'])
-                {
-                    $data['lastauthorid'] = $lastmessage['lastauthorid'];
-                    $data['lastauthor'] = $lastmessage['lastauthor'];
-                    $data['lastsummary'] = $lastmessage['lastsummary'];
-                }
-                $data['msgfromid'] = $lastmessage['lastauthorid'];
-                $data['msgfrom'] = $lastmessage['lastauthor'];
-                $data['message'] = $lastmessage['lastsummary'];
-
-                $data['new'] = $data['isnew'];
-
-                $data['msgtoid'] = $data['touid'];
-                if ($data['lastdateline'] >= $today)
-                {
-                    $daterange = 1;
-                }
-                elseif ($data['lastdateline'] >= $today - 86400)
-                {
-                    $daterange = 2;
-                }
-                elseif ($data['lastdateline'] >= $today - 172800)
-                {
-                    $daterange = 3;
-                }
-                elseif ($data['lastdateline'] >= $today - 604800)
-                {
-                    $daterange = 4;
-                }
-                $data['daterange'] = $daterange;
-
-                $data['tousername'] = $tousernamearr[$data['touid']];
-                unset($data['min_max']);
-                $array[] = $data;
-            }
-        }
-        return $array;
-    }
-
-    function getplidbypmid($pmid)
-    {
-        if (!$pmid)
-        {
-            return false;
-        }
-        return $this->db->result_first("SELECT plid FROM " . UC_DBTABLEPRE . "pm_indexes WHERE pmid='$pmid'");
-    }
-
-    function getplidbytouid($uid, $touid)
-    {
-        if (!$uid || !$touid)
-        {
-            return 0;
-        }
-        return $this->db->result_first("SELECT plid FROM " . UC_DBTABLEPRE . "pm_lists WHERE min_max='" . $this->relationship($uid, $touid) . "'");
-    }
-
-    function getuidbyplid($plid)
-    {
-        if (!$plid)
-        {
-            return array();
-        }
-        $uidarr = array();
-        $query = $this->db->query("SELECT uid FROM " . UC_DBTABLEPRE . "pm_members WHERE plid='$plid'");
-        while ($uid = $this->db->fetch_array($query))
-        {
-            $uidarr[$uid['uid']] = $uid['uid'];
-        }
-        return $uidarr;
-    }
-
-    function chatpmmemberlist($uid, $plid)
-    {
-        if (!$uid || !$plid)
-        {
-            return 0;
-        }
-        $uidarr = $this->getuidbyplid($plid);
-        if (empty($uidarr))
-        {
-            return 0;
-        }
-        if (!isset($uidarr[$uid]))
-        {
-            return 0;
-        }
-        $authorid = $this->db->result_first("SELECT authorid FROM " . UC_DBTABLEPRE . "pm_lists WHERE plid='$plid'");
-        return array('author' => $authorid, 'member' => $uidarr);
-    }
-
-    function relationship($fromuid, $touid)
-    {
-        if ($fromuid < $touid)
-        {
-            return $fromuid . '_' . $touid;
-        }
-        elseif ($fromuid > $touid)
-        {
-            return $touid . '_' . $fromuid;
-        }
-        else
-        {
-            return '';
-        }
-    }
-
-    function getposttablename($plid)
-    {
-        $id = substr((string) $plid, -1, 1);
-        return 'pm_messages_' . intval($id);
-    }
-
-    function get_blackls($uid, $uids = array())
-    {
-        if (!$uids)
-        {
-            $blackls = $this->db->result_first("SELECT blacklist FROM " . UC_DBTABLEPRE . "memberfields WHERE uid='$uid'");
-        }
-        else
-        {
-            $uids = $this->base->implode($uids);
-            $blackls = array();
-            $query = $this->db->query("SELECT uid, blacklist FROM " . UC_DBTABLEPRE . "memberfields WHERE uid IN ($uids)");
-            while ($data = $this->db->fetch_array($query))
-            {
-                $blackls[$data['uid']] = explode(',', $data['blacklist']);
-            }
-        }
-        return $blackls;
-    }
-
-    function set_blackls($uid, $blackls)
-    {
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "memberfields SET blacklist='$blackls' WHERE uid='$uid'");
-        return $this->db->affected_rows();
-    }
-
-    function update_blackls($uid, $username, $action = 1)
-    {
-        $username = !is_array($username) ? array($username) : $username;
-        if ($action == 1)
-        {
-            if (!in_array('{ALL}', $username))
-            {
-                $usernames = $this->base->implode($username);
-                $query = $this->db->query("SELECT username FROM " . UC_DBTABLEPRE . "members WHERE username IN ($usernames)");
-                $usernames = array();
-                while ($data = $this->db->fetch_array($query))
-                {
-                    $usernames[addslashes($data['username'])] = addslashes($data['username']);
-                }
-                if (!$usernames)
-                {
-                    return 0;
-                }
-                $blackls = addslashes($this->db->result_first("SELECT blacklist FROM " . UC_DBTABLEPRE . "memberfields WHERE uid='$uid'"));
-                if ($blackls)
-                {
-                    $list = explode(',', $blackls);
-                    foreach ($list as $k => $v)
-                    {
-                        if (in_array($v, $usernames))
-                        {
-                            unset($usernames[$v]);
-                        }
-                    }
-                }
-                if (!$usernames)
-                {
-                    return 1;
-                }
-                $listnew = implode(',', $usernames);
-                $blackls .= $blackls !== '' ? ',' . $listnew : $listnew;
-            }
-            else
-            {
-                $blackls = addslashes($this->db->result_first("SELECT blacklist FROM " . UC_DBTABLEPRE . "memberfields WHERE uid='$uid'"));
-                $blackls .= ',{ALL}';
-            }
-        }
-        else
-        {
-            $blackls = addslashes($this->db->result_first("SELECT blacklist FROM " . UC_DBTABLEPRE . "memberfields WHERE uid='$uid'"));
-            $list = $blackls = explode(',', $blackls);
-            foreach ($list as $k => $v)
-            {
-                if (in_array($v, $username))
-                {
-                    unset($blackls[$k]);
-                }
-            }
-            $blackls = implode(',', $blackls);
-        }
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "memberfields SET blacklist='$blackls' WHERE uid='$uid'");
-        return 1;
-    }
-
-    function removecode($str, $length)
-    {
-        static $uccode = null;
-        if ($uccode === null)
-        {
-            require_once UC_ROOT . 'lib/uccode.class.php';
-            $uccode = new uccode();
-        }
-        $str = $uccode->complie($str);
-        return trim($this->base->cutstr(strip_tags($str), $length));
-    }
-
-    function ispminterval($uid, $interval = 0)
-    {
-        if (!$uid)
-        {
-            return 0;
-        }
-        $interval = intval($interval);
-        if (!$interval)
-        {
-            return 1;
-        }
-        $lastupdate = $this->db->result_first("SELECT lastupdate FROM " . UC_DBTABLEPRE . "pm_members WHERE uid='$uid' ORDER BY lastupdate DESC LIMIT 1");
-        if (($this->base->time - $lastupdate) > $interval)
-        {
-            return 1;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    function isprivatepmthreadlimit($uid, $maxnum = 0)
-    {
-        if (!$uid)
-        {
-            return 0;
-        }
-        $maxnum = intval($maxnum);
-        if (!$maxnum)
-        {
-            return 1;
-        }
-        $num = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "pm_members m LEFT JOIN " . UC_DBTABLEPRE . "pm_lists t ON m.plid=t.plid WHERE uid='$uid' AND lastupdate>'" . ($this->base->time - 86400) . "' AND t.pmtype=1");
-        if ($maxnum - $num < 0)
-        {
-            return 0;
-        }
-        else
-        {
-            return 1;
-        }
-    }
-
-    function ischatpmthreadlimit($uid, $maxnum = 0)
-    {
-        if (!$uid)
-        {
-            return 0;
-        }
-        $maxnum = intval($maxnum);
-        if (!$maxnum)
-        {
-            return 1;
-        }
-        $num = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "pm_lists WHERE authorid='$uid' AND dateline>'" . ($this->base->time - 86400) . "'");
-        if ($maxnum - $num < 0)
-        {
-            return 0;
-        }
-        else
-        {
-            return 1;
-        }
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/tag.php b/extend/fast/ucenter/client/uc_client/model/tag.php
deleted file mode 100644
index 4a8261f8..00000000
--- a/extend/fast/ucenter/client/uc_client/model/tag.php
+++ /dev/null
@@ -1,84 +0,0 @@
-tagmodel($base);
-    }
-
-    function tagmodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function get_tag_by_name($tagname)
-    {
-        $arr = $this->db->fetch_all("SELECT * FROM " . UC_DBTABLEPRE . "tags WHERE tagname='$tagname'");
-        return $arr;
-    }
-
-    function get_template($appid)
-    {
-        $result = $this->db->result_first("SELECT tagtemplates FROM " . UC_DBTABLEPRE . "applications WHERE appid='$appid'");
-        return $result;
-    }
-
-    function updatedata($appid, $data)
-    {
-        $appid = intval($appid);
-        include_once UC_ROOT . 'lib/xml.class.php';
-        $data = @xml_unserialize($data);
-        $this->base->load('app');
-        $data[0] = addslashes($data[0]);
-        $datanew = array();
-        if (is_array($data[1]))
-        {
-            foreach ($data[1] as $r)
-            {
-                $datanew[] = $_ENV['misc']->array2string($r);
-            }
-        }
-        $tmp = $_ENV['app']->get_apps('type', "appid='$appid'");
-        $datanew = addslashes($tmp[0]['type'] . "\t" . implode("\t", $datanew));
-        if (!empty($data[0]))
-        {
-            $return = $this->db->result_first("SELECT count(*) FROM " . UC_DBTABLEPRE . "tags WHERE tagname='$data[0]' AND appid='$appid'");
-            if ($return)
-            {
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . "tags SET data='$datanew', expiration='" . $this->base->time . "' WHERE tagname='$data[0]' AND appid='$appid'");
-            }
-            else
-            {
-                $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "tags (tagname, appid, data, expiration) VALUES ('$data[0]', '$appid', '$datanew', '" . $this->base->time . "')");
-            }
-        }
-    }
-
-    function formatcache($appid, $tagname)
-    {
-        $return = $this->db->result_first("SELECT count(*) FROM " . UC_DBTABLEPRE . "tags WHERE tagname='$tagname' AND appid='$appid'");
-        if ($return)
-        {
-            $this->db->query("UPDATE " . UC_DBTABLEPRE . "tags SET expiration='0' WHERE tagname='$tagname' AND appid='$appid'");
-        }
-        else
-        {
-            $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "tags (tagname, appid, expiration) VALUES ('$tagname', '$appid', '0')");
-        }
-    }
-
-}
diff --git a/extend/fast/ucenter/client/uc_client/model/user.php b/extend/fast/ucenter/client/uc_client/model/user.php
deleted file mode 100644
index 07662270..00000000
--- a/extend/fast/ucenter/client/uc_client/model/user.php
+++ /dev/null
@@ -1,439 +0,0 @@
-usermodel($base);
-    }
-
-    function usermodel(&$base)
-    {
-        $this->base = $base;
-        $this->db = $base->db;
-    }
-
-    function get_user_by_uid($uid)
-    {
-        $arr = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "members WHERE uid='$uid'");
-        return $arr;
-    }
-
-    function get_user_by_username($username)
-    {
-        $arr = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "members WHERE username='$username'");
-        return $arr;
-    }
-
-    function get_user_by_email($email)
-    {
-        $arr = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "members WHERE email='$email'");
-        return $arr;
-    }
-
-    function get_user_by_mobile($mobile)
-    {
-        $arr = $this->db->fetch_first("SELECT * FROM " . UC_DBTABLEPRE . "members WHERE mobile='$mobile'");
-        return $arr;
-    }
-
-    function check_username($username)
-    {
-        $guestexp = '\xA1\xA1|\xAC\xA3|^Guest|^\xD3\xCE\xBF\xCD|\xB9\x43\xAB\xC8';
-        $len = $this->dstrlen($username);
-        if ($len > 15 || $len < 3 || preg_match("/\s+|^c:\\con\\con|[%,\*\"\s\<\>\&]|$guestexp/is", $username))
-        {
-            return FALSE;
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function dstrlen($str)
-    {
-        if (strtolower(UC_CHARSET) != 'utf-8')
-        {
-            return strlen($str);
-        }
-        $count = 0;
-        for ($i = 0; $i < strlen($str); $i++)
-        {
-            $value = ord($str[$i]);
-            if ($value > 127)
-            {
-                $count++;
-                if ($value >= 192 && $value <= 223)
-                    $i++;
-                elseif ($value >= 224 && $value <= 239)
-                    $i = $i + 2;
-                elseif ($value >= 240 && $value <= 247)
-                    $i = $i + 3;
-            }
-            $count++;
-        }
-        return $count;
-    }
-
-    function check_mergeuser($username)
-    {
-        $data = $this->db->result_first("SELECT count(*) FROM " . UC_DBTABLEPRE . "mergemembers WHERE appid='" . $this->base->app['appid'] . "' AND username='$username'");
-        return $data;
-    }
-
-    function check_usernamecensor($username)
-    {
-        $_CACHE['badwords'] = $this->base->cache('badwords');
-        $censorusername = $this->base->get_setting('censorusername');
-        $censorusername = $censorusername['censorusername'];
-        $censorexp = '/^(' . str_replace(array('\\*', "\r\n", ' '), array('.*', '|', ''), preg_quote(($censorusername = trim($censorusername)), '/')) . ')$/i';
-        $usernamereplaced = isset($_CACHE['badwords']['findpattern']) && !empty($_CACHE['badwords']['findpattern']) ? @preg_replace($_CACHE['badwords']['findpattern'], $_CACHE['badwords']['replace'], $username) : $username;
-        return !(($usernamereplaced != $username) || ($censorusername && preg_match($censorexp, $username)));
-    }
-
-    function check_usernameexists($username)
-    {
-        $data = $this->db->result_first("SELECT username FROM " . UC_DBTABLEPRE . "members WHERE username='$username'");
-        return $data;
-    }
-
-    function check_emailformat($email)
-    {
-        return strlen($email) > 6 && strlen($email) <= 32 && preg_match("/^([a-z0-9\-_.+]+)@([a-z0-9\-]+[.][a-z0-9\-.]+)$/", $email);
-    }
-
-    function check_emailaccess($email)
-    {
-        $setting = $this->base->get_setting(array('accessemail', 'censoremail'));
-        $accessemail = $setting['accessemail'];
-        $censoremail = $setting['censoremail'];
-        $accessexp = '/(' . str_replace("\r\n", '|', preg_quote(trim($accessemail), '/')) . ')$/i';
-        $censorexp = '/(' . str_replace("\r\n", '|', preg_quote(trim($censoremail), '/')) . ')$/i';
-        if ($accessemail || $censoremail)
-        {
-            return !(($accessemail && !preg_match($accessexp, $email)) || ($censoremail && preg_match($censorexp, $email)));
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function check_emailexists($email, $username = '')
-    {
-        $sqladd = $username !== '' ? "AND username<>'$username'" : '';
-        $email = $this->db->result_first("SELECT email FROM  " . UC_DBTABLEPRE . "members WHERE email='$email' $sqladd");
-        return $email;
-    }
-
-    function check_mobileformat($mobile)
-    {
-        return strlen($mobile) >= 11 && preg_match("/^1[34578]\d{9}$/", $mobile);
-    }
-
-    function check_mobileaccess($mobile)
-    {
-        $setting = $this->base->get_setting(array('accessmobile', 'censormobile'));
-        $accessmobile = $setting['accessmobile'];
-        $censormobile = $setting['censormobile'];
-        $accessexp = '/(' . str_replace("\r\n", '|', preg_quote(trim($accessmobile), '/')) . ')$/i';
-        $censorexp = '/(' . str_replace("\r\n", '|', preg_quote(trim($censormobile), '/')) . ')$/i';
-        if ($accessmobile || $censormobile)
-        {
-            return !(($accessmobile && !preg_match($accessexp, $mobile)) || ($censormobile && preg_match($censorexp, $mobile)));
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function check_mobileexists($mobile, $username = '')
-    {
-        $sqladd = $username !== '' ? "AND username<>'$username'" : '';
-        $mobile = $this->db->result_first("SELECT mobile FROM  " . UC_DBTABLEPRE . "members WHERE mobile='$mobile' $sqladd");
-        return $mobile;
-    }
-
-    /**
-     * 检测是否登录
-     * @param string $username
-     * @param string $password
-     * @param array $user
-     * @return int
-     */
-    function check_login($username, $password, &$user)
-    {
-        $user = $this->get_user_by_username($username);
-        if (empty($user['username']))
-        {
-            return -1;
-        }
-        elseif ($user['password'] != md5(md5($password) . $user['salt']))
-        {
-            return -2;
-        }
-        return $user['uid'];
-    }
-
-    /**
-     * 在Ucenter中添加一个账号
-     * @param string $username
-     * @param string $password
-     * @param string $email
-     * @param string $mobile
-     * @param int $uid
-     * @param array $extend
-     * @return int
-     */
-    function add_user($username, $password, $email = '', $mobile = '', $uid = 0, $extend = [])
-    {
-        $regip = $this->base->onlineip;
-        $salt = substr(uniqid(rand()), -6);
-        $password = md5(md5($password) . $salt);
-
-        $values = $uid ? "uid='" . intval($uid) . "'," : '';
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "members SET $values username='$username', password='$password', email='$email', regip='$regip', regdate='" . $this->base->time . "', salt='$salt'");
-        $uid = $this->db->insert_id();
-        $extendfields = [];
-        foreach ($extend as $k => $v)
-        {
-            $extendfields[] = "{$k} = '{$v}'";
-        }
-        $extendfields = $extendfields ? ',' . implode(',', $extendfields) : '';
-        $this->db->query("INSERT INTO " . UC_DBTABLEPRE . "memberfields SET uid='$uid' {$extendfields}");
-        return $uid;
-    }
-
-    /**
-     * 编辑Ucenter中的账号
-     * @param string $username
-     * @param string $password
-     * @param string $email
-     * @param string $mobile
-     * @return int
-     */
-    function edit_user($username, $password = '', $email = '', $mobile = '', $uid = 0, $extend = [])
-    {
-        $uid = intval($uid);
-        $data = $this->db->fetch_first("SELECT username, uid, password, salt FROM " . UC_DBTABLEPRE . "members WHERE uid='$uid'");
-        if (!$data)
-        {
-            return -7;
-        }
-        $isprotected = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "protectedmembers WHERE uid = '{$data['uid']}'");
-        if ($isprotected)
-        {
-            return -8;
-        }
-        $fields = [];
-        if ($username)
-            $fields[] = "username = '{$username}'";
-        if ($email)
-            $fields[] = "email = '{$email}'";
-        if ($mobile)
-            $fields[] = "mobile = '{$mobile}'";
-        if ($password)
-            $fields[] = "password = '" . md5(md5($password) . $data['salt']) . "'";
-        $values = implode(',', $fields);
-        if ($values || $extend)
-        {
-            if ($values)
-            {
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . "members SET $values WHERE uid='{$data['uid']}'");
-            }
-            $extendfields = [];
-            foreach ($extend as $k => $v)
-            {
-                $extendfields[] = "{$k} = '{$v}'";
-            }
-            $extendfields = $extendfields ? implode(',', $extendfields) : '';
-            if ($extendfields)
-            {
-                $this->db->query("UPDATE " . UC_DBTABLEPRE . "memberfields SET {$extendfields} WHERE uid='{$data['uid']}'");
-            }
-            return 1;
-        }
-        else
-        {
-            return -7;
-        }
-    }
-
-    /**
-     * 删除一个账号
-     * @param array $uidsarr
-     * @return int
-     */
-    function delete_user($uidsarr)
-    {
-        $uidsarr = (array) $uidsarr;
-        if (!$uidsarr)
-        {
-            return 0;
-        }
-        $uids = $this->base->implode($uidsarr);
-        $arr = $this->db->fetch_all("SELECT uid FROM " . UC_DBTABLEPRE . "protectedmembers WHERE uid IN ($uids)");
-        $puids = array();
-        foreach ((array) $arr as $member)
-        {
-            $puids[] = $member['uid'];
-        }
-        $uids = $this->base->implode(array_diff($uidsarr, $puids));
-        if ($uids)
-        {
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "members WHERE uid IN($uids)");
-            $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "memberfields WHERE uid IN($uids)");
-            uc_user_deleteavatar($uidsarr);
-            $this->base->load('note');
-            $_ENV['note']->add('deleteuser', "ids=$uids");
-            return $this->db->affected_rows();
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    function delete_useravatar($uidsarr)
-    {
-        $uidsarr = (array) $uidsarr;
-        foreach ((array) $uidsarr as $uid)
-        {
-            file_exists($avatar_file = UC_DATADIR . './avatar/' . $this->base->get_avatar($uid, 'big', 'real')) && unlink($avatar_file);
-            file_exists($avatar_file = UC_DATADIR . './avatar/' . $this->base->get_avatar($uid, 'middle', 'real')) && unlink($avatar_file);
-            file_exists($avatar_file = UC_DATADIR . './avatar/' . $this->base->get_avatar($uid, 'small', 'real')) && unlink($avatar_file);
-            file_exists($avatar_file = UC_DATADIR . './avatar/' . $this->base->get_avatar($uid, 'big')) && unlink($avatar_file);
-            file_exists($avatar_file = UC_DATADIR . './avatar/' . $this->base->get_avatar($uid, 'middle')) && unlink($avatar_file);
-            file_exists($avatar_file = UC_DATADIR . './avatar/' . $this->base->get_avatar($uid, 'small')) && unlink($avatar_file);
-        }
-    }
-
-    /**
-     * 获取账号总数
-     * @param string $sqladd
-     * @return int
-     */
-    function get_total_num($sqladd = '')
-    {
-        $data = $this->db->result_first("SELECT COUNT(*) FROM " . UC_DBTABLEPRE . "members $sqladd");
-        return $data;
-    }
-
-    /**
-     * 获取列表
-     * @param int $page
-     * @param int $ppp
-     * @param int $totalnum
-     * @param string $sqladd
-     * @return array
-     */
-    function get_list($page, $ppp, $totalnum, $sqladd)
-    {
-        $start = $this->base->page_get_start($page, $ppp, $totalnum);
-        $data = $this->db->fetch_all("SELECT * FROM " . UC_DBTABLEPRE . "members $sqladd LIMIT $start, $ppp");
-        return $data;
-    }
-
-    function name2id($usernamesarr)
-    {
-        $usernamesarr = uc_addslashes($usernamesarr, 1, TRUE);
-        $usernames = $this->base->implode($usernamesarr);
-        $query = $this->db->query("SELECT uid FROM " . UC_DBTABLEPRE . "members WHERE username IN($usernames)");
-        $arr = array();
-        while ($user = $this->db->fetch_array($query))
-        {
-            $arr[] = $user['uid'];
-        }
-        return $arr;
-    }
-
-    function id2name($uidarr)
-    {
-        $arr = array();
-        $query = $this->db->query("SELECT uid, username FROM " . UC_DBTABLEPRE . "members WHERE uid IN (" . $this->base->implode($uidarr) . ")");
-        while ($user = $this->db->fetch_array($query))
-        {
-            $arr[$user['uid']] = $user['username'];
-        }
-        return $arr;
-    }
-
-    function quescrypt($questionid, $answer)
-    {
-        return $questionid > 0 && $answer != '' ? substr(md5($answer . md5($questionid)), 16, 8) : '';
-    }
-
-    function can_do_login($username, $ip = '')
-    {
-
-        $check_times = $this->base->settings['login_failedtime'] < 1 ? 5 : $this->base->settings['login_failedtime'];
-
-        $username = substr(md5($username), 8, 15);
-        $expire = 15 * 60;
-        if (!$ip)
-        {
-            $ip = $this->base->onlineip;
-        }
-
-        $ip_check = $user_check = array();
-        $query = $this->db->query("SELECT * FROM " . UC_DBTABLEPRE . "failedlogins WHERE ip='" . $ip . "' OR ip='$username'");
-        while ($row = $this->db->fetch_array($query))
-        {
-            if ($row['ip'] === $username)
-            {
-                $user_check = $row;
-            }
-            elseif ($row['ip'] === $ip)
-            {
-                $ip_check = $row;
-            }
-        }
-
-        if (empty($ip_check) || ($this->base->time - $ip_check['lastupdate'] > $expire))
-        {
-            $ip_check = array();
-            $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "failedlogins (ip, count, lastupdate) VALUES ('{$ip}', '0', '{$this->base->time}')");
-        }
-
-        if (empty($user_check) || ($this->base->time - $user_check['lastupdate'] > $expire))
-        {
-            $user_check = array();
-            $this->db->query("REPLACE INTO " . UC_DBTABLEPRE . "failedlogins (ip, count, lastupdate) VALUES ('{$username}', '0', '{$this->base->time}')");
-        }
-
-        if ($ip_check || $user_check)
-        {
-            $time_left = min(($check_times - $ip_check['count']), ($check_times - $user_check['count']));
-            return $time_left;
-        }
-
-        $this->db->query("DELETE FROM " . UC_DBTABLEPRE . "failedlogins WHERE lastupdate<" . ($this->base->time - ($expire + 1)), 'UNBUFFERED');
-
-        return $check_times;
-    }
-
-    function loginfailed($username, $ip = '')
-    {
-        $username = substr(md5($username), 8, 15);
-        if (!$ip)
-        {
-            $ip = $this->base->onlineip;
-        }
-        $this->db->query("UPDATE " . UC_DBTABLEPRE . "failedlogins SET count=count+1, lastupdate='" . $this->base->time . "' WHERE ip='" . $ip . "' OR ip='$username'");
-    }
-
-}
diff --git a/extend/fast/ucenter/common/Functions.php b/extend/fast/ucenter/common/Functions.php
deleted file mode 100644
index 9f9df9d7..00000000
--- a/extend/fast/ucenter/common/Functions.php
+++ /dev/null
@@ -1,98 +0,0 @@
- 0) && substr($result, 10, 16) == substr(md5(substr($result, 26) . $keyb), 0, 16))
-        {
-            return substr($result, 26);
-        }
-        else
-        {
-            return '';
-        }
-    }
-    else
-    {
-        return $keyc . str_replace('=', '', base64_encode($result));
-    }
-}
-
-function _uc_stripslashes($string)
-{
-    if (is_array($string))
-    {
-        foreach ($string as $key => $val)
-        {
-            $string[$key] = _stripslashes($val);
-        }
-    }
-    else
-    {
-        $string = stripslashes($string);
-    }
-    return $string;
-}
-
-/**
- * 字符串命名风格转换
- * type 0 将Java风格转换为C的风格 1 将C风格转换为Java的风格
- * @param string $name 字符串
- * @param integer $type 转换类型
- * @return string
- */
-function parse_name($name, $type = 0)
-{
-    if ($type)
-    {
-        return ucfirst(preg_replace_callback('/_([a-zA-Z])/', function($match)
-                {
-                    return strtoupper($match[1]);
-                }, $name));
-    }
-    else
-    {
-        return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_"));
-    }
-}
diff --git a/extend/fast/ucenter/common/XML.php b/extend/fast/ucenter/common/XML.php
deleted file mode 100644
index 938fbd59..00000000
--- a/extend/fast/ucenter/common/XML.php
+++ /dev/null
@@ -1,129 +0,0 @@
-parse($xml);
-    $xml_parser->destruct();
-    return $data;
-}
-
-function xml_serialize($arr, $htmlon = FALSE, $isnormal = FALSE, $level = 1)
-{
-    $s = $level == 1 ? "\r\n\r\n" : '';
-    $space = str_repeat("\t", $level);
-    foreach ($arr as $k => $v)
-    {
-        if (!is_array($v))
-        {
-            $s .= $space . "" . ($htmlon ? '' : '') . "\r\n";
-        }
-        else
-        {
-            $s .= $space . "\r\n" . xml_serialize($v, $htmlon, $isnormal, $level + 1) . $space . "\r\n";
-        }
-    }
-    $s = preg_replace("/([\x01-\x08\x0b-\x0c\x0e-\x1f])+/", ' ', $s);
-    return $level == 1 ? $s . "" : $s;
-}
-
-class XML
-{
-
-    var $parser;
-    var $document;
-    var $stack;
-    var $data;
-    var $last_opened_tag;
-    var $isnormal;
-    var $attrs = array();
-    var $failed = FALSE;
-
-    function __construct($isnormal)
-    {
-        $this->XML($isnormal);
-    }
-
-    function XML($isnormal)
-    {
-        $this->isnormal = $isnormal;
-        $this->parser = xml_parser_create('ISO-8859-1');
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, false);
-        xml_set_object($this->parser, $this);
-        xml_set_element_handler($this->parser, 'open', 'close');
-        xml_set_character_data_handler($this->parser, 'data');
-    }
-
-    function destruct()
-    {
-        xml_parser_free($this->parser);
-    }
-
-    function parse(&$data)
-    {
-        $this->document = array();
-        $this->stack = array();
-        return xml_parse($this->parser, $data, true) && !$this->failed ? $this->document : '';
-    }
-
-    function open(&$parser, $tag, $attributes)
-    {
-        $this->data = '';
-        $this->failed = FALSE;
-        if (!$this->isnormal)
-        {
-            if (isset($attributes['id']) && !is_string($this->document[$attributes['id']]))
-            {
-                $this->document = &$this->document[$attributes['id']];
-            }
-            else
-            {
-                $this->failed = TRUE;
-            }
-        }
-        else
-        {
-            if (!isset($this->document[$tag]) || !is_string($this->document[$tag]))
-            {
-                $this->document = &$this->document[$tag];
-            }
-            else
-            {
-                $this->failed = TRUE;
-            }
-        }
-        $this->stack[] = &$this->document;
-        $this->last_opened_tag = $tag;
-        $this->attrs = $attributes;
-    }
-
-    function data(&$parser, $data)
-    {
-        if ($this->last_opened_tag != NULL)
-        {
-            $this->data .= $data;
-        }
-    }
-
-    function close(&$parser, $tag)
-    {
-        if ($this->last_opened_tag == $tag)
-        {
-            $this->document = $this->data;
-            $this->last_opened_tag = NULL;
-        }
-        array_pop($this->stack);
-        if ($this->stack)
-        {
-            $this->document = &$this->stack[count($this->stack) - 1];
-        }
-    }
-
-}
diff --git a/public/assets/css/backend.css b/public/assets/css/backend.css
index e68f9d6f..849b68fd 100644
--- a/public/assets/css/backend.css
+++ b/public/assets/css/backend.css
@@ -60,6 +60,9 @@ body.is-dialog {
 .content-wrapper {
   position: relative;
 }
+.control-relative {
+  position: relative;
+}
 .tab-addtabs {
   overflow: hidden;
 }
@@ -371,6 +374,11 @@ table.table-template {
   width: 25px;
   height: 25px;
 }
+@media (min-width: 768px) {
+  .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
+    top: 41px;
+  }
+}
 .fieldlist dd {
   display: block;
   margin: 5px 0;
diff --git a/public/assets/css/index.css b/public/assets/css/index.css
new file mode 100644
index 00000000..9e9a9929
--- /dev/null
+++ b/public/assets/css/index.css
@@ -0,0 +1,422 @@
+html,
+body {
+    height: 100%;
+    width: 100%;
+}
+body {
+    font-family: 'Muli', 'Helvetica', 'Arial', 'sans-serif';
+}
+a {
+    -webkit-transition: all 0.35s;
+    -moz-transition: all 0.35s;
+    transition: all 0.35s;
+    color: #fdcc52;
+}
+a:hover,
+a:focus {
+    color: #fcbd20;
+}
+hr {
+    max-width: 100px;
+    margin: 25px auto 0;
+    border-width: 1px;
+    border-color: rgba(34, 34, 34, 0.1);
+}
+hr.light {
+    border-color: white;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-weight: 200;
+    letter-spacing: 1px;
+}
+p {
+    font-size: 16px;
+    line-height: 1.5;
+    margin-bottom: 20px;
+}
+.navbar-default {
+    background-color: white;
+    border-color: rgba(34, 34, 34, 0.05);
+    -webkit-transition: all 0.35s;
+    -moz-transition: all 0.35s;
+    transition: all 0.35s;
+    font-family: 'Catamaran', 'Helvetica', 'Arial', 'sans-serif';
+    font-weight: 200;
+    letter-spacing: 1px;
+}
+.navbar-default .navbar-header .navbar-brand {
+    font-family: 'Catamaran', 'Helvetica', 'Arial', 'sans-serif';
+    font-weight: 200;
+    letter-spacing: 1px;
+    color: #fdcc52;
+}
+.navbar-default .navbar-header .navbar-brand:hover,
+.navbar-default .navbar-header .navbar-brand:focus {
+    color: #fcbd20;
+}
+.navbar-default .navbar-header .navbar-toggle {
+    font-size: 12px;
+    color: #222222;
+    padding: 8px 10px;
+}
+.navbar-default .nav > li > a {
+    text-transform: uppercase;
+    letter-spacing: 2px;
+    font-size: 14px;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:focus {
+    color: #222222;
+}
+.navbar-default .nav > li > a:hover,
+.navbar-default .nav > li > a:focus:hover {
+    color: #fdcc52;
+}
+.navbar-default .nav > li.active > a,
+.navbar-default .nav > li.active > a:focus {
+    color: #fdcc52 !important;
+    background-color: transparent;
+}
+.navbar-default .nav > li.active > a:hover,
+.navbar-default .nav > li.active > a:focus:hover {
+    background-color: transparent;
+}
+.navbar-default .navbar-header .navbar-brand {
+    padding-top:3px;
+}
+@media (min-width: 768px) {
+    .navbar-default {
+        background-color: transparent;
+        border-color: transparent;
+    }
+    .navbar-default .navbar-header .navbar-brand {
+        color: rgba(255, 255, 255, 0.7);
+    }
+    .navbar-default .navbar-header .navbar-brand:hover,
+    .navbar-default .navbar-header .navbar-brand:focus {
+        color: white;
+    }
+    .navbar-default .nav > li > a,
+    .navbar-default .nav > li > a:focus {
+        color: rgba(255, 255, 255, 0.7);
+    }
+    .navbar-default .nav > li > a:hover,
+    .navbar-default .nav > li > a:focus:hover {
+        color: white;
+    }
+    .navbar-default.affix {
+        background-color: white;
+        border-color: rgba(34, 34, 34, 0.1);
+    }
+    .navbar-default.affix .navbar-header .navbar-brand {
+        color: #222222;
+    }
+    .navbar-default.affix .navbar-header .navbar-brand:hover,
+    .navbar-default.affix .navbar-header .navbar-brand:focus {
+        color: #fdcc52;
+    }
+    .navbar-default.affix .nav > li > a,
+    .navbar-default.affix .nav > li > a:focus {
+        color: #222222;
+    }
+    .navbar-default.affix .nav > li > a:hover,
+    .navbar-default.affix .nav > li > a:focus:hover {
+        color: #fdcc52;
+    }
+}
+header {
+    position: relative;
+    width: 100%;
+    min-height: auto;
+    overflow-y: hidden;
+    background: url("../img/bg-pattern.png"), #7b4397;
+    /* fallback for old browsers */
+    background: url("../img/bg-pattern.png"), -webkit-linear-gradient(to left, #328944, #247cdc);
+    /* Chrome 10-25, Safari 5.1-6 */
+    background: url(../img/bg-pattern.png), linear-gradient(to left, #328944, #247cdc);
+    /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+    color: white;
+}
+header .header-content {
+    text-align: center;
+    padding: 150px 0 50px;
+    position: relative;
+}
+header .header-content .header-content-inner {
+    position: relative;
+    margin: 0 auto;
+}
+header .header-content .header-content-inner h1 {
+    margin-top: 0;
+    margin-bottom: 30px;
+    font-size: 80px;
+}
+header .header-content .header-content-inner .list-badges {
+    margin-bottom: 25px;
+}
+header .header-content .header-content-inner .list-badges img {
+    height: 50px;
+    margin-bottom: 25px;
+}
+header .device-container {
+    max-width: 300px;
+    margin: 0 auto 100px;
+}
+header .device-container .screen img {
+    border-radius: 3px;
+}
+@media (min-width: 768px) {
+    header {
+        min-height: 100%;
+    }
+    header .header-content {
+        text-align: center;
+        padding: 0;
+        height: 100vh;
+    }
+    header .header-content .header-content-inner {
+        width:100%;
+        margin: 0;
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+    }
+    header .header-content .header-content-inner h1 {
+        font-size: 35px;
+    }
+    header .device-container {
+        max-width: none;
+        max-height: calc(0vh);
+        margin: 100px auto 0;
+    }
+}
+@media (min-width: 992px) {
+    header .header-content .header-content-inner h1 {
+        font-size: 80px;
+    }
+}
+
+@media (max-width: 767px) {
+    header .header-content .header-content-inner h1 {
+        font-size: 50px;
+    }
+}
+section {
+    padding: 100px 0;
+}
+section h2 {
+    font-size: 50px;
+}
+section.download {
+    padding: 150px 0;
+    position: relative;
+}
+section.download h2 {
+    margin-top: 0;
+    font-size: 50px;
+}
+section.download .badges .badge-link {
+    display: block;
+    margin-bottom: 25px;
+}
+section.download .badges .badge-link:last-child {
+    margin-bottom: 0;
+}
+section.download .badges .badge-link img {
+    height: 60px;
+}
+@media (min-width: 768px) {
+    section.download .badges .badge-link {
+        display: inline-block;
+        margin-bottom: 0;
+    }
+}
+@media (min-width: 768px) {
+    section.download h2 {
+        font-size: 70px;
+    }
+}
+section.features .section-heading {
+    margin-bottom: 100px;
+}
+section.features .section-heading h2 {
+    margin-top: 0;
+}
+section.features .section-heading p {
+    margin-bottom: 0;
+}
+section.features .device-container,
+section.features .feature-item {
+    max-width: 300px;
+    margin: 0 auto;
+    height:215px;
+}
+section.features .device-container {
+    margin-bottom: 100px;
+}
+@media (min-width: 992px) {
+    section.features .device-container {
+        margin-bottom: 0;
+    }
+}
+section.features .feature-item {
+    text-align: center;
+    margin-bottom: 80px;
+}
+section.features .feature-item h3 {
+    font-size: 24px;
+}
+section.features .feature-item i {
+    font-size: 60px;
+    
+    background: -webkit-linear-gradient(to left,#328944, #247cdc);
+    background: linear-gradient(to left, #328944, #247cdc);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+}
+@media (min-width: 992px) {
+    section.features .device-container,
+    section.features .feature-item {
+        max-width: none;
+    }
+}
+section.cta {
+    position: relative;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    background-size: cover;
+    -o-background-size: cover;
+    background-position: center;
+    background-image: url('../img/bg-middle.jpg');
+    padding: 250px 0;
+}
+section.cta .cta-content {
+    position: relative;
+    z-index: 1;
+}
+section.cta .cta-content h2 {
+    margin-top: 0;
+    margin-bottom: 25px;
+    color: white;
+    max-width: 450px;
+    font-size: 50px;
+}
+@media (min-width: 768px) {
+    section.cta .cta-content h2 {
+        font-size: 70px;
+    }
+}
+section.cta .overlay {
+    height: 100%;
+    width: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+section.contact {
+    text-align: center;
+}
+section.contact h2 {
+    margin-top: 0;
+    margin-bottom: 25px;
+}
+section.contact h2 i {
+    color: #dd4b39;
+}
+section.contact ul.list-social {
+    margin-bottom: 0;
+}
+section.contact ul.list-social li a {
+    display: block;
+    height: 80px;
+    width: 80px;
+    line-height: 80px;
+    font-size: 40px;
+    border-radius: 100%;
+    color: white;
+}
+section.contact ul.list-social li.social-github a {
+    background-color: #444;
+}
+section.contact ul.list-social li.social-github a:hover {
+    background-color: #111;
+}
+section.contact ul.list-social li.social-qq a {
+    background-color: #1da1f2;
+}
+section.contact ul.list-social li.social-qq a:hover {
+    background-color: #0d95e8;
+}
+section.contact ul.list-social li.social-weibo a {
+    background-color: #dd4b39;
+}
+section.contact ul.list-social li.social-weibo a:hover {
+    background-color: #d73925;
+}
+footer {
+    background-color: #222222;
+    padding: 25px 0;
+    color: rgba(255, 255, 255, 0.3);
+    text-align: center;
+}
+footer p {
+    font-size: 12px;
+    margin: 0;
+}
+footer ul {
+    margin-bottom: 0;
+}
+footer ul li a {
+    font-size: 12px;
+    color: rgba(255, 255, 255, 0.3);
+}
+footer ul li a:hover,
+footer ul li a:focus,
+footer ul li a:active,
+footer ul li a.active {
+    text-decoration: none;
+}
+.bg-primary {
+    background: #fdcc52;
+    background: -webkit-linear-gradient(#fdcc52, #fdc539);
+    background: linear-gradient(#fdcc52, #fdc539);
+}
+.text-primary {
+    color: #fdcc52;
+}
+.no-gutter > [class*='col-'] {
+    padding-right: 0;
+    padding-left: 0;
+}
+.btn-outline {
+    color: white;
+    border-color: white;
+    border: 1px solid;
+}
+.btn-outline:hover,
+.btn-outline:focus,
+.btn-outline:active,
+.btn-outline.active {
+    color: white;
+    background-color: #fdcc52;
+    border-color: #fdcc52;
+}
+.btn {
+    text-transform: uppercase;
+    letter-spacing: 2px;
+    border-radius: 300px;
+}
+.btn-xl {
+    margin-top:20px;
+    padding: 10px 45px;
+    font-size: 14px;
+}
+body {
+    webkit-tap-highlight-color: #222222;
+}
diff --git a/public/assets/img/bg-middle.jpg b/public/assets/img/bg-middle.jpg
new file mode 100755
index 00000000..7775b8fe
Binary files /dev/null and b/public/assets/img/bg-middle.jpg differ
diff --git a/public/assets/img/bg-pattern.png b/public/assets/img/bg-pattern.png
new file mode 100644
index 00000000..cfd79110
Binary files /dev/null and b/public/assets/img/bg-pattern.png differ
diff --git a/public/assets/img/bootstrap.jpg b/public/assets/img/bootstrap.jpg
deleted file mode 100644
index fc172025..00000000
Binary files a/public/assets/img/bootstrap.jpg and /dev/null differ
diff --git a/public/assets/img/loginbg.jpg b/public/assets/img/loginbg.jpg
new file mode 100755
index 00000000..8b942b9e
Binary files /dev/null and b/public/assets/img/loginbg.jpg differ
diff --git a/public/assets/img/qrcode.jpg b/public/assets/img/qrcode.jpg
deleted file mode 100644
index 34f16dd9..00000000
Binary files a/public/assets/img/qrcode.jpg and /dev/null differ
diff --git a/public/assets/img/third.jpg b/public/assets/img/third.jpg
deleted file mode 100644
index e8c852e1..00000000
Binary files a/public/assets/img/third.jpg and /dev/null differ
diff --git a/public/assets/img/ucenter.jpg b/public/assets/img/ucenter.jpg
deleted file mode 100644
index 17f64d64..00000000
Binary files a/public/assets/img/ucenter.jpg and /dev/null differ
diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js
new file mode 100644
index 00000000..d017888b
--- /dev/null
+++ b/public/assets/js/addons.js
@@ -0,0 +1,3 @@
+define(['backend'], function (Backend) {
+    
+});
\ No newline at end of file
diff --git a/public/assets/js/adminlte.js b/public/assets/js/adminlte.js
index 94e1f53a..6c169a2e 100644
--- a/public/assets/js/adminlte.js
+++ b/public/assets/js/adminlte.js
@@ -7,7 +7,7 @@
  * @Author  Almsaeed Studio
  * @Support 
  * @Email   
- * @version 2.3.7
+ * @version 2.3.8
  * @license MIT 
  */
 
@@ -63,6 +63,8 @@ $.AdminLTE.options = {
     //choose to enable the plugin, make sure you load the script
     //before AdminLTE's app.js
     enableFastclick: false,
+    //Control Sidebar Tree views
+    enableControlTreeView: true,
     //Control Sidebar Options
     enableControlSidebar: true,
     controlSidebarOptions: {
@@ -160,7 +162,9 @@ $(function () {
     $.AdminLTE.layout.activate();
 
     //Enable sidebar tree view controls
-    $.AdminLTE.tree('.sidebar');
+    if (o.enableControlTreeView) {
+        $.AdminLTE.tree('.sidebar');
+    }
 
     //Enable control sidebar
     if (o.enableControlSidebar) {
@@ -184,7 +188,8 @@ $(function () {
     //Activate Bootstrap tooltip
     if (o.enableBSToppltip) {
         $('body').tooltip({
-            selector: o.BSTooltipSelector
+            selector: o.BSTooltipSelector,
+            container: 'body'
         });
     }
 
@@ -242,20 +247,24 @@ function _init() {
             var _this = this;
             _this.fix();
             _this.fixSidebar();
+            $('body, html, .wrapper').css('height', 'auto');
             $(window, ".wrapper").resize(function () {
                 _this.fix();
                 _this.fixSidebar();
             });
         },
         fix: function () {
+            // Remove overflow from .wrapper if layout-boxed exists
+            $(".layout-boxed > .wrapper").css('overflow', 'hidden');
             //Get window height and the wrapper height
-            var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight();
+            var footer_height = $('.main-footer').outerHeight() || 0;
+            var neg = $('.main-header').outerHeight() + footer_height;
             var window_height = $(window).height();
-            var sidebar_height = $(".sidebar").height();
+            var sidebar_height = $(".sidebar").height() || 0;
             //Set the min-height of the content and sidebar based on the
             //the height of the document.
             if ($("body").hasClass("fixed")) {
-                $(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight());
+                $(".content-wrapper, .right-side").css('min-height', window_height - footer_height);
             } else {
                 var postSetWidth;
                 if (window_height >= sidebar_height) {
@@ -289,13 +298,15 @@ function _init() {
             if ($.AdminLTE.options.sidebarSlimScroll) {
                 if (typeof $.fn.slimScroll != 'undefined') {
                     //Destroy if it exists
-                    $(".sidebar").slimScroll({destroy: true}).height("auto");
-                    //Add slimscroll
-                    $(".sidebar").slimscroll({
-                        height: ($(window).height() - $(".main-header").height()) + "px",
-                        color: "rgba(0,0,0,0.2)",
-                        size: "3px"
-                    });
+                    $(".sidebar").slimScroll({destroy: true}).height("auto").css("overflow", "inherit");
+                    if (!$("body").hasClass('sidebar-collapse')) {
+                        //Add slimscroll
+                        $(".sidebar").slimscroll({
+                            height: ($(window).height() - $(".main-header").height()) + "px",
+                            color: "rgba(0,0,0,0.2)",
+                            size: "3px"
+                        });
+                    }
                 }
             }
         }
@@ -333,6 +344,7 @@ function _init() {
                         $("body").addClass('sidebar-open').trigger('expanded.pushMenu');
                     }
                 }
+                $.AdminLTE.layout.fixSidebar();
             });
 
             $(".content-wrapper").click(function () {
@@ -343,9 +355,7 @@ function _init() {
             });
 
             //Enable expand on hover for sidebar mini
-            if ($.AdminLTE.options.sidebarExpandOnHover
-                    || ($('body').hasClass('fixed')
-                            && $('body').hasClass('sidebar-mini'))) {
+            if ($.AdminLTE.options.sidebarExpandOnHover) {
                 this.expandOnHover();
             }
         },
@@ -408,6 +418,7 @@ function _init() {
                     else if ((checkElement.is('.treeview-menu')) && (!checkElement.is(':visible'))) {
                         //Get the parent menu
                         var parent = $this.parents('ul').first();
+                        // modified by FastAdmin
                         if ($(".show-submenu", menu).size() == 0) {
                             //Close all open menus within the parent
                             var ul = parent.find('ul:visible').slideUp(animationSpeed);
@@ -430,6 +441,7 @@ function _init() {
                         if (!$this.parent().hasClass("active")) {
                             $this.parent().addClass("active");
                         }
+                        // modified by FastAdmin
                         if ($(".show-submenu", menu).size() == 0) {
                             $this.parent().siblings().find("ul.menu-open").slideUp();
                         }
diff --git a/public/assets/js/backend.js b/public/assets/js/backend.js
index 70677861..cf590d7f 100755
--- a/public/assets/js/backend.js
+++ b/public/assets/js/backend.js
@@ -46,8 +46,8 @@ define(['fast', 'moment'], function (Fast, Moment) {
                         leftlink = top.window.$(dom.replace(/\{url\}/, baseurl));
                         //能找到相对地址
                         if (leftlink.size() > 0) {
-                            icon = typeof icon != 'undefined' ? icon : leftlink.find("i").attr("class");
-                            title = typeof title != 'undefined' ? title : leftlink.find("span:first").text();
+                            icon = typeof icon !== 'undefined' ? icon : leftlink.find("i").attr("class");
+                            title = typeof title !== 'undefined' ? title : leftlink.find("span:first").text();
                             leftlink.trigger("fa.event.toggleitem");
                         }
                         var navnode = $(".nav-tabs ul li a[node-url='" + url + "']");
@@ -56,8 +56,8 @@ define(['fast', 'moment'], function (Fast, Moment) {
                         } else {
                             //追加新的tab
                             var id = Math.floor(new Date().valueOf() * Math.random());
-                            icon = typeof icon != 'undefined' ? icon : 'fa fa-circle-o';
-                            title = typeof title != 'undefined' ? title : '';
+                            icon = typeof icon !== 'undefined' ? icon : 'fa fa-circle-o';
+                            title = typeof title !== 'undefined' ? title : '';
                             top.window.$("").append(' ' + title + '').prop("href", url).attr({url: url, addtabs: id}).addClass("hide").appendTo(top.window.document.body).trigger("click");
                         }
                     }
@@ -67,17 +67,28 @@ define(['fast', 'moment'], function (Fast, Moment) {
         init: function () {
             //公共代码
             //配置Toastr的参数
-            Toastr.options.positionClass = Config.controllername == 'index' ? "toast-top-right-index" : "toast-top-right";
+            Toastr.options.positionClass = Config.controllername === 'index' ? "toast-top-right-index" : "toast-top-right";
             //点击包含.btn-dialog的元素时弹出dialog
             $(document).on('click', '.btn-dialog,.dialogit', function (e) {
                 e.preventDefault();
-                Backend.api.open(Backend.api.fixurl($(this).attr('href')), $(this).attr('title'));
+                var options = $(this).data();
+                options = options ? options : {};
+                Backend.api.open(Backend.api.fixurl($(this).attr('href')), $(this).attr('title'), options);
             });
             //点击包含.btn-addtabs的元素时事件
             $(document).on('click', '.btn-addtabs,.addtabsit', function (e) {
                 e.preventDefault();
                 Backend.api.addtabs($(this).attr("href"), $(this).attr("title"));
             });
+            //点击包含.btn-ajax的元素时事件
+            $(document).on('click', '.btn-ajax,.ajaxit', function (e) {
+                e.preventDefault();
+                var options = $(this).data();
+                if (typeof options.url === 'undefined' && $(this).attr("href")) {
+                    options.url = $(this).attr("href");
+                }
+                Backend.api.ajax(options);
+            });
             //修复含有fixed-footer类的body边距
             if ($(".fixed-footer").size() > 0) {
                 $(document.body).css("padding-bottom", $(".fixed-footer").height());
diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js
new file mode 100644
index 00000000..188fd89c
--- /dev/null
+++ b/public/assets/js/backend/addon.js
@@ -0,0 +1,213 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function ($, undefined, Backend, Table, Form, Template) {
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: Config.fastadmin.api_url + '/addon/index',
+                    add_url: '',
+                    edit_url: '',
+                    del_url: '',
+                    multi_url: ''
+                }
+            });
+
+            var table = $("#table");
+
+            Template.helper("Moment", Moment);
+            Template.helper("addons", Config['addons']);
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                columns: [
+                    [
+                        {field: 'id', title: 'ID'},
+                        {field: 'name', title: __('Name')},
+                        {field: 'title', title: __('Title')}
+                    ]
+                ],
+                templateView: true,
+                search: false,
+                showColumns: false,
+                showToggle: false,
+                showExport: false,
+                commonSearch: true,
+                searchFormVisible: false,
+                pageSize: 12
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+
+            require(['upload'], function (Upload) {
+                Upload.api.plupload("#plupload-addon", function (data, ret) {
+                    Config['addons'][data.addon.name] = data.addon;
+                    $('.btn-refresh').trigger('click');
+                    Toastr.success(ret.msg);
+                });
+            });
+
+            //点击安装
+            $(document).on("click", ".btn-install", function () {
+                var name = $(this).closest(".operate").data("name");
+                var install = function (name, force) {
+                    Fast.api.ajax({
+                        url: 'addon/install',
+                        data: {name: name, force: force ? 1 : 0}
+                    }, function (data, ret) {
+                        Layer.closeAll();
+                        Config['addons'][data.addon.name] = ret.data.addon;
+                        $('.btn-refresh').trigger('click');
+                    }, function (data, ret) {
+                        //如果是需要购买的插件则弹出二维码提示
+                        if (ret && ret.code === -1) {
+                            //扫码支付
+                            Layer.open({
+                                content: Template("paytpl", ret.data),
+                                shade: 0.8,
+                                area: ['800px', '600px'],
+                                skin: 'layui-layer-msg layui-layer-pay',
+                                title: false,
+                                closeBtn: true,
+                                btn: false,
+                                resize: false,
+                                end: function () {
+                                    Layer.alert("支付完成后请稍等1~5分钟后再尝试安装，请不要重复支付，如果仍然无法安装，请加QQ群：636393962向管理员反馈");
+                                }
+                            });
+                        } else if (ret && ret.code === -2) {
+                            //跳转支付
+                            Layer.alert('请点击这里在新窗口中进行支付！', {
+                                btn: ['立即支付', '取消'],
+                                icon: 0,
+                                success: function (layero) {
+                                    $(".layui-layer-btn0", layero).attr("href", ret.data.payurl).attr("target", "_blank");
+                                }
+                            }, function () {
+                                Layer.alert("请在新弹出的窗口中进行支付，支付完成后再重新点击安装按钮进行安装！", {icon: 0});
+                            });
+
+                        } else if (ret && ret.code === -3) {
+                            //插件目录发现影响全局的文件
+                            Layer.open({
+                                content: Template("conflicttpl", ret.data),
+                                shade: 0.8,
+                                area: ['800px', '600px'],
+                                title: "温馨提示",
+                                btn: ['继续安装', '取消'],
+                                end: function () {
+
+                                },
+                                yes: function () {
+                                    install(name, true);
+                                }
+                            });
+
+                        } else {
+                            Layer.alert(ret.msg);
+                        }
+                        return false;
+                    });
+                };
+                install(name, false);
+            });
+
+            //点击卸载
+            $(document).on("click", ".btn-uninstall", function () {
+                var name = $(this).closest(".operate").data("name");
+                var uninstall = function (name, force) {
+                    Fast.api.ajax({
+                        url: 'addon/uninstall',
+                        data: {name: name, force: force ? 1 : 0}
+                    }, function (data, ret) {
+                        delete Config['addons'][name];
+                        Layer.closeAll();
+                        $('.btn-refresh').trigger('click');
+                    }, function (data, ret) {
+                        if (ret && ret.code === -3) {
+                            //插件目录发现影响全局的文件
+                            Layer.open({
+                                content: Template("conflicttpl", ret.data),
+                                shade: 0.8,
+                                area: ['800px', '600px'],
+                                title: "温馨提示",
+                                btn: ['继续卸载', '取消'],
+                                end: function () {
+
+                                },
+                                yes: function () {
+                                    uninstall(name, true);
+                                }
+                            });
+
+                        } else {
+                            Layer.alert(ret.msg);
+                        }
+                        return false;
+                    });
+                };
+                Layer.confirm("确认卸载插件？
                      卸载将会删除所有插件文件且不可找回!!! 插件如果有创建数据库表请手动删除!!!
                      如有重要数据请备份后再操作！", function () {
+                    uninstall(name, false);
+                });
+            });
+
+            //点击配置
+            $(document).on("click", ".btn-config", function () {
+                var name = $(this).closest(".operate").data("name");
+                Fast.api.open("addon/config?name=" + name, "修改配置");
+            });
+
+            //点击启用/禁用
+            $(document).on("click", ".btn-enable,.btn-disable", function () {
+                var name = $(this).closest(".operate").data("name");
+                var action = $(this).data("action");
+                var operate = function (name, action, force) {
+                    Fast.api.ajax({
+                        url: 'addon/state',
+                        data: {name: name, action: action, force: force ? 1 : 0}
+                    }, function (data, ret) {
+                        var addon = Config['addons'][name];
+                        addon.state = action === 'enable' ? 1 : 0;
+                        Layer.closeAll();
+                        $('.btn-refresh').trigger('click');
+                    }, function (data, ret) {
+                        if (ret && ret.code === -3) {
+                            //插件目录发现影响全局的文件
+                            Layer.open({
+                                content: Template("conflicttpl", ret.data),
+                                shade: 0.8,
+                                area: ['800px', '600px'],
+                                title: "温馨提示",
+                                btn: ['继续操作', '取消'],
+                                end: function () {
+
+                                },
+                                yes: function () {
+                                    operate(name, action, true);
+                                }
+                            });
+
+                        } else {
+                            Layer.alert(ret.msg);
+                        }
+                        return false;
+                    });
+                };
+                operate(name, action, false);
+            });
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        config: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
\ No newline at end of file
diff --git a/public/assets/js/backend/auth/admin.js b/public/assets/js/backend/auth/admin.js
index 8fe1eae5..64e1183f 100755
--- a/public/assets/js/backend/auth/admin.js
+++ b/public/assets/js/backend/auth/admin.js
@@ -28,7 +28,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'email', title: __('Email')},
                         {field: 'status', title: __("Status"), formatter: Table.api.formatter.status},
                         {field: 'logintime', title: __('Login time'), formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: function (value, row, index) {
+                                if(row.id == 1){
+                                    return '';
+                                }
+                                return Table.api.formatter.operate.call(this, value, row, index, table);
+                            }}
                     ]
                 ]
             });
diff --git a/public/assets/js/backend/auth/group.js b/public/assets/js/backend/auth/group.js
index 15b546d6..88912b2c 100755
--- a/public/assets/js/backend/auth/group.js
+++ b/public/assets/js/backend/auth/group.js
@@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                         {field: 'name', title: __('Name'), align: 'left'},
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: function (value, row, index) {
-                                if(row.id == 1){
+                                if (row.id == 1) {
                                     return '';
                                 }
                                 return Table.api.formatter.operate.call(this, value, row, index, table);
@@ -59,23 +59,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
 
         },
         add: function () {
-            Form.api.bindevent($("form[role=form]"));
             Controller.api.bindevent();
         },
         edit: function () {
-            Form.api.bindevent($("form[role=form]"));
             Controller.api.bindevent();
         },
         api: {
-            refreshrules: function () {
-                if ($("#treeview").size() > 0) {
-                    var r = $("#treeview").jstree("get_all_checked");
-                    $("input[name='row[rules]']").val(r.join(','));
-                }
-                return true;
-            },
             bindevent: function () {
-                Form.api.custom.refreshrules = Controller.api.refreshrules;
+                Form.api.bindevent($("form[role=form]"), null, null, function () {
+                    if ($("#treeview").size() > 0) {
+                        var r = $("#treeview").jstree("get_all_checked");
+                        $("input[name='row[rules]']").val(r.join(','));
+                    }
+                    return true;
+                });
                 //渲染权限节点树
                 //变更级别后需要重建节点树
                 $(document).on("change", "select[name='row[pid]']", function () {
diff --git a/public/assets/js/backend/category.js b/public/assets/js/backend/category.js
index b0fa426f..056e2c8e 100644
--- a/public/assets/js/backend/category.js
+++ b/public/assets/js/backend/category.js
@@ -27,12 +27,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'type', title: __('Type')},
-                        {field: 'name', title: __('Name'), align:'left'},
+                        {field: 'name', title: __('Name'), align: 'left'},
                         {field: 'nickname', title: __('Nickname')},
-                        {field: 'flag', title: __('Flag'), operate:false, formatter: Table.api.formatter.flag},
-                        {field: 'image', title: __('Image'), operate:false, formatter: Table.api.formatter.image},
-                        {field: 'weigh', title: __('Weigh'), operate:false},
-                        {field: 'status', title: __('Status'), operate:false, formatter: Table.api.formatter.status},
+                        {field: 'flag', title: __('Flag'), operate: false, formatter: Table.api.formatter.flag},
+                        {field: 'image', title: __('Image'), operate: false, formatter: Table.api.formatter.image},
+                        {field: 'weigh', title: __('Weigh'), operate: false},
+                        {field: 'status', title: __('Status'), operate: false, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -49,6 +49,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         api: {
             bindevent: function () {
+                $(document).on("change", "#c-type", function () {
+                    $("#c-pid option[data-type='all']").prop("selected", true);
+                    $("#c-pid option").removeClass("hide");
+                    $("#c-pid option[data-type!='" + $(this).val() + "'][data-type!='all']").addClass("hide");
+                    $("#c-pid").selectpicker("refresh");
+                });
                 Form.api.bindevent($("form[role=form]"));
             }
         }
diff --git a/public/assets/js/backend/example/bootstraptable.js b/public/assets/js/backend/example/bootstraptable.js
deleted file mode 100644
index a6c36399..00000000
--- a/public/assets/js/backend/example/bootstraptable.js
+++ /dev/null
@@ -1,162 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'example/bootstraptable/index',
-                    add_url: '',
-                    edit_url: '',
-                    del_url: 'example/bootstraptable/del',
-                    multi_url: '',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                columns: [
-                    [
-                        //该列为复选框字段,如果后台的返回state值将会默认选中
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID', operate: false},
-                        //默认隐藏该列
-                        {field: 'admin_id', title: __('Admin_id'), visible: false, operate: false},
-                        //直接响应搜索
-                        {field: 'username', title: __('Username'), formatter: Table.api.formatter.search},
-                        //模糊搜索
-                        {field: 'title', title: __('Title'), operate: 'LIKE %...%', placeholder: '模糊搜索，*表示任意字符', style: 'width:200px'},
-                        //通过Ajax渲染searchList，也可以使用JSON数据
-                        {field: 'url', title: __('Url'), align: 'left', searchList: $.getJSON('ajax/typeahead?search=a&field=row[user_id]'), formatter: Controller.api.formatter.url},
-                        //点击IP时同时执行搜索此IP,同时普通搜索使用下拉列表的形式
-                        {field: 'ip', title: __('IP'), searchList: ['127.0.0.1', '127.0.0.2'], events: Controller.api.events.ip, formatter: Controller.api.formatter.ip},
-                        //自定义栏位
-                        {field: 'custom', title: __('Custom'), operate: false, formatter: Controller.api.formatter.custom},
-                        //browser是一个不存在的字段
-                        //通过formatter来渲染数据,同时为它添加上事件
-                        {field: 'browser', title: __('Browser'), operate: false, events: Controller.api.events.browser, formatter: Controller.api.formatter.browser},
-                        //启用时间段搜索
-                        {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD HH:mm:ss"'},
-                        //我们向操作栏额外添加上一个详情按钮,并保留已有的编辑和删除控制,同时为这个按钮添加上点击事件
-                        {field: 'operate', title: __('Operate'), events: Controller.api.events.operate, formatter: function (value, row, index) {
-                                var detail = '详情 ';
-                                return detail + Table.api.formatter.operate.call(this, value, row, index, table);
-                            }}
-                    ],
-                ],
-                //禁用默认搜索
-                search: false,
-                //启用普通表单搜索
-                commonSearch: true,
-                //可以控制是否默认显示搜索单表,false则隐藏,默认为false
-                searchFormVisible: true
-            });
-
-            //在表格内容渲染完成后回调的事件
-            table.on('post-body.bs.table', function (e, settings, json, xhr) {
-
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-
-            //指定搜索条件
-            $(document).on("click", ".btn-singlesearch", function () {
-                var options = table.bootstrapTable('getOptions');
-                options.pageNumber = 1;
-                options.queryParams = function (params) {
-                    return {
-                        search: params.search,
-                        sort: params.sort,
-                        order: params.order,
-                        filter: JSON.stringify({admin_id: 1}),
-                        op: JSON.stringify({admin_id: '='}),
-                        offset: params.offset,
-                        limit: params.limit,
-                    };
-                };
-                table.bootstrapTable('refresh', {});
-                Toastr.info("当前执行的是自定义搜索");
-                return false;
-            });
-
-            //获取选中项
-            $(document).on("click", ".btn-selected", function () {
-                Layer.alert(JSON.stringify(table.bootstrapTable('getSelections')));
-            });
-
-            //启动和暂停按钮
-            $(document).on("click", ".btn-start,.btn-pause", function () {
-                //在table外不可以使用添加.btn-change的方法
-                //只能自己调用Table.api.multi实现
-                Table.api.multi("changestatus", 0, table, this);
-            });
-
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            },
-            formatter: {//渲染的方法
-                url: function (value, row, index) {
-                    return '
                      ';
-                },
-                ip: function (value, row, index) {
-                    return ' ' + value + '';
-                },
-                browser: function (value, row, index) {
-                    //这里我们直接使用row的数据
-                    return '' + row.useragent.split(" ")[0] + '';
-                },
-                custom: function (value, row, index) {
-                    //添加上btn-change可以自定义请求的URL进行数据处理
-                    return '' + __('Locked') + '';
-                },
-                operate: function (value, row, index) {
-                    //返回字符串加上Table.api.formatter.operate的结果
-                    //默认需要按需显示排序/编辑/删除按钮,则需要在Table.api.formatter.operate将table传入
-                    //传入了table以后如果edit_url为空则不显示编辑按钮,如果del_url为空则不显显删除按钮
-                    return ' ' + __('Detail') + ' '
-                            + Table.api.formatter.operate(value, row, index, $("#table"));
-                },
-            },
-            events: {//绑定事件的方法
-                ip: {
-                    //格式为：方法名+空格+DOM元素
-                    'click .btn-ip': function (e, value, row, index) {
-                        e.stopPropagation();
-                        console.log();
-                        var container = $("#table").data("bootstrap.table").$container;
-                        var options = $("#table").bootstrapTable('getOptions');
-                        //这里我们手动将数据填充到表单然后提交
-                        $("form.form-commonsearch [name='ip']", container).val(value);
-                        $("form.form-commonsearch", container).trigger('submit');
-                        Toastr.info("执行了自定义搜索操作");
-                    }
-                },
-                browser: {
-                    'click .btn-browser': function (e, value, row, index) {
-                        e.stopPropagation();
-                        Layer.alert("该行数据为: " + JSON.stringify(row) + "");
-                    }
-                },
-                operate: $.extend({
-                    'click .btn-detail': function (e, value, row, index) {
-                        e.stopPropagation();
-                        Backend.api.open('example/bootstraptable/detail/ids/' + row['id'], __('Detail'));
-                    }
-                }, Table.api.events.operate)
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/example/colorbadge.js b/public/assets/js/backend/example/colorbadge.js
deleted file mode 100644
index 323057b1..00000000
--- a/public/assets/js/backend/example/colorbadge.js
+++ /dev/null
@@ -1,55 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'example/colorbadge/index',
-                    add_url: '',
-                    edit_url: '',
-                    del_url: 'example/colorbadge/del',
-                    multi_url: '',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'title', title: __('Title')},
-                        {field: 'ip', title: __('IP')},
-                        {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: function (value, row, index) {
-                                return Table.api.formatter.operate(value, row, index, table);
-                            }
-                        }
-                    ]
-                ],
-                onLoadSuccess: function (data) {
-                    // 在表格第次加载成功后,刷新左侧菜单栏彩色小角标,支持一次渲染多个
-                    // 如果需要在进入后台即显示左侧的彩色小角标,请使用服务端渲染方式,详情修改application/admin/controller/Index.php
-                    Backend.api.sidebar({
-                        'example/colorbadge': data.total
-                    });
-                    Toastr.info("左侧角标已经刷新成功");
-                }
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Form.api.bindevent($("form[role=form]"));
-        },
-        edit: function () {
-            Form.api.bindevent($("form[role=form]"));
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/example/controllerjump.js b/public/assets/js/backend/example/controllerjump.js
deleted file mode 100644
index 650355c7..00000000
--- a/public/assets/js/backend/example/controllerjump.js
+++ /dev/null
@@ -1,62 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'example/controllerjump/index',
-                    add_url: '',
-                    edit_url: '',
-                    del_url: 'example/controllerjump/del',
-                    multi_url: '',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'admin_id', title: __('Admin_id')},
-                        {field: 'title', title: __('Title')},
-                        {field: 'ip', title: __('IP'), formatter: Controller.api.formatter.ip},
-                        {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: function (value, row, index) {
-                                return Table.api.formatter.operate(value, row, index, table);
-                            }
-                        }
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Form.api.bindevent($("form[role=form]"));
-        },
-        edit: function () {
-            Form.api.bindevent($("form[role=form]"));
-        },
-        api: {
-            formatter: {
-                ip: function (value, row, index) {
-                    //这里手动构造URL
-                    url = "example/bootstraptable?" + this.field + "=" + value;
-
-                    //方式一,直接返回class带有addtabsit的链接,这可以方便自定义显示内容
-                    return '' + __('Search %s', value) + '';
-
-                    //方式二,直接调用Table.api.formatter.addtabs
-                    return Table.api.formatter.addtabs(value, row, index, url);
-                }
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/example/cxselect.js b/public/assets/js/backend/example/cxselect.js
deleted file mode 100644
index 355b77a0..00000000
--- a/public/assets/js/backend/example/cxselect.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            $("#cxselect-example .col-xs-12").each(function () {
-                $("textarea", this).val($(this).prev().prev().html().replace(/[ ]{2}/g, ''));
-            });
-            
-            //这里需要手动为Form绑定上元素事件
-            Form.api.bindevent($("form#cxselectform"));
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/example/multitable.js b/public/assets/js/backend/example/multitable.js
deleted file mode 100644
index e4f5431d..00000000
--- a/public/assets/js/backend/example/multitable.js
+++ /dev/null
@@ -1,86 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init();
-
-            // 表格1
-            var table1 = $("#table1").bootstrapTable({
-                url: 'general/attachment/index',
-                extend: {
-                    index_url: 'general/attachment/index',
-                    add_url: 'general/attachment/add',
-                    edit_url: 'general/attachment/edit',
-                    del_url: 'general/attachment/del',
-                    multi_url: 'general/attachment/multi',
-                    table: 'attachment',
-                },
-                toolbar: '#toolbar1',
-                sortName: 'id',
-                search: false,
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
-                        {field: 'imagewidth', title: __('Imagewidth')},
-                        {field: 'imageheight', title: __('Imageheight')},
-                        {field: 'mimetype', title: __('Mimetype')},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格1绑定事件
-            Table.api.bindevent(table1);
-
-            // 表格2
-            var table2 = $("#table2").bootstrapTable({
-                url: 'general/crontab/index',
-                extend: {
-                    index_url: 'general/crontab/index',
-                    add_url: 'general/crontab/add',
-                    edit_url: 'general/crontab/edit',
-                    del_url: 'general/crontab/del',
-                    multi_url: 'general/crontab/multi',
-                    table: 'crontab',
-                },
-                toolbar: '#toolbar2',
-                sortName: 'weigh',
-                search: false,
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'type', title: __('Type')},
-                        {field: 'title', title: __('Title')},
-                        {field: 'maximums', title: __('Maximums')},
-                        {field: 'executes', title: __('Executes')},
-                        {field: 'begintime', title: __('Begin time'), formatter: Table.api.formatter.datetime},
-                        {field: 'endtime', title: __('End time'), formatter: Table.api.formatter.datetime},
-                        {field: 'executetime', title: __('Execute time'), formatter: Table.api.formatter.datetime},
-                        {field: 'weigh', title: __('Weigh')},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格2绑定事件
-            Table.api.bindevent(table2);
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            },
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/example/relationmodel.js b/public/assets/js/backend/example/relationmodel.js
deleted file mode 100644
index 87471146..00000000
--- a/public/assets/js/backend/example/relationmodel.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'example/relationmodel/index',
-                    add_url: '',
-                    edit_url: '',
-                    del_url: 'example/relationmodel/del',
-                    multi_url: '',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID', operate: '='},
-                        {field: 'title', title: __('Title'), operate: 'LIKE %...%', placeholder: '关键字，模糊搜索'},
-                        {field: 'admin.avatar', title: __('Avatar'), operate: false, formatter: Table.api.formatter.image},
-                        {field: 'admin.username', title: __('Username'), operate: '='},
-                        {field: 'admin.nickname', title: __('Nickname'), operate: 'LIKE %...%', placeholder: '关键字，模糊搜索'},
-                        {field: 'ip', title: __('IP'), operate: '='},
-                        {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD"'},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: function (value, row, index) {
-                                return Table.api.formatter.operate(value, row, index, table);
-                            }
-                        }
-                    ]
-                ],
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Form.api.bindevent($("form[role=form]"));
-        },
-        edit: function () {
-            Form.api.bindevent($("form[role=form]"));
-        },
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/example/tabletemplate.js b/public/assets/js/backend/example/tabletemplate.js
deleted file mode 100644
index c3378d1b..00000000
--- a/public/assets/js/backend/example/tabletemplate.js
+++ /dev/null
@@ -1,128 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function ($, undefined, Backend, Table, Form, Template) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'example/tabletemplate/index',
-                    add_url: '',
-                    edit_url: '',
-                    del_url: 'example/tabletemplate/del',
-                    multi_url: '',
-                }
-            });
-
-            var table = $("#table");
-
-            Template.helper("Moment", Moment);
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                templateView: true,
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID', operate: false},
-                        //直接响应搜索
-                        {field: 'username', title: __('Username'), formatter: Table.api.formatter.search},
-                        //模糊搜索
-                        {field: 'title', title: __('Title'), operate: 'LIKE %...%', placeholder: '模糊搜索，*表示任意字符', style: 'width:200px'},
-                        //通过Ajax渲染searchList
-                        {field: 'url', title: __('Url'), align: 'left', searchList: $.getJSON('ajax/typeahead?search=a&field=row[user_id]'), formatter: Controller.api.formatter.url},
-                        //点击IP时同时执行搜索此IP,同时普通搜索使用下拉列表的形式
-                        {field: 'ip', title: __('IP'), searchList: ['127.0.0.1', '127.0.0.2'], events: Controller.api.events.ip, formatter: Controller.api.formatter.ip},
-                        //browser是一个不存在的字段
-                        //通过formatter来渲染数据,同时为它添加上事件
-                        {field: 'browser', title: __('Browser'), operate: false, events: Controller.api.events.browser, formatter: Controller.api.formatter.browser},
-                        //启用时间段搜索
-                        {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD HH:mm:ss"'},
-                        //我们向操作栏额外添加上一个详情按钮,并保留已有的编辑和删除控制,同时为这个按钮添加上点击事件
-                        {field: 'operate', title: __('Operate'), events: Controller.api.events.operate, formatter: Controller.api.formatter.operate}
-                    ],
-                ],
-                //禁用默认搜索
-                search: false,
-                //启用普通表单搜索
-                commonSearch: false,
-                //可以控制是否默认显示搜索单表,false则隐藏,默认为false
-                searchFormVisible: false,
-                //分页大小
-                pageSize: 12
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-
-            //指定搜索条件
-            $(document).on("click", ".btn-toggle-view", function () {
-                var options = table.bootstrapTable('getOptions');
-                table.bootstrapTable('refreshOptions', {templateView: !options.templateView});
-            });
-
-            //点击详情
-            $(document).on("click", ".btn-detail[data-id]", function () {
-                Backend.api.open('example/bootstraptable/detail/ids/' + $(this).data('id'), __('Detail'));
-            });
-
-            //获取选中项
-            $(document).on("click", ".btn-selected", function () {
-                //在templateView的模式下不能调用table.bootstrapTable('getSelections')来获取选中的ID,只能通过下面的Table.api.selectedids来获取
-                Layer.alert(JSON.stringify(Table.api.selectedids(table)));
-            });
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            },
-            formatter: {
-                url: function (value, row, index) {
-                    return '
                      ';
-                },
-                ip: function (value, row, index) {
-                    return ' ' + value + '';
-                },
-                browser: function (value, row, index) {
-                    //这里我们直接使用row的数据
-                    return '' + row.useragent.split(" ")[0] + '';
-                },
-                operate: function (value, row, index) {
-                    //返回字符串加上Table.api.formatter.operate的结果
-                    //默认需要按需显示排序/编辑/删除按钮,则需要在Table.api.formatter.operate将table传入
-                    //传入了table以后如果edit_url为空则不显示编辑按钮,如果del_url为空则不显显删除按钮
-                    return ' ' + __('Detail') + ' '
-                            + Table.api.formatter.operate(value, row, index, $("#table"));
-                },
-            },
-            events: {
-                ip: {
-                    'click .btn-ip': function (e, value, row, index) {
-                        var options = $("#table").bootstrapTable('getOptions');
-                        //这里我们手动将数据填充到表单然后提交
-                        $("#commonSearchContent_" + options.idTable + " form [name='ip']").val(value);
-                        $("#commonSearchContent_" + options.idTable + " form").trigger('submit');
-                        Toastr.info("执行了自定义搜索操作");
-                    }
-                },
-                browser: {
-                    'click .btn-browser': function (e, value, row, index) {
-                        Layer.alert("该行数据为: " + JSON.stringify(row) + "");
-                    }
-                },
-                operate: $.extend({
-                    'click .btn-detail': function (e, value, row, index) {
-                        Backend.api.open('example/tabletemplate/detail/ids/' + row['id'], __('Detail'));
-                    }
-                }, Table.api.events.operate)
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js
index fe88b757..8e0dfd4d 100644
--- a/public/assets/js/backend/general/attachment.js
+++ b/public/assets/js/backend/general/attachment.js
@@ -70,13 +70,9 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
                         {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), events: {
                                 'click .btn-chooseone': function (e, value, row, index) {
-                                    var callback = Backend.api.query('callback');
-                                    var id = Backend.api.query('element_id');
                                     var multiple = Backend.api.query('multiple');
                                     multiple = multiple == 'true' ? true : false;
-                                    if (id && callback) {
-                                        parent.window[callback](id, {url: row.url}, multiple);
-                                    }
+                                    Fast.api.close({url: row.url, multiple: false});
                                 },
                             }, formatter: function () {
                                 return ' ' + __('Choose') + '';
@@ -87,13 +83,13 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
 
             // 选中多个
             $(document).on("click", ".btn-choose-multi", function () {
-                var callback = Backend.api.query('callback');
-                var id = Backend.api.query('element_id');
                 var urlArr = new Array();
                 $.each(table.bootstrapTable("getAllSelections"), function (i, j) {
                     urlArr.push(j.url);
                 });
-                parent.window[callback](id, {url: urlArr.join(",")}, true);
+                var multiple = Backend.api.query('multiple');
+                multiple = multiple == 'true' ? true : false;
+                Fast.api.close({url: urlArr.join(","), multiple: true});
             });
 
             // 为表格绑定事件
diff --git a/public/assets/js/backend/general/crontab.js b/public/assets/js/backend/general/crontab.js
deleted file mode 100644
index 3bed041c..00000000
--- a/public/assets/js/backend/general/crontab.js
+++ /dev/null
@@ -1,74 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'general/crontab/index',
-                    add_url: 'general/crontab/add',
-                    edit_url: 'general/crontab/edit',
-                    del_url: 'general/crontab/del',
-                    multi_url: 'general/crontab/multi',
-                    table: 'crontab'
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'weigh',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'type_text', title: __('Type'), operate:false},
-                        {field: 'title', title: __('Title')},
-                        {field: 'maximums', title: __('Maximums')},
-                        {field: 'executes', title: __('Executes')},
-                        {field: 'begintime', title: __('Begin time'), formatter: Table.api.formatter.datetime},
-                        {field: 'endtime', title: __('End time'), formatter: Table.api.formatter.datetime},
-                        {field: 'nexttime', title: __('Next execute time'), formatter: Table.api.formatter.datetime, operate:false},
-                        {field: 'executetime', title: __('Execute time'), formatter: Table.api.formatter.datetime},
-                        {field: 'weigh', title: __('Weigh')},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                $('#schedule').on('valid.field', function (e, result) {
-                    $("#pickdays").trigger("change");
-                });
-                Form.api.bindevent($("form[role=form]"));
-                $(document).on("change", "#pickdays", function () {
-                    $("#scheduleresult").html(__('Loading'));
-                    $.post("general/crontab/get_schedule_future", {schedule: $("#schedule").val(), days:$(this).val()}, function (ret) {
-                        $("#scheduleresult").html("");
-                        if (typeof ret.futuretime !== 'undefined' && $.isArray(ret.futuretime)) {
-                            $.each(ret.futuretime, function (i, j) {
-                                $("#scheduleresult").append("
                    • " + j + "" + (i + 1) + "
                      • ");
-                            });
-                        }
-                    }, 'json');
-
-                });
-                $("#pickdays").trigger("change");
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/general/database.js b/public/assets/js/backend/general/database.js
deleted file mode 100755
index 4985913d..00000000
--- a/public/assets/js/backend/general/database.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define(['jquery', 'bootstrap', 'backend'], function ($, undefined, Backend) {
-
-    var Controller = {
-        index: function () {
-
-            //禁止在操作select元素时关闭dropdown的关闭事件
-            $("#database").on('click', '.dropdown-menu input, .dropdown-menu label, .dropdown-menu select', function (e) {
-                e.stopPropagation();
-            });
-
-            //提交时检查是否有删除或清空操作
-            $("#database").on("submit", "#sqlexecute", function () {
-                var v = $("#sqlquery").val().toLowerCase();
-                if ((v.indexOf("delete ") >= 0 || v.indexOf("truncate ") >= 0) && !confirm(__('Are you sure you want to delete or turncate?'))) {
-                    return false;
-                }
-            });
-
-            //事件按钮操作
-            $("#database").on("click", "ul#subaction li input", function () {
-                $("#topaction").val($(this).attr("rel"));
-                return true;
-            });
-
-            //窗口变更的时候重设结果栏高度
-            $(window).on("resize", function () {
-                $("#database .well").height($(window).height() - $("#database #sqlexecute").height() - $("#ribbon").outerHeight() - $(".panel-heading").outerHeight() - 130);
-            });
-
-            //修复iOS下iframe无法滚动的BUG
-            if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-                $("#resultparent").css({"-webkit-overflow-scrolling": "touch", "overflow": "auto"});
-            }
-
-            $(window).resize();
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/general/profile.js b/public/assets/js/backend/general/profile.js
index b957a92e..6375e482 100755
--- a/public/assets/js/backend/general/profile.js
+++ b/public/assets/js/backend/general/profile.js
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload'], function (
             // 为表格绑定事件
             Table.api.bindevent(table);//当内容渲染完成后
 
-            Form.api.bindevent($("#update-form"), null, function () {
+            Form.api.bindevent($("#update-form"), function () {
                 $("input[name='row[password]']").val('');
                 var url = Backend.api.cdnurl($("#c-avatar").val());
                 top.window.$(".user-panel .image img,.user-menu > a > img,.user-header > img").prop("src", url);
diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js
index 39fc7ae6..6bafb087 100755
--- a/public/assets/js/backend/index.js
+++ b/public/assets/js/backend/index.js
@@ -56,15 +56,9 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
                 Backend.api.addtabs($(this).data("url"));
             });
 
-            //此处为FastAdmin的统计代码,正式使用请移除
-            var s = document.createElement("script");
-            s.type = "text/javascript";
-            s.src = "https://hm.baidu.com/hm.js?58347d769d009bcf6074e9a0ab7ba05e";
-            $("head").append(s);
-
             //读取FastAdmin的更新信息
             $.ajax({
-                url: 'http://demo.fastadmin.net/index/index/news',
+                url: Config.fastadmin.api_url + '/news/index',
                 type: 'post',
                 dataType: 'jsonp',
                 success: function (ret) {
@@ -77,57 +71,51 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
                 }
             });
 
-            //读取FastAdmin的Commits信息
-            $.ajax({
-                url: 'https://api.github.com/repos/karsonzhang/fastadmin/commits?state=open&per_page=10&page=1&sort=updated',
-                type: 'get',
-                dataType: 'jsonp',
-                success: function (ret) {
-                    $(".github-commits > a span").text(ret.data.length);
-                    $(".github-commits .footer a").attr("href", "https://github.com/karsonzhang/fastadmin/commits/master");
+            //版本检测
+            var checkupdate = function (ignoreversion, tips = false) {
+                $.ajax({
+                    url: Config.fastadmin.api_url + '/version/check',
+                    type: 'post',
+                    data: {version: Config.fastadmin.version},
+                    dataType: 'jsonp',
+                    success: function (ret) {
+                        if (ret.data && ignoreversion !== ret.data.newversion) {
+                            Layer.open({
+                                title: '发现新版本',
+                                area: ["500px", "auto"],
+                                content: '
                      你的版本是:' + ret.data.version + '，新版本:' + ret.data.newversion + '
                      更新说明
                      ' + ret.data.upgradetext,
+                                btn: ['去下载更新', '忽略此次更新', '不再提示'],
+                                btn2: function (index, layero) {
+                                    localStorage.setItem("ignoreversion", ret.data.newversion);
+                                },
+                                btn3: function (index, layero) {
+                                    localStorage.setItem("ignoreversion", "*");
+                                },
+                                success: function (layero, index) {
+                                    $(".layui-layer-btn0", layero).attr("href", ret.data.downloadurl).attr("target", "_blank");
+                                }
+                            });
+                        } else {
+                            if (tips) {
+                                Toastr.success("当前已经是最新版本");
+                            }
+                        }
+                    }, error: function (e) {
+                        if (tips) {
+                            Toastr.error("发生未知错误:" + e.message);
+                        }
+                    }
+                });
+            }
 
-                    var dateDiff = function (hisTime, nowTime) {
-                        if (!arguments.length)
-                            return '';
-                        var arg = arguments,
-                                now = arg[1] ? arg[1] : new Date().getTime(),
-                                diffValue = now - arg[0],
-                                result = '',
-                                minute = 1000 * 60,
-                                hour = minute * 60,
-                                day = hour * 24,
-                                halfamonth = day * 15,
-                                month = day * 30,
-                                year = month * 12,
-                                _year = diffValue / year,
-                                _month = diffValue / month,
-                                _week = diffValue / (7 * day),
-                                _day = diffValue / day,
-                                _hour = diffValue / hour,
-                                _min = diffValue / minute;
-
-                        if (_year >= 1)
-                            result = parseInt(_year) + "年前";
-                        else if (_month >= 1)
-                            result = parseInt(_month) + "个月前";
-                        else if (_week >= 1)
-                            result = parseInt(_week) + "周前";
-                        else if (_day >= 1)
-                            result = parseInt(_day) + "天前";
-                        else if (_hour >= 1)
-                            result = parseInt(_hour) + "个小时前";
-                        else if (_min >= 1)
-                            result = parseInt(_min) + "分钟前";
-                        else
-                            result = "刚刚";
-                        return result;
-                    };
-                    $.each(ret.data, function (i, j) {
-                        var author = j.author ? j.author : {html_url: "https://github.com/karsonzhang", avatar_url: "/assets/img/avatar.png", login: "Anonymous"};
-                        var item = '
                    • ' + author.login + '
                      ' + author.login + ' ' + dateDiff(new Date(j.commit.committer.date).getTime()) + '
                      ' + j.commit.message + '
                      • ';
-                        $(item).appendTo($(".github-commits ul.menu"));
-                    });
-                }
+            //读取版本检测信息
+            var ignoreversion = localStorage.getItem("ignoreversion");
+            if (ignoreversion !== "*") {
+                checkupdate(ignoreversion);
+            }
+            //手动检测版本信息
+            $("a[data-toggle='checkupdate']").on('click', function () {
+                checkupdate('', true);
             });
 
             //切换左侧sidebar显示隐藏
@@ -219,7 +207,6 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
                 "skin-purple-light",
                 "skin-green-light"
             ];
-
             setup();
 
             /**
@@ -394,7 +381,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
             });
 
             //为表单绑定事件
-            Form.api.bindevent($("#login-form"), null, function (data) {
+            Form.api.bindevent($("#login-form"), function (data) {
                 localStorage.setItem("lastlogin", JSON.stringify({id: data.id, username: data.username, avatar: data.avatar}));
                 location.href = Backend.api.fixurl(data.url);
             });
diff --git a/public/assets/js/backend/page.js b/public/assets/js/backend/page.js
deleted file mode 100644
index 4b45f7b9..00000000
--- a/public/assets/js/backend/page.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'page/index',
-                    add_url: 'page/add',
-                    edit_url: 'page/edit',
-                    del_url: 'page/del',
-                    multi_url: 'page/multi',
-                    table: 'page',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'weigh',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true},
-                        {field: 'id', title: __('Id'), operate: false},
-                        {field: 'category_id', title: __('Category_id'), operate: '='},
-                        {field: 'category.name', title: __('Category'), operate: '='},
-                        {field: 'title', title: __('Title'), operate: 'LIKE %...%', placeholder: '关键字，模糊搜索'},
-                        {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag, operate: false},
-                        {field: 'image', title: __('Image'), formatter: Table.api.formatter.image, operate: false},
-                        {field: 'views', title: __('Views'), operate: false},
-                        {field: 'comments', title: __('Comments'), operate: false},
-                        {field: 'weigh', title: __('Weigh'), operate: false},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {'normal': __('Normal'), 'hidden': __('Hidden')}, style: 'min-width:100px;'},
-                        {field: 'createtime', title: __('Create Time'), formatter: Table.api.formatter.datetime, operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD"'},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ],
-                //普通搜索
-                commonSearch: true,
-                titleForm: '', //为空则不显示标题，不定义默认显示：普通搜索
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/user/third.js b/public/assets/js/backend/user/third.js
deleted file mode 100644
index 156111c8..00000000
--- a/public/assets/js/backend/user/third.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefined, Backend, Form, Table) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'user_third/index',
-                    add_url: 'user_third/add',
-                    edit_url: 'user_third/edit',
-                    del_url: 'user_third/del',
-                    multi_url: 'user_third/multi',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'id',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: __('Id')},
-                        {field: 'user_id', title: __('User_id')},
-                        {field: 'platform', title: __('Platform')},
-                        {field: 'openid', title: __('Openid')},
-                        {field: 'openname', title: __('Openname')},
-                        {field: 'expires_in', title: __('Expires_in')},
-                        {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime},
-                        {field: 'logintime', title: __('Logintime'), formatter: Table.api.formatter.datetime},
-                        {field: 'expiretime', title: __('Expiretime'), formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            }
-        }
-
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/user/user.js b/public/assets/js/backend/user/user.js
deleted file mode 100644
index fa85ec39..00000000
--- a/public/assets/js/backend/user/user.js
+++ /dev/null
@@ -1,65 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefined, Backend, Form, Table) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'user_user/index',
-                    add_url: 'user_user/add',
-                    edit_url: 'user_user/edit',
-                    del_url: 'user_user/del',
-                    multi_url: 'user_user/multi',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'id',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: __('Id')},
-                        {field: 'partner_id', title: __('Partner_id')},
-                        {field: 'role_id', title: __('Role_id')},
-                        {field: 'area_id', title: __('Area_id')},
-                        {field: 'editor_id', title: __('Editor_id')},
-                        {field: 'level', title: __('Level')},
-                        {field: 'star', title: __('Star')},
-                        {field: 'username', title: __('Username')},
-                        {field: 'nickname', title: __('Nickname')},
-                        {field: 'email', title: __('Email')},
-                        {field: 'mobile', title: __('Mobile')},
-                        {field: 'avatar', title: __('Avatar'), formatter: Table.api.formatter.image},
-                        {field: 'gender', title: __('Gender')},
-                        {field: 'birthday', title: __('Birthday')},
-                        {field: 'score', title: __('Score')},
-                        {field: 'prevtime', title: __('Prevtime'), formatter: Table.api.formatter.datetime},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            }
-        }
-
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/version.js b/public/assets/js/backend/version.js
deleted file mode 100644
index 98aa8dd2..00000000
--- a/public/assets/js/backend/version.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'version/index',
-                    add_url: 'version/add',
-                    edit_url: 'version/edit',
-                    del_url: 'version/del',
-                    multi_url: 'version/multi',
-                    table: 'version',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'weigh',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'oldversion', title: __('Oldversion')},
-                        {field: 'newversion', title: __('Newversion')},
-                        {field: 'packagesize', title: __('Packagesize')},
-                        {field: 'content', title: __('Content')},
-                        {field: 'downloadurl', title: __('Downloadurl'), formatter: Table.api.formatter.url},
-                        {field: 'enforce', title: __('Enforce')},
-                        {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime},
-                        {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime},
-                        {field: 'weigh', title: __('Weigh')},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/wechat/autoreply.js b/public/assets/js/backend/wechat/autoreply.js
deleted file mode 100644
index 88ff6a05..00000000
--- a/public/assets/js/backend/wechat/autoreply.js
+++ /dev/null
@@ -1,77 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefined, Backend, Form, Table) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'wechat/autoreply/index',
-                    add_url: 'wechat/autoreply/add',
-                    edit_url: 'wechat/autoreply/edit',
-                    del_url: 'wechat/autoreply/del',
-                    multi_url: 'wechat/autoreply/multi',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'id',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: __('Id')},
-                        {field: 'title', title: __('Title')},
-                        {field: 'text', title: __('Text')},
-                        {field: 'eventkey', title: __('Event key')},
-                        {field: 'remark', title: __('Remark')},
-                        {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime},
-                        {field: 'updatetime', title: __('Update time'), formatter: Table.api.formatter.datetime},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-
-                $(document).on('click', "#select-resources", function () {
-                    var key = $("input[name='row[eventkey]']").val();
-                    Backend.api.open($(this).attr("href") + "?callback=refreshkey&key=" + key, __('Select'), {area: ['90%', '90%']});
-                    return false;
-                });
-
-                $(document).on('click', "#add-resources", function () {
-                    Backend.api.open($(this).attr("href") + "?callback=refreshkey&key=", __('Add'), {area: ['90%', '90%']});
-                    return false;
-                });
-                window.refreshkey = function (data) {
-                    $("input[name='row[eventkey]']").val(data.eventkey).trigger("change");
-                    layer.closeAll();
-                    var keytitle = data.title;
-                    var cont = $(".clickbox .create-click:first");
-                    $(".keytitle", cont).remove();
-                    if (keytitle) {
-                        cont.append('
                      资源名:' + keytitle + '
                      ');
-                    }
-                };
-            }
-        }
-
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/wechat/config.js b/public/assets/js/backend/wechat/config.js
deleted file mode 100644
index 7f6e223b..00000000
--- a/public/assets/js/backend/wechat/config.js
+++ /dev/null
@@ -1,97 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'wechat/config/index',
-                    add_url: 'wechat/config/add',
-                    edit_url: 'wechat/config/edit',
-                    del_url: 'wechat/config/del',
-                    multi_url: 'wechat/config/multi',
-                    table: 'wechat_config',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                pk: 'id',
-                sortName: 'id',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'name', title: __('Name')},
-                        {field: 'title', title: __('Title')},
-                        {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime},
-                        {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
-                $(document).on('click', ".btn-jsoneditor", function () {
-                    $("#c-value").toggle();
-                    $(".fieldlist").toggleClass("hide");
-                    $(".btn-insertlink").toggle();
-                    $("input[name='row[mode]']").val($("#c-value").is(":visible") ? "textarea" : "json");
-                });
-                $(document).on('click', ".btn-insertlink", function () {
-                    var textarea = $("textarea[name='row[value]']");
-                    var cursorPos = textarea.prop('selectionStart');
-                    var v = textarea.val();
-                    var textBefore = v.substring(0, cursorPos);
-                    var textAfter = v.substring(cursorPos, v.length);
-
-                    Layer.prompt({title: '请输入显示的文字', formType: 3}, function (text, index) {
-                        Layer.close(index);
-                        Layer.prompt({title: '请输入跳转的链接URL(包含http)', formType: 3}, function (link, index) {
-                            text = text == '' ? link : text;
-                            textarea.val(textBefore + '' + text + '' + textAfter);
-                            Layer.close(index);
-                        });
-                    });
-                });
-                $("input[name='row[type]']:checked").trigger("click");
-
-                $(document).on("click", ".fieldlist .append", function () {
-                    var rel = parseInt($(this).closest("dl").attr("rel")) + 1;
-                    $(this).closest("dl").attr("rel", rel);
-                    $('
                         
                      ').insertBefore($(this).parent());
-                });
-                $(document).on("click", ".fieldlist dd .btn-remove", function () {
-                    $(this).parent().remove();
-                });
-                //拖拽排序
-                require(['dragsort'], function () {
-                    //绑定拖动排序
-                    $("dl.fieldlist").dragsort({
-                        itemSelector: 'dd',
-                        dragSelector: ".btn-dragsort",
-                        dragEnd: function () {
-
-                        },
-                        placeHolderTemplate: "
                      "
-                    });
-                });
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/wechat/menu.js b/public/assets/js/backend/wechat/menu.js
deleted file mode 100644
index 42779120..00000000
--- a/public/assets/js/backend/wechat/menu.js
+++ /dev/null
@@ -1,289 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'sortable'], function ($, undefined, Backend, Table, Form, Sortable) {
-    var Controller = {
-        index: function () {
-            String.prototype.subByte = function (start, bytes) {
-                for (var i = start; bytes > 0; i++) {
-                    var code = this.charCodeAt(i);
-                    bytes -= code < 256 ? 1 : 2;
-                }
-                return this.slice(start, i + bytes)
-            };
-            var init_menu = function (menu) {
-                var str = "";
-                var items = menu;
-                var type = action = "";
-                for (i in items) {
-                    if (items[i]['sub_button'] != undefined) {
-                        type = action = "";
-                    } else {
-                        type = items[i]['type'];
-                        if (items[i]['url'] != undefined)
-                            action = "url|" + items[i]['url'];
-                        if (items[i]['key'] != undefined)
-                            action = "key|" + items[i]['key'];
-                    }
-                    str += '';
-                        }
-                    }
-                    str += '
                       
                        ' + tem + '
                        •  
                        
                      ';
-                    str += '';
-                }
-                $("#add-item").before(str);
-            };
-            var refresh_type = function () {
-                if ($('input[name=type]:checked').val() == 'view') {
-                    $(".is-view").show();
-                    $(".is-click").hide();
-                } else {
-                    $(".is-view").hide();
-                    $(".is-click").show();
-                }
-            };
-            //初始化菜单
-            init_menu(menu);
-            //拖动排序
-            new Sortable($("#menu-list")[0], {draggable: 'li.menu-item'});
-            $(".sub-menu-list").each(function () {
-                new Sortable(this, {draggable: 'li.sub-menu-item'});
-            });
-            //添加主菜单
-            $(document).on('click', '#add-item', function () {
-                var menu_item_total = $(".menu-item").size();
-                if (menu_item_total < 3) {
-                    var item = '
                    •     添加菜单  
                       
                        •  
                         
                      • ';
-                    var itemDom = $(item);
-                    itemDom.insertBefore(this);
-                    itemDom.trigger("click");
-                    $(".sub-menu-box", itemDom).show();
-                    new Sortable($(".sub-menu-list", itemDom)[0], {draggable: 'li.sub-menu-item'});
-                }
-            });
-            $(document).on('change', 'input[name=type]', function () {
-                refresh_type();
-            });
-            $(document).on('click', '#item_delete', function () {
-                var current = $("#menu-list li.current");
-                var prev = current.prev("li[data-type]");
-                var next = current.next("li[data-type]");
-
-                if (prev.size() == 0 && next.size() == 0 && $(".sub-menu-box", current).size() == 0) {
-                    last = current.closest(".menu-item");
-                } else if (prev.size() > 0 || next.size() > 0) {
-                    last = prev.size() > 0 ? prev : next;
-                } else {
-                    last = null;
-                    $(".weixin-content").hide();
-                    $(".no-weixin-content").show();
-                }
-                $("#menu-list li.current").remove();
-                if (last) {
-                    last.trigger('click');
-                } else {
-                    $("input[name='item-title']").val('');
-                }
-                updateChangeMenu();
-            });
-
-            //更新修改与变动
-            var updateChangeMenu = function () {
-                var title = $("input[name='item-title']").val();
-                var type = $("input[name='type']:checked").val();
-                var key = value = '';
-                if (type == 'view') {
-                    key = 'url';
-                } else {
-                    key = 'key';
-                }
-                value = $("input[name='" + key + "']").val();
-
-                if (key == 'key') {
-                    var keytitle = typeof responselist[value] != 'undefined' ? responselist[value] : '';
-                    var cont = $(".is-click .create-click:first");
-                    $(".keytitle", cont).remove();
-                    cont.append('
                      资源名:' + keytitle + '
                      ');
-                }
-                var currentItem = $("#menu-list li.current");
-                if (currentItem.size() > 0) {
-                    currentItem.attr('data-type', type);
-                    currentItem.attr('data-action', key + "|" + value);
-                    if (currentItem.siblings().size() == 4) {
-                        $(".add-sub-item").show();
-                    } else if (false) {
-
-                    }
-                    currentItem.children("a").find("span").text(title.subByte(0, 16));
-                    $("input[name='item-title']").val(title);
-                    currentItem.attr('data-name', title);
-                    $('#current-item-name').text(title);
-                }
-                menuUpdate();
-            }
-            //更新菜单数据
-            var menuUpdate = function () {
-                $.post("wechat/menu/edit", {menu: JSON.stringify(getMenuList())}, function (data) {
-                    if (data['code'] == 1) {
-                    } else {
-                        Toastr.error(__('Operation failed'));
-                    }
-                }, 'json');
-            };
-            //获取菜单数据
-            var getMenuList = function () {
-                var menus = new Array();
-                var sub_button = new Array();
-                var menu_i = 0;
-                var sub_menu_i = 0;
-                var item;
-                $("#menu-list li").each(function (i) {
-                    item = $(this);
-                    var name = item.attr('data-name');
-                    var type = item.attr('data-type');
-                    var action = item.attr('data-action');
-                    if (name != null) {
-                        actions = action.split('|');
-                        if (item.hasClass('menu-item')) {
-                            sub_menu_i = 0;
-                            if (item.find('.sub-menu-item').size() > 0) {
-                                menus[menu_i] = {"name": name, "sub_button": "sub_button"}
-                            } else {
-                                if (actions[0] == 'url')
-                                    menus[menu_i] = {"name": name, "type": type, "url": actions[1]};
-                                else
-                                    menus[menu_i] = {"name": name, "type": type, "key": actions[1]};
-                            }
-                            if (menu_i > 0) {
-                                if (menus[menu_i - 1]['sub_button'] == "sub_button")
-                                    menus[menu_i - 1]['sub_button'] = sub_button;
-                                else
-                                    menus[menu_i - 1]['sub_button'];
-                            }
-                            sub_button = new Array();
-                            menu_i++;
-                        } else {
-                            if (actions[0] == 'url')
-                                sub_button[sub_menu_i++] = {"name": name, "type": type, "url": actions[1]};
-                            else
-                                sub_button[sub_menu_i++] = {"name": name, "type": type, "key": actions[1]};
-                        }
-                    }
-                });
-                if (sub_button.length > 0) {
-                    var len = menus.length;
-                    menus[len - 1]['sub_button'] = sub_button;
-                }
-                return menus;
-            }
-            //添加子菜单
-            $(document).on('click', ".add-sub-item", function () {
-                var sub_menu_item_total = $(this).parent().find(".sub-menu-item").size();
-                if (sub_menu_item_total < 5) {
-                    var item = '
                    • 添加子菜单
                      • ';
-                    var itemDom = $(item);
-                    itemDom.insertBefore(this);
-                    itemDom.trigger("click");
-                    if (sub_menu_item_total == 4) {
-                        $(this).hide();
-                    }
-                }
-                return false;
-            });
-            //主菜单子菜单点击事件
-            $(document).on('click', ".menu-item, .sub-menu-item", function () {
-                if ($(this).hasClass("sub-menu-item")) {
-                    $("#menu-list li").removeClass('current');
-                    $(".is-item").show();
-                    $(".is-sub-item").show();
-                } else {
-                    $("#menu-list li").removeClass('current');
-                    $("#menu-list > li").not(this).find(".sub-menu-box").hide();
-                    $(".sub-menu-box", this).toggle();
-                    //如果当前还没有子菜单
-                    if ($(".sub-menu-item", this).size() == 0) {
-                        $(".is-item").show();
-                        $(".is-sub-item").show();
-                    } else {
-                        $(".is-item").hide();
-                        $(".is-sub-item").hide();
-                    }
-                }
-                $(this).addClass('current');
-                var type = $(this).attr('data-type');
-                var action = $(this).attr('data-action');
-                var title = $(this).attr('data-name');
-
-                actions = action.split('|');
-                $("input[name=type][value='" + type + "']").prop("checked", true);
-                $("input[name='item-title']").val(title);
-                $('#current-item-name').text(title);
-                if (actions[0] == 'url') {
-                    $('input[name=key]').val('');
-                } else {
-                    $('input[name=url]').val('');
-                }
-                $("input[name='" + actions[0] + "']").val(actions[1]);
-                if (actions[0] == 'key') {
-                    var keytitle = typeof responselist[actions[1]] != 'undefined' ? responselist[actions[1]] : '';
-                    var cont = $(".is-click .create-click:first");
-                    $(".keytitle", cont).remove();
-                    if (keytitle) {
-                        cont.append('
                      资源名:' + keytitle + '
                      ');
-                    }
-                } else {
-
-                }
-
-                $(".weixin-content").show();
-                $(".no-weixin-content").hide();
-
-                refresh_type();
-
-                return false;
-            });
-            $("form").on('change', "input,textarea", function () {
-                updateChangeMenu();
-            });
-            $(document).on('click', "#menuSyn", function () {
-                $.post("wechat/menu/sync", {}, function (ret) {
-                    var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
-                    if (ret.code == 1) {
-                        Backend.api.toastr.success('菜单同步更新成功，生效时间看微信官网说明，或者你重新关注微信号！');
-                    } else {
-                        Backend.api.toastr.error(msg ? msg : __('Operation failed'));
-                    }
-                }, 'json');
-            });
-            $(document).on('click', "#select-resources", function () {
-                var key = $("#key").val();
-                Backend.api.open($(this).attr("href") + "?callback=refreshkey&key=" + key, __('Select'));
-                return false;
-            });
-
-            $(document).on('click', "#add-resources", function () {
-                Backend.api.open($(this).attr("href") + "?callback=refreshkey&key=" + key, __('Add'));
-                return false;
-            });
-            window.refreshkey = function (data) {
-                responselist[data.eventkey] = data.title;
-                $("input[name=key]").val(data.eventkey).trigger("change");
-                layer.closeAll();
-            };
-        },
-        add: function () {
-            Form.api.bindevent($("form[role=form]"));
-        },
-        edit: function () {
-            Form.api.bindevent($("form[role=form]"));
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/backend/wechat/response.js b/public/assets/js/backend/wechat/response.js
deleted file mode 100644
index ab5ed776..00000000
--- a/public/assets/js/backend/wechat/response.js
+++ /dev/null
@@ -1,187 +0,0 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
-
-    var Controller = {
-        index: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'wechat/response/index',
-                    add_url: 'wechat/response/add',
-                    edit_url: 'wechat/response/edit',
-                    del_url: 'wechat/response/del',
-                    multi_url: 'wechat/response/multi',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'id',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'type', title: __('Type')},
-                        {field: 'title', title: __('Resource title')},
-                        {field: 'eventkey', title: __('Event key')},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, operate:false},
-                        {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        select: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    index_url: 'wechat/response/index',
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.index_url,
-                sortName: 'id',
-                columns: [
-                    [
-                        {field: 'state', checkbox: true, },
-                        {field: 'id', title: 'ID'},
-                        {field: 'type', title: __('Type')},
-                        {field: 'title', title: __('Title')},
-                        {field: 'event', title: __('Event')},
-                        {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, operate:false},
-                        {field: 'operate', title: __('Operate'), events: {
-                                'click .btn-chooseone': function (e, value, row, index) {
-                                    var callback = Backend.api.query('callback');
-                                    if (callback) {
-                                        parent.window[callback](row);
-                                    }
-                                },
-                            }, formatter: function () {
-                                return ' ' + __('Choose') + '';
-                            }}
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-        add: function () {
-            Form.api.bindevent($("form[role=form]"), null, function (ret) {
-                var callback = Backend.api.query('callback');
-                if (callback) {
-                    parent.window[callback](ret);
-                } else {
-                    parent.$(".btn-refresh").trigger("click");
-                    var index = parent.Layer.getFrameIndex(window.name);
-                    parent.Layer.close(index);
-                }
-            });
-            Controller.api.bindevent();
-        },
-        edit: function () {
-            Form.api.bindevent($("form[role=form]"));
-            Controller.api.bindevent();
-        },
-        api: {
-            bindevent: function () {
-                var getAppFileds = function (app) {
-                    var app = apps[app];
-                    var appConfig = app['config'];
-                    var str = '';
-                    for (i in appConfig) {
-                        if (appConfig[i]['type'] == 'text' || appConfig[i]['type'] == 'textarea') {
-                            var pattern_str = 'pattern ="required" ';
-                            var alt = '';
-                            if (undefined != appConfig[i]['alt'])
-                                alt = appConfig[i]['alt'];
-                            if (undefined != appConfig[i]['pattern'])
-                                pattern_str = 'pattern ="' + appConfig[i]['pattern'] + '" ';
-                            if (appConfig[i]['type'] == 'textarea') {
-                                str += '
                       
                       
                      ';
-                            } else {
-                                str += '
                       
                       
                      ';
-                            }
-                        } else {
-                            var options = appConfig[i]['options'];
-                            options = options.split(',');
-                            var option_str = '';
-                            if (appConfig[i]['type'] == 'select') {
-                                for (o in options) {
-                                    var option = options[o];
-                                    var item = option.split(':');
-                                    option_str += '';
-                                }
-                                option_str = '';
-                            } else if (appConfig[i]['type'] == 'checkbox') {
-                                for (o in options) {
-                                    var option = options[o];
-                                    var item = option.split(':');
-                                    option_str += '  ';
-                                }
-
-                            } else if (appConfig[i]['type'] == 'radio') {
-                                for (o in options) {
-                                    var option = options[o];
-                                    var item = option.split(':');
-                                    option_str += '  ';
-                                }
-                            }
-                            str += '
                      ' + option_str + ' 
                       
                      ';
-                        }
-
-                    }
-                    return str;
-                };
-                $(document).on('change', "#app", function () {
-                    var app = $(this).val();
-                    $("#appfields").html(getAppFileds(app));
-                    if (datas.app == app) {
-                        delete(datas.app);
-                        var form = $("form.form-ajax");
-                        $.each(datas, function (i, j) {
-                            form.field("row[content][" + i + "]" + ($("input[name='row[content][" + i + "][]']", form).size() > 0 ? '[]' : ''), j);
-                        });
-                    }
-                });
-                $(document).on('click', "input[name='row[type]']", function () {
-                    var type = $(this).val();
-                    if (type == 'text') {
-                        $("#expand").html('
                       插入链接
                      ');
-                        $("form.form-ajax").field("row[content][content]", datas.content);
-                    } else if (type == 'app') {
-                        $("#expand").html('
                      ');
-                        $("form.form-ajax").field("row[content][app]", datas.app);
-                        $("#app").trigger('change');
-                    }
-                });
-                $(document).on('click', ".btn-insertlink", function () {
-                    var textarea = $("textarea[name='row[content][content]']");
-                    var cursorPos = textarea.prop('selectionStart');
-                    var v = textarea.val();
-                    var textBefore = v.substring(0, cursorPos);
-                    var textAfter = v.substring(cursorPos, v.length);
-
-                    Layer.prompt({title: '请输入显示的文字', formType: 3}, function (text, index) {
-                        Layer.close(index);
-                        Layer.prompt({title: '请输入跳转的链接URL(包含http)', formType: 3}, function (link, index) {
-                            text = text == '' ? link : text;
-                            textarea.val(textBefore + '' + text + '' + textAfter);
-                            Layer.close(index);
-                        });
-                    });
-                });
-                $("input[name='row[type]']:checked").trigger("click");
-            }
-        }
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js
index 4c476616..aa37cc6e 100644
--- a/public/assets/js/fast.js
+++ b/public/assets/js/fast.js
@@ -20,42 +20,64 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                 "hideMethod": "fadeOut"
             }
         },
+        events: {
+            //请求成功的回调
+            onAjaxSuccess: function (ret, onAjaxSuccess) {
+                var data = typeof ret.data !== 'undefined' ? ret.data : null;
+                var msg = typeof ret.msg !== 'undefined' && ret.msg ? ret.msg : __('Operation completed');
+
+                if (typeof onAjaxSuccess === 'function') {
+                    var result = onAjaxSuccess.call(this, data, ret);
+                    if (result === false)
+                        return;
+                }
+                Toastr.success(msg);
+            },
+            //请求错误的回调
+            onAjaxError: function (ret, onAjaxError) {
+                var data = typeof ret.data !== 'undefined' ? ret.data : null;
+                if (typeof onAjaxError === 'function') {
+                    var result = onAjaxError.call(this, data, ret);
+                    if (result === false) {
+                        return;
+                    }
+                }
+                Toastr.error(ret.msg + "(code:" + ret.code + ")");
+            },
+            //服务器响应数据后
+            onAjaxResponse: function (response) {
+                try {
+                    var ret = typeof response === 'object' ? response : JSON.parse(response);
+                    if (!ret.hasOwnProperty('code')) {
+                        $.extend(ret, {code: -2, msg: response, data: null});
+                    }
+                } catch (e) {
+                    var ret = {code: -1, msg: e.message, data: null};
+                }
+                return ret;
+            }
+        },
         api: {
             //发送Ajax请求
-            ajax: function (options, success, failure) {
-                options = typeof options == 'string' ? {url: options} : options;
+            ajax: function (options, success, error) {
+                options = typeof options === 'string' ? {url: options} : options;
                 var index = Layer.load();
                 options = $.extend({
                     type: "POST",
-                    dataType: 'json',
+                    dataType: "json",
                     success: function (ret) {
                         Layer.close(index);
-                        if (ret.hasOwnProperty("code")) {
-                            var data = ret.hasOwnProperty("data") && ret.data != "" ? ret.data : null;
-                            var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
-                            if (ret.code === 1) {
-                                if (typeof success == 'function') {
-                                    var onAfterResult = success.call(undefined, data);
-                                    if (!onAfterResult) {
-                                        return false;
-                                    }
-                                }
-                                Toastr.success(msg ? msg : __('Operation completed'));
-                            } else {
-                                Toastr.error(msg ? msg : __('Operation failed'));
-                            }
+                        ret = Fast.events.onAjaxResponse(ret);
+                        if (ret.code === 1) {
+                            Fast.events.onAjaxSuccess(ret, success);
                         } else {
-                            Toastr.error(__('Unknown data format'));
+                            Fast.events.onAjaxError(ret, error);
                         }
-                    }, error: function () {
+                    },
+                    error: function (err) {
                         Layer.close(index);
-                        if (typeof failure == 'function') {
-                            var onAfterResult = failure.call(undefined, data);
-                            if (!onAfterResult) {
-                                return false;
-                            }
-                        }
-                        Toastr.error(__('Network error'));
+                        var ret = {code: err.code, msg: err.message, data: null};
+                        Fast.events.onAjaxError(ret, error);
                     }
                 }, options);
                 $.ajax(options);
@@ -88,44 +110,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                     return '';
                 return decodeURIComponent(results[2].replace(/\+/g, " "));
             },
-            //上传文件
-            upload: function (file, callback) {
-                var data = new FormData();
-                data.append("file", file);
-                $.ajax({
-                    url: "ajax/upload",
-                    data: data,
-                    cache: false,
-                    contentType: false,
-                    processData: false,
-                    type: 'POST',
-                    dataType: 'json',
-                    success: function (ret) {
-                        if (ret.hasOwnProperty("code")) {
-                            var data = ret.hasOwnProperty("data") && ret.data != "" ? ret.data : null;
-                            var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
-                            if (ret.code === 1) {
-                                if (typeof callback == 'function') {
-                                    var onAfterResult = success.call(undefined, data);
-                                    if (!onAfterResult) {
-                                        return false;
-                                    }
-                                }
-                                if ($('.summernote').size() > 0 && data && typeof data.url !== 'undefined') {
-                                    $('.summernote').summernote("insertImage", data.url, 'filename');
-                                }
-                                Toastr.success(__('Operation completed'));
-                            } else {
-                                Toastr.error(msg ? msg : __('Operation failed'));
-                            }
-                        } else {
-                            Toastr.error(__('Unknown data format'));
-                        }
-                    }, error: function () {
-                        Toastr.error(__('Network error'));
-                    }
-                });
-            },
+            //打开一个弹出窗口
             open: function (url, title, options) {
                 title = title ? title : "";
                 url = Fast.api.fixurl(url);
@@ -144,6 +129,8 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                     skin: 'layui-layer-noborder',
                     success: function (layero, index) {
                         var that = this;
+                        //存储callback事件
+                        $(layero).data("callback", that.callback);
                         //$(layero).removeClass("layui-layer-border");
                         Layer.setTop(layero);
                         var frame = Layer.getChildFrame('html', index);
@@ -174,6 +161,17 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                 }, options ? options : {}));
                 return false;
             },
+            //关闭窗口并回传数据
+            close: function (data) {
+                var index = parent.Layer.getFrameIndex(window.name);
+                var callback = parent.$("#layui-layer" + index).data("callback");
+                //再执行关闭
+                parent.Layer.close(index);
+                //再调用回传函数
+                if (typeof callback === 'function') {
+                    callback.call(undefined, data);
+                }
+            },
             layerfooter: function (layero, index, that) {
                 var frame = Layer.getChildFrame('html', index);
                 var layerfooter = frame.find(".layer-footer");
diff --git a/public/assets/js/frontend/demo.js b/public/assets/js/frontend/demo.js
deleted file mode 100644
index c3ed5ea6..00000000
--- a/public/assets/js/frontend/demo.js
+++ /dev/null
@@ -1,152 +0,0 @@
-define(['jquery', 'bootstrap', 'frontend'], function ($, undefined, Frontend) {
-
-    var Controller = {
-        qrcode: function () {
-            $("form").submit(function () {
-                $("#qrcodeimg").prop("src", Config.moduleurl + "/demo/qrcode?" + $(this).serialize());
-                return false;
-            });
-            $("form").trigger('submit');
-        },
-        bootstrap: function () {
-            //Popover & Tooltip
-            $('.bs-component [data-toggle="popover"]').popover();
-            $('.bs-component [data-toggle="tooltip"]').tooltip();
-
-            //Toastr
-            var i = -1;
-            var toastCount = 0;
-            var $toastlast;
-
-            var getMessage = function () {
-                var msgs = ['My name is Inigo Montoya. You killed my father. Prepare to die!',
-                    '
                      ',
-                    'Are you the six fingered man?',
-                    'Inconceivable!',
-                    'I do not think that means what you think it means.',
-                    'Have fun storming the castle!'
-                ];
-                i++;
-                if (i === msgs.length) {
-                    i = 0;
-                }
-
-                return msgs[i];
-            };
-            $('#showtoast').click(function () {
-                var shortCutFunction = $("#toastTypeGroup input:radio:checked").val();
-                var msg = $('#message').val();
-                var title = $('#title').val() || '';
-                var $showDuration = $('#showDuration');
-                var $hideDuration = $('#hideDuration');
-                var $timeOut = $('#timeOut');
-                var $extendedTimeOut = $('#extendedTimeOut');
-                var $showEasing = $('#showEasing');
-                var $hideEasing = $('#hideEasing');
-                var $showMethod = $('#showMethod');
-                var $hideMethod = $('#hideMethod');
-                var toastIndex = toastCount++;
-
-                Toastr.options = {
-                    closeButton: $('#closeButton').prop('checked'),
-                    debug: $('#debugInfo').prop('checked'),
-                    positionClass: $('#positionGroup input:radio:checked').val() || 'toast-top-right',
-                    onclick: null
-                };
-
-                if ($('#addBehaviorOnToastClick').prop('checked')) {
-                    Toastr.options.onclick = function () {
-                        alert('You can perform some custom action after a toast goes away');
-                    };
-                }
-
-                if ($showDuration.val().length) {
-                    Toastr.options.showDuration = $showDuration.val();
-                }
-
-                if ($hideDuration.val().length) {
-                    Toastr.options.hideDuration = $hideDuration.val();
-                }
-
-                if ($timeOut.val().length) {
-                    Toastr.options.timeOut = $timeOut.val();
-                }
-
-                if ($extendedTimeOut.val().length) {
-                    Toastr.options.extendedTimeOut = $extendedTimeOut.val();
-                }
-
-                if ($showEasing.val().length) {
-                    Toastr.options.showEasing = $showEasing.val();
-                }
-
-                if ($hideEasing.val().length) {
-                    Toastr.options.hideEasing = $hideEasing.val();
-                }
-
-                if ($showMethod.val().length) {
-                    Toastr.options.showMethod = $showMethod.val();
-                }
-
-                if ($hideMethod.val().length) {
-                    Toastr.options.hideMethod = $hideMethod.val();
-                }
-
-                if (!msg) {
-                    msg = getMessage();
-                }
-
-                $("#toastrOptions").text("Command: toastr["
-                        + shortCutFunction
-                        + "](\""
-                        + msg
-                        + (title ? "\", \"" + title : '')
-                        + "\")\n\nToastr.options = "
-                        + JSON.stringify(Toastr.options, null, 2)
-                        );
-
-                var $toast = Toastr[shortCutFunction](msg, title); // Wire up an event handler to a button in the toast, if it exists
-                $toastlast = $toast;
-                if ($toast.find('#okBtn').length) {
-                    $toast.delegate('#okBtn', 'click', function () {
-                        alert('you clicked me. i was toast #' + toastIndex + '. goodbye!');
-                        $toast.remove();
-                    });
-                }
-                if ($toast.find('#surpriseBtn').length) {
-                    $toast.delegate('#surpriseBtn', 'click', function () {
-                        alert('Surprise! you clicked me. i was toast #' + toastIndex + '. You could perform an action here.');
-                    });
-                }
-            });
-            function getLastToast() {
-                return $toastlast;
-            }
-            $('#clearlasttoast').click(function () {
-                Toastr.clear(getLastToast());
-            });
-            $('#cleartoasts').click(function () {
-                Toastr.clear();
-            });
-            $(document).on("click", "#dialog-normal", function () {
-                BootstrapDialog.show({
-                    title: 'Say-hello dialog',
-                    message: 'Hi Apple!'
-                });
-            });
-            $(document).on("click", "#dialog-alert", function () {
-                BootstrapDialog.alert('Hi Apple!');
-            });
-            $(document).on("click", "#dialog-confirm", function () {
-                BootstrapDialog.confirm('Hi Apple, are you sure?', function (result) {
-                    if (result) {
-                        alert('Yup.');
-                    } else {
-                        alert('Nope.');
-                    }
-                });
-            });
-        },
-    };
-    return Controller;
-});
\ No newline at end of file
diff --git a/public/assets/js/require-backend.js b/public/assets/js/require-backend.js
index f5c7aa27..4011d687 100644
--- a/public/assets/js/require-backend.js
+++ b/public/assets/js/require-backend.js
@@ -4,7 +4,8 @@ require.config({
             name: 'moment',
             location: '../libs/moment',
             main: 'moment'
-        }],
+        }
+    ],
     //在打包压缩时将会把include中的模块合并到主文件中
     include: ['css', 'layer', 'toastr', 'fast', 'backend', 'table', 'form', 'dragsort', 'drag', 'drop', 'addtabs', 'selectpage'],
     paths: {
@@ -48,9 +49,12 @@ require.config({
         'cxselect': '../libs/jquery-cxselect/js/jquery.cxselect',
         'template': '../libs/art-template/dist/template-native',
         'selectpage': '../libs/selectpage/selectpage',
+        'citypicker': '../libs/city-picker/dist/js/city-picker.min',
+        'citypicker-data': '../libs/city-picker/dist/js/city-picker.data',
     },
     // shim依赖配置
     shim: {
+        'addons': ['backend'],
         'bootstrap': ['jquery'],
         'bootstrap-table': {
             deps: [
@@ -112,6 +116,7 @@ require.config({
 //        'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'],
         'validator-lang': ['validator-core'],
 //        'selectpage': ['css!../libs/selectpage/selectpage.css'],
+        'citypicker': ['citypicker-data', 'css!../libs/city-picker/dist/css/city-picker.css']
     },
     baseUrl: requirejs.s.contexts._.config.config.site.cdnurl + '/assets/js/', //资源基础路径
     map: {
@@ -138,7 +143,7 @@ require(['jquery', 'bootstrap'], function ($, undefined) {
     // 初始化
     $(function () {
         require(['fast'], function (Fast) {
-            require(['backend'], function (Backend) {
+            require(['backend', 'addons'], function (Backend, Addons) {
                 //加载相应模块
                 if (Config.jsname) {
                     require([Config.jsname], function (Controller) {
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index e1dabc75..59238f79 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -65,6 +65,7 @@ require.config({
     },
     // shim依赖配置
     shim: {
+        'addons': ['backend'],
         'bootstrap': ['jquery'],
         'bootstrap-table': {
             deps: [
@@ -152,7 +153,7 @@ require(['jquery', 'bootstrap'], function ($, undefined) {
     // 初始化
     $(function () {
         require(['fast'], function (Fast) {
-            require(['backend'], function (Backend) {
+            require(['backend', 'addons'], function (Backend, Addons) {
                 //加载相应模块
                 if (Config.jsname) {
                     require([Config.jsname], function (Controller) {
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 093a5239..543feddf 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -2,71 +2,8 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
     var Form = {
         config: {
         },
-        api: {
-            submit: function (form, onBeforeSubmit, onAfterSubmit) {
-                if (form.size() == 0)
-                    return Toastr.error("表单未初始化完成,无法提交");
-                //提交前事件
-                var beforeSubmit = form.data("before-submit");
-                //元素绑定函数
-                if (beforeSubmit && typeof Form.api.custom[beforeSubmit] == 'function') {
-                    if (!Form.api.custom[beforeSubmit].call(form)) {
-                        return false;
-                    }
-                }
-                //自定义函数
-                if (typeof onBeforeSubmit == 'function') {
-                    if (!onBeforeSubmit.call(form)) {
-                        return false;
-                    }
-                }
-                var type = form.attr("method").toUpperCase();
-                type = type && (type == 'GET' || type == 'POST') ? type : 'GET';
-                url = form.attr("action");
-                url = url ? url : location.href;
-                $.ajax({
-                    type: type,
-                    url: url,
-                    data: form.serialize(),
-                    dataType: 'json',
-                    success: function (ret) {
-                        if (ret.hasOwnProperty("code")) {
-                            var data = ret.hasOwnProperty("data") && ret.data != "" ? ret.data : null;
-                            var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
-                            if (ret.code === 1) {
-                                $('.form-group', form).removeClass('has-feedback has-success has-error');
-                                //成功提交后事件
-                                var afterSubmit = form.data("after-submit");
-                                //元素绑定函数
-                                if (afterSubmit && typeof Form.api.custom[afterSubmit] == 'function') {
-                                    if (!Form.api.custom[afterSubmit].call(form, data, ret)) {
-                                        return false;
-                                    }
-                                }
-                                //自定义函数
-                                if (typeof onAfterSubmit == 'function') {
-                                    if (!onAfterSubmit.call(form, data, ret)) {
-                                        return false;
-                                    }
-                                }
-                                Toastr.success(msg ? msg : __('Operation completed'));
-                            } else {
-                                if (data && typeof data === 'object' && typeof data.token !== 'undefined') {
-                                    $("input[name='__token__']").val(data.token);
-                                }
-                                Toastr.error(msg ? msg : __('Operation failed'));
-                            }
-                        } else {
-                            Toastr.error(__('Unknown data format'));
-                        }
-                    }, error: function () {
-                        Toastr.error(__('Network error'));
-                    }, complete: function (e) {
-                    }
-                });
-                return false;
-            },
-            bindevent: function (form, onBeforeSubmit, onAfterSubmit) {
+        events: {
+            validator: function (form, success, error, submit) {
                 //绑定表单事件
                 form.validator($.extend({
                     validClass: 'has-success',
@@ -88,32 +25,35 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
                     },
                     valid: function (ret) {
                         //验证通过提交表单
-                        Form.api.submit($(ret), onBeforeSubmit, function (data, ret) {
-                            if (typeof onAfterSubmit == 'function') {
-                                if (!onAfterSubmit.call($(this), data, ret)) {
+                        Form.api.submit($(ret), function (data, ret) {
+                            if (typeof success === 'function') {
+                                if (!success.call($(this), data, ret)) {
                                     return false;
                                 }
                             }
                             //提示及关闭当前窗口
-                            parent.Toastr.success(__('Operation completed'));
+                            var msg = ret.hasOwnProperty("msg") && ret.msg !== "" ? ret.msg : __('Operation completed');
+                            parent.Toastr.success(msg);
                             parent.$(".btn-refresh").trigger("click");
                             var index = parent.Layer.getFrameIndex(window.name);
                             parent.Layer.close(index);
-                        });
+                        }, error, submit);
                         return false;
                     }
                 }, form.data("validator-options") || {}));
-                
+
                 //移除提交按钮的disabled类
                 $(".layer-footer .btn.disabled", form).removeClass("disabled");
-
+            },
+            selectpicker: function (form) {
                 //绑定select元素事件
                 if ($(".selectpicker", form).size() > 0) {
                     require(['bootstrap-select', 'bootstrap-select-lang'], function () {
                         $('.selectpicker', form).selectpicker();
                     });
                 }
-
+            },
+            selectpage: function (form) {
                 //绑定selectpage元素事件
                 if ($(".selectpage", form).size() > 0) {
                     require(['selectpage'], function () {
@@ -126,112 +66,151 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
                         $(this).trigger("validate");
                     });
                 }
-
+            },
+            cxselect: function (form) {
                 //绑定cxselect元素事件
-                if ($("[data-toggle='cxselect']").size() > 0) {
+                if ($("[data-toggle='cxselect']", form).size() > 0) {
                     require(['cxselect'], function () {
                         $.cxSelect.defaults.jsonName = 'name';
                         $.cxSelect.defaults.jsonValue = 'value';
                         $.cxSelect.defaults.jsonSpace = 'data';
-                        $("[data-toggle='cxselect']").cxSelect();
+                        $("[data-toggle='cxselect']", form).cxSelect();
                     });
                 }
-
+            },
+            citypicker: function (form) {
+                //绑定城市远程插件
+                if ($("[data-toggle='city-picker']", form).size() > 0) {
+                    require(['citypicker'], function () {});
+                }
+            },
+            datetimepicker: function (form) {
                 //绑定日期时间元素事件
                 if ($(".datetimepicker", form).size() > 0) {
                     require(['bootstrap-datetimepicker'], function () {
+                        var options = {
+                            format: 'YYYY-MM-DD HH:mm:ss',
+                            icons: {
+                                time: 'fa fa-clock-o',
+                                date: 'fa fa-calendar',
+                                up: 'fa fa-chevron-up',
+                                down: 'fa fa-chevron-down',
+                                previous: 'fa fa-chevron-left',
+                                next: 'fa fa-chevron-right',
+                                today: 'fa fa-history',
+                                clear: 'fa fa-trash',
+                                close: 'fa fa-remove'
+                            },
+                            showTodayButton: true,
+                            showClose: true
+                        };
                         $('.datetimepicker', form).parent().css('position', 'relative');
-                        $('.datetimepicker', form)
-                                .datetimepicker({
-                                    format: 'YYYY-MM-DD HH:mm:ss',
-                                    icons: {
-                                        time: 'fa fa-clock-o',
-                                        date: 'fa fa-calendar',
-                                        up: 'fa fa-chevron-up',
-                                        down: 'fa fa-chevron-down',
-                                        previous: 'fa fa-chevron-left',
-                                        next: 'fa fa-chevron-right',
-                                        today: 'fa fa-history',
-                                        clear: 'fa fa-trash',
-                                        close: 'fa fa-remove'
-                                    },
-                                    showTodayButton: true,
-                                    showClose: true
-                                });
+                        $('.datetimepicker', form).datetimepicker(options);
                     });
                 }
-
-                //绑定summernote事件
-                if ($(".summernote", form).size() > 0) {
-                    require(['summernote'], function () {
-                        $(".summernote", form).summernote({
-                            height: 250,
-                            lang: 'zh-CN',
-                            fontNames: [
-                                'Arial', 'Arial Black', 'Serif', 'Sans', 'Courier',
-                                'Courier New', 'Comic Sans MS', 'Helvetica', 'Impact', 'Lucida Grande',
-                                "Open Sans", "Hiragino Sans GB", "Microsoft YaHei",
-                                '微软雅黑', '宋体', '黑体', '仿宋', '楷体', '幼圆',
-                            ],
-                            fontNamesIgnoreCheck: [
-                                "Open Sans", "Microsoft YaHei",
-                                '微软雅黑', '宋体', '黑体', '仿宋', '楷体', '幼圆'
-                            ],
-                            dialogsInBody: true,
-                            callbacks: {
-                                onChange: function (contents) {
-                                    $(this).val(contents);
-                                    $(this).trigger('change');
-                                },
-                                onInit: function () {
-                                },
-                                onImageUpload: function (files) {
-                                    var that = this;
-                                    //依次上传图片
-                                    for (var i = 0; i < files.length; i++) {
-                                        Upload.api.send(files[i], function (data) {
-                                            var url = Fast.api.cdnurl(data.url);
-                                            $(that).summernote("insertImage", url, 'filename');
-                                        });
-                                    }
-                                }
-                            }
-                        });
-                    });
-                }
-
+            },
+            plupload: function (form) {
                 //绑定plupload上传元素事件
                 if ($(".plupload", form).size() > 0) {
                     Upload.api.plupload();
                 }
-
+            },
+            faselect: function (form) {
                 //绑定fachoose选择附件事件
                 if ($(".fachoose", form).size() > 0) {
                     $(document).on('click', ".fachoose", function () {
+                        var that = this;
                         var multiple = $(this).data("multiple") ? $(this).data("multiple") : false;
                         var mimetype = $(this).data("mimetype") ? $(this).data("mimetype") : '';
-                        Fast.api.open("general/attachment/select?callback=refreshchoose&element_id=" + $(this).attr("id") + "&multiple=" + multiple + "&mimetype=" + mimetype, __('Choose'));
+                        parent.Fast.api.open("general/attachment/select?element_id=" + $(this).attr("id") + "&multiple=" + multiple + "&mimetype=" + mimetype, __('Choose'), {
+                            callback: function (data) {
+                                var input_id = $("#" + $(that).attr("id")).data("input-id");
+                                if (data.multiple) {
+                                    var urlArr = [];
+                                    var inputObj = $("#" + input_id);
+                                    if (inputObj.val() !== "") {
+                                        urlArr.push(inputObj.val());
+                                    }
+                                    urlArr.push(data.url);
+                                    inputObj.val(urlArr.join(",")).trigger("change");
+                                } else {
+                                    $("#" + input_id).val(data.url).trigger("change");
+                                }
+                            }
+                        });
                         return false;
                     });
-
-                    //刷新选择的元素
-                    window.refreshchoose = function (id, data, multiple) {
-                        var input_id = $("#" + id).data("input-id");
-                        if (multiple) {
-                            var urlArr = [];
-                            var inputObj = $("#" + input_id);
-                            if (inputObj.val() != "") {
-                                urlArr.push(inputObj.val());
-                            }
-                            urlArr.push(data.url);
-                            inputObj.val(urlArr.join(",")).trigger("change");
-                        } else {
-                            $("#" + input_id).val(data.url).trigger("change");
-                        }
-                        Layer.closeAll();
-                    };
                 }
             },
+            bindevent: function (form) {
+
+            }
+        },
+        api: {
+            submit: function (form, success, error, submit) {
+                if (form.size() === 0)
+                    return Toastr.error("表单未初始化完成,无法提交");
+                if (typeof submit === 'function') {
+                    if (!submit.call(form)) {
+                        return false;
+                    }
+                }
+                var type = form.attr("method").toUpperCase();
+                type = type && (type === 'GET' || type === 'POST') ? type : 'GET';
+                url = form.attr("action");
+                url = url ? url : location.href;
+                //调用Ajax请求方法
+                Fast.api.ajax({
+                    type: type,
+                    url: url,
+                    data: form.serialize(),
+                    dataType: 'json'
+                }, function (data, ret) {
+                    $('.form-group', form).removeClass('has-feedback has-success has-error');
+                    if (data && typeof data === 'object' && typeof data.token !== 'undefined') {
+                        $("input[name='__token__']", form).val(data.token);
+                    }
+                    if (typeof success === 'function') {
+                        if (!success.call(form, data, ret)) {
+                            return false;
+                        }
+                    }
+                }, function (data, ret) {
+                    if (data && typeof data === 'object' && typeof data.token !== 'undefined') {
+                        $("input[name='__token__']", form).val(data.token);
+                    }
+                    if (typeof error === 'function') {
+                        if (!error.call(form, data, ret)) {
+                            return false;
+                        }
+                    }
+                });
+                return false;
+            },
+            bindevent: function (form, success, error, submit) {
+
+                form = typeof form === 'object' ? form : $(form);
+
+                var events = Form.events;
+
+                events.bindevent(form);
+
+                events.validator(form, success, error, submit);
+
+                events.selectpicker(form);
+
+                events.selectpage(form);
+
+                events.cxselect(form);
+
+                events.citypicker(form);
+
+                events.datetimepicker(form);
+
+                events.plupload(form);
+
+                events.faselect(form);
+            },
             custom: {}
         },
     };
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 70c530c1..05a2a8a3 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lang', 'bootstrap-table-mobile', 'bootstrap-table-export', 'bootstrap-table-commonsearch', 'bootstrap-table-template'], function ($, undefined, Moment) {
+define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table', 'bootstrap-table-lang', 'bootstrap-table-mobile', 'bootstrap-table-export', 'bootstrap-table-commonsearch', 'bootstrap-table-template'], function ($, undefined, Moment) {
     var Table = {
         list: {},
         // Bootstrap-table 基础配置
@@ -153,6 +153,7 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                 $(toolbar).on('click', Table.config.refreshbtn, function () {
                     table.bootstrapTable('refresh');
                 });
+                
                 // 添加按钮事件
                 $(toolbar).on('click', Table.config.addbtn, function () {
                     var ids = Table.api.selectedids(table);
@@ -212,7 +213,6 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                                 }
                             };
                             Fast.api.ajax(params, function (data) {
-                                Toastr.success(__('Operation completed'));
                                 table.bootstrapTable('refresh');
                             });
                         },
@@ -258,7 +258,6 @@ define(['jquery', 'bootstrap', 'moment', 'bootstrap-table', 'bootstrap-table-lan
                 var params = typeof data.params !== "undefined" ? (typeof data.params == 'object' ? $.param(data.params) : data.params) : '';
                 var options = {url: url, data: {action: action, ids: ids, params: params}};
                 Fast.api.ajax(options, function (data) {
-                    Toastr.success(__('Operation completed'));
                     table.bootstrapTable('refresh');
                 });
             },
diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js
index 9a2091b9..c1ed4c75 100755
--- a/public/assets/js/require-upload.js
+++ b/public/assets/js/require-upload.js
@@ -6,10 +6,85 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
             classname: '.plupload:not([initialized])',
             previewtpl: '
                      • ',
         },
+        events: {
+            //上传成功的回调
+            onUploadSuccess: function (ret, onUploadSuccess, button) {
+                var data = typeof ret.data !== 'undefined' ? ret.data : null;
+                //上传成功后回调
+                if (button) {
+                    //如果有文本框则填充
+                    var input_id = $(button).data("input-id") ? $(button).data("input-id") : "";
+                    if (input_id) {
+                        var urlArr = [];
+                        var inputObj = $("#" + input_id);
+                        if ($(button).data("multiple") && inputObj.val() !== "") {
+                            urlArr.push(inputObj.val());
+                        }
+                        urlArr.push(data.url);
+                        inputObj.val(urlArr.join(",")).trigger("change");
+                    }
+                    //如果有回调函数
+                    var onDomUploadSuccess = $(button).data("upload-success");
+                    if (onDomUploadSuccess) {
+                        if (typeof onDomUploadSuccess !== 'function' && typeof Upload.api.custom[onDomUploadSuccess] === 'function') {
+                            onDomUploadSuccess = Upload.api.custom[onDomUploadSuccess];
+                        }
+                        if (typeof onDomUploadSuccess === 'function') {
+                            var result = onDomUploadSuccess.call(button, data, ret);
+                            if (result === false)
+                                return;
+                        }
+                    }
+                }
+
+                if (typeof onUploadSuccess === 'function') {
+                    var result = onUploadSuccess.call(button, data, ret);
+                    if (result === false)
+                        return;
+                }
+            },
+            //上传错误的回调
+            onUploadError: function (ret, onUploadError, button) {
+                var data = typeof ret.data !== 'undefined' ? ret.data : null;
+                if (button) {
+                    var onDomUploadError = $(button).data("upload-error");
+                    if (onDomUploadError) {
+                        if (typeof onDomUploadError !== 'function' && typeof Upload.api.custom[onDomUploadError] === 'function') {
+                            onDomUploadError = Upload.api.custom[onDomUploadError];
+                        }
+                        if (typeof onDomUploadError === 'function') {
+                            var result = onDomUploadError.call(button, data, ret);
+                            if (result === false)
+                                return;
+                        }
+                    }
+                }
+
+                if (typeof onUploadError === 'function') {
+                    var result = onUploadError.call(button, data, ret);
+                    if (result === false) {
+                        return;
+                    }
+                }
+                Toastr.error(ret.msg + "(code:" + ret.code + ")");
+            },
+            //服务器响应数据后
+            onUploadResponse: function (response) {
+                try {
+                    var ret = typeof response === 'object' ? response : JSON.parse(response);
+                    if (!ret.hasOwnProperty('code')) {
+                        $.extend(ret, {code: -2, msg: response, data: null});
+                    }
+                } catch (e) {
+                    var ret = {code: -1, msg: e.message, data: null};
+                }
+                return ret;
+            }
+        },
         api: {
             //Plupload上传
-            plupload: function (element, onAfterUpload) {
-                element = typeof element == 'undefined' ? Upload.config.classname : element;
+            plupload: function (element, onUploadSuccess, onUploadError) {
+                element = typeof element === 'undefined' ? Upload.config.classname : element;
                 $(element, Upload.config.container).each(function () {
                     $(this).attr("initialized", true);
                     var that = this;
@@ -19,13 +94,15 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
                     var mimetype = $(this).data("mimetype");
                     var multipart = $(this).data("multipart");
                     var multiple = $(this).data("multiple");
-                    //上传URL
-                    url = url ? url : Config.upload.uploadurl;
-                    url = Fast.api.fixurl(url);
+
                     //填充ID
                     var input_id = $(that).data("input-id") ? $(that).data("input-id") : "";
                     //预览ID
                     var preview_id = $(that).data("preview-id") ? $(that).data("preview-id") : "";
+
+                    //上传URL
+                    url = url ? url : Config.upload.uploadurl;
+                    url = Fast.api.fixurl(url);
                     //最大可上传
                     maxsize = typeof maxsize !== "undefined" ? maxsize : Config.upload.maxsize;
                     //文件类型
@@ -42,6 +119,7 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
                         container: $(this).parent().get(0), //取按钮的上级元素
                         flash_swf_url: '/assets/libs/plupload/js/Moxie.swf',
                         silverlight_xap_url: '/assets/libs/plupload/js/Moxie.xap',
+                        headers: {'X-REQUESTED-WITH': 'XMLHttpRequest'},
                         filters: {
                             max_file_size: maxsize,
                             mime_types: mimetype
@@ -53,66 +131,40 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
 
                             },
                             FilesAdded: function (up, files) {
-                                Plupload.each(files, function (file) {
-                                    //这里可以改成其它的表现形式
-                                    //document.getElementById('filelist').innerHTML += '
                      ' + file.name + ' (' + plupload.formatSize(file.size) + ') 
                      ';
-                                });
-                                $(that).data("bakup-html", $(that).html());
+                                var button = up.settings.button;
+                                $(button).data("bakup-html", $(button).html());
                                 //添加后立即上传
                                 setTimeout(function () {
-                                    Upload.list[id].start();
+                                    up.start();
                                 }, 1);
                             },
                             UploadProgress: function (up, file) {
+                                var button = up.settings.button;
                                 //这里可以改成其它的表现形式
                                 //document.getElementById(file.id).getElementsByTagName('b')[0].innerHTML = '' + file.percent + "%";
-                                $(that).prop("disabled", true).html(" " + __('Upload') + file.percent + "%");
+                                $(button).prop("disabled", true).html(" " + __('Upload') + file.percent + "%");
                             },
                             FileUploaded: function (up, file, info) {
-                                var options = this.getOption();
+                                var button = up.settings.button;
                                 //还原按钮文字及状态
-                                $(that).prop("disabled", false).html($(that).data("bakup-html"));
-                                //这里可以改成其它的表现形式
-                                //document.getElementById(file.id).getElementsByTagName('b')[0].innerHTML += (' [Url]: ' + '' + url + '');
-                                //这里建议不修改
-                                try {
-                                    var ret = JSON.parse(info.response);
-                                    if (ret.hasOwnProperty('code')) {
-                                        ret.data = ret.code == 200 ? ret : ret.data;
-                                        ret.code = ret.code == 200 ? 1 : ret.code;
-                                        var data = ret.hasOwnProperty("data") && ret.data != "" ? ret.data : null;
-                                        var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
-                                        if (ret.code === 1) {
-                                            if (input_id) {
-                                                var urlArr = [];
-                                                var inputObj = $("#" + input_id);
-                                                if (options.multi_selection && inputObj.val() != "") {
-                                                    urlArr.push(inputObj.val());
-                                                }
-                                                urlArr.push(data.url);
-                                                inputObj.val(urlArr.join(",")).trigger("change");
-                                            }
-                                            var afterUpload = $("#" + id).data("after-upload");
-                                            if (afterUpload && typeof Upload.api.custom[afterUpload] == 'function') {
-                                                Upload.api.custom[afterUpload].call(that, data);
-                                            }
-                                            if (typeof onAfterUpload == 'function') {
-                                                onAfterUpload.call(that, data);
-                                            }
-                                        } else {
-                                            Toastr.error(msg ? msg : __('Operation failed'));
-                                        }
-                                    } else {
-                                        Toastr.error(e.message + "(code:-2)");
-                                    }
-                                } catch (e) {
-                                    Toastr.error(e.message + "(code:-1)");
+                                $(button).prop("disabled", false).html($(button).data("bakup-html"));
+                                var ret = Upload.events.onUploadResponse(info.response);
+                                if (ret.code === 1) {
+                                    Upload.events.onUploadSuccess(ret, onUploadSuccess, button);
+                                } else {
+                                    Upload.events.onUploadError(ret, onUploadError, button);
                                 }
                             },
                             Error: function (up, err) {
-                                Toastr.error(err.message + "(code:" + err.code + ")");
+                                var button = up.settings.button;
+                                $(button).prop("disabled", false).html($(button).data("bakup-html"));
+                                var ret = {code: err.code, msg: err.message, data: null};
+                                Upload.events.onUploadError(ret, onUploadError, button);
                             }
-                        }
+                        },
+                        onUploadSuccess: onUploadSuccess,
+                        onUploadError: onUploadError,
+                        button: that
                     });
 
                     //拖动排序
@@ -155,7 +207,7 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
                                 $("#" + input_id).val(urlArr.join(","));
                             }
                         });
-                        //移除按钮事件
+                        // 移除按钮事件
                         $(document.body).on("click", "#" + preview_id + " .btn-trash", function () {
                             $(this).closest("li").remove();
                             $("#" + preview_id).trigger("fa.preview.change");
@@ -164,8 +216,8 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
                     Upload.list[id].init();
                 });
             },
-            // AJAX异步上传,主要用于Summernote上传回调
-            send: function (file, callback) {
+            // AJAX异步上传
+            send: function (file, onUploadSuccess, onUploadError) {
                 var data = new FormData();
                 data.append("file", file);
                 $.each(Config.upload.multipart, function (k, v) {
@@ -178,28 +230,16 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
                     contentType: false,
                     processData: false,
                     type: 'POST',
-                    dataType: 'json',
                     success: function (ret) {
-                        if (ret.hasOwnProperty("code")) {
-                            ret.data = ret.code == 200 ? ret : ret.data;
-                            ret.code = ret.code == 200 ? 1 : ret.code;
-                            var data = ret.hasOwnProperty("data") && ret.data != "" ? ret.data : null;
-                            var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
-                            if (ret.code === 1) {
-                                // 如果回调存在,则直接调用回调
-                                if (typeof callback == 'function') {
-                                    callback.call(this, data);
-                                } else {
-                                    Toastr.success(msg ? msg : __('Operation completed'));
-                                }
-                            } else {
-                                Toastr.error(msg ? msg : __('Operation failed'));
-                            }
+                        ret = Upload.events.onUploadResponse(ret);
+                        if (ret.code === 1) {
+                            Upload.events.onUploadSuccess(ret, onUploadSuccess);
                         } else {
-                            Toastr.error(__('Unknown data format'));
+                            Upload.events.onUploadError(ret, onUploadError);
                         }
-                    }, error: function () {
-                        Toastr.error(__('Network error'));
+                    }, error: function (e) {
+                        var ret = {code: 500, msg: e.message, data: null};
+                        Upload.events.onUploadError(ret, onUploadError);
                     }
                 });
             },
diff --git a/public/assets/less/backend.less b/public/assets/less/backend.less
index c861dd88..7b5a3754 100644
--- a/public/assets/less/backend.less
+++ b/public/assets/less/backend.less
@@ -81,6 +81,9 @@ body.is-dialog {
 .content-wrapper {
     position:relative;
 }
+.control-relative{
+    position:relative;
+}
 .tab-addtabs {
     overflow: hidden;
     .tab-pane {
@@ -423,6 +426,12 @@ table.table-template{
     }
 }
 
+@media (min-width: 768px){
+    .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
+        top: 41px;
+    }
+}
+
 .fieldlist dd {
     display:block;margin:5px 0;
     input{display: inline-block;width:300px;}