From 0cb58627366ab1b298649202f2c0768f545d1bf4 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Tue, 8 Aug 2017 23:36:55 +0800
Subject: [PATCH] 新增插件功能 新增后台版本检测功能 新增插件命令行操作 新增citypicker城市选择插件 新增Backend.api.open的callback功能 新增Backend.api.close方法用于回调 新增Menu菜单类 新增Version版本类 新增rmdirs和copydirs函数 新增btn-ajax类直接发送AJAX请求功能 新增$this->assignconfig渲染数据到JS中的功能 启用全新网站首页
变更上传和表单的接口参数
变更菜单栏折叠时的展现方式
修复在包含下线划表的关联模型下的搜索错误
移除auth_rule表中name的admin前缀
移除从DOM中绑定上传和表单的事件
移除插件化后的模块及数据库
移除使用$this->code和$this->data功能
移除前台冗余的控制器和类
---
README.md | 3 ++-
application/admin/command/Addon.php | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/admin/command/Addon/stubs/addon.stub | 45 +++++++++++++++++++++++++++++++++++++++++++++
application/admin/command/Addon/stubs/config.stub | 40 ++++++++++++++++++++++++++++++++++++++++
application/admin/command/Addon/stubs/info.stub | 7 +++++++
application/admin/command/Crud.php | 35 +++++++++++++++++++++++++++++------
application/admin/command/Install/fastadmin.sql | 305 +++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/command/Menu.php | 12 ++++++------
application/admin/command/Min.php | 8 ++++----
application/admin/common.php | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/admin/controller/Addon.php | 293 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/admin/controller/Ajax.php | 54 +++++++++++++++---------------------------------------
application/admin/controller/Category.php | 4 ++--
application/admin/controller/Index.php | 14 +++++---------
application/admin/controller/Page.php | 51 ---------------------------------------------------
application/admin/controller/User.php | 27 ---------------------------
application/admin/controller/Version.php | 26 --------------------------
application/admin/controller/auth/Admin.php | 20 +++++++-------------
application/admin/controller/auth/Adminlog.php | 14 ++++++--------
application/admin/controller/auth/Group.php | 46 ++++++++++++++++------------------------------
application/admin/controller/auth/Rule.php | 24 ++++++++----------------
application/admin/controller/example/Bootstraptable.php | 70 ----------------------------------------------------------------------
application/admin/controller/example/Colorbadge.php | 24 ------------------------
application/admin/controller/example/Controllerjump.php | 24 ------------------------
application/admin/controller/example/Cxselect.php | 23 -----------------------
application/admin/controller/example/Multitable.php | 33 ---------------------------------
application/admin/controller/example/Relationmodel.php | 52 ----------------------------------------------------
application/admin/controller/example/Tabletemplate.php | 60 ------------------------------------------------------------
application/admin/controller/general/Attachment.php | 16 +++++++++++++++-
application/admin/controller/general/Config.php | 33 ++++++++++-----------------------
application/admin/controller/general/Crontab.php | 100 ----------------------------------------------------------------------------------------------------
application/admin/controller/general/Database.php | 211 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/controller/general/Profile.php | 4 ++--
application/admin/controller/wechat/Autoreply.php | 74 --------------------------------------------------------------------------
application/admin/controller/wechat/Config.php | 164 --------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/controller/wechat/Menu.php | 111 ---------------------------------------------------------------------------------------------------------------
application/admin/controller/wechat/Response.php | 86 --------------------------------------------------------------------------------------
application/admin/lang/zh-cn/addon.php | 9 +++++++++
application/admin/lang/zh-cn/general/crontab.php | 16 ----------------
application/admin/lang/zh-cn/general/database.php | 30 ------------------------------
application/admin/lang/zh-cn/index.php | 4 ++++
application/admin/lang/zh-cn/page.php | 17 -----------------
application/admin/lang/zh-cn/version.php | 15 ---------------
application/admin/lang/zh-cn/wechat/autoreply.php | 8 --------
application/admin/lang/zh-cn/wechat/config.php | 10 ----------
application/admin/lang/zh-cn/wechat/response.php | 8 --------
application/admin/library/Auth.php | 15 ++++-----------
application/admin/model/Config.php | 55 -------------------------------------------------------
application/admin/view/add.html | 203 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/view/addon/add.html | 22 ++++++++++++++++++++++
application/admin/view/addon/config.html | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/admin/view/addon/index.html | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/admin/view/auth/admin/index.html | 2 +-
application/admin/view/auth/group/add.html | 2 +-
application/admin/view/auth/group/edit.html | 2 +-
application/admin/view/auth/group/index.html | 2 +-
application/admin/view/category/add.html | 16 ++++++++--------
application/admin/view/category/edit.html | 16 ++++++++--------
application/admin/view/common/header.html | 28 +++++++++-------------------
application/admin/view/common/menu.html | 4 ++++
application/admin/view/edit.html | 203 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/view/example/bootstraptable/detail.html | 22 ----------------------
application/admin/view/example/bootstraptable/index.html | 31 -------------------------------
application/admin/view/example/colorbadge/index.html | 21 ---------------------
application/admin/view/example/controllerjump/index.html | 21 ---------------------
application/admin/view/example/cxselect/index.html | 160 ----------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/view/example/multitable/index.html | 43 -------------------------------------------
application/admin/view/example/relationmodel/index.html | 21 ---------------------
application/admin/view/example/tabletemplate/index.html | 67 -------------------------------------------------------------------
application/admin/view/general/configvalue/add.html | 52 ----------------------------------------------------
application/admin/view/general/configvalue/edit.html | 53 -----------------------------------------------------
application/admin/view/general/configvalue/index.html | 25 -------------------------
application/admin/view/general/crontab/add.html | 81 ---------------------------------------------------------------------------------
application/admin/view/general/crontab/edit.html | 81 ---------------------------------------------------------------------------------
application/admin/view/general/crontab/index.html | 25 -------------------------
application/admin/view/general/database/index.html | 81 ---------------------------------------------------------------------------------
application/admin/view/index.html | 25 -------------------------
application/admin/view/index/login.html | 12 +-----------
application/admin/view/page/add.html | 80 --------------------------------------------------------------------------------
application/admin/view/page/edit.html | 81 ---------------------------------------------------------------------------------
application/admin/view/page/index.html | 25 -------------------------
application/admin/view/user/third/add.phtml | 64 ----------------------------------------------------------------
application/admin/view/user/third/edit.phtml | 64 ----------------------------------------------------------------
application/admin/view/user/third/index.phtml | 25 -------------------------
application/admin/view/user/user/add.phtml | 193 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/view/user/user/edit.phtml | 187 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/view/user/user/index.phtml | 25 -------------------------
application/admin/view/version/add.html | 64 ----------------------------------------------------------------
application/admin/view/version/edit.html | 58 ----------------------------------------------------------
application/admin/view/version/index.html | 25 -------------------------
application/admin/view/wechat/autoreply/add.html | 51 ---------------------------------------------------
application/admin/view/wechat/autoreply/edit.html | 51 ---------------------------------------------------
application/admin/view/wechat/autoreply/index.html | 25 -------------------------
application/admin/view/wechat/config/add.html | 45 ---------------------------------------------
application/admin/view/wechat/config/edit.html | 47 -----------------------------------------------
application/admin/view/wechat/config/index.html | 25 -------------------------
application/admin/view/wechat/menu/index.html | 84 ------------------------------------------------------------------------------------
application/admin/view/wechat/response/add.html | 48 ------------------------------------------------
application/admin/view/wechat/response/edit.html | 52 ----------------------------------------------------
application/admin/view/wechat/response/index.html | 19 -------------------
application/admin/view/wechat/response/select.html | 16 ----------------
application/api/controller/Index.php | 15 ---------------
application/command.php | 1 +
application/common.php | 36 +++++++++++++++++++++++++++++++++---
application/common/behavior/Common.php | 1 +
application/common/controller/Backend.php | 92 +++++++++++++++++++++++++++++++++++++-------------------------------------------------------
application/common/controller/Frontend.php | 49 ++++++-------------------------------------------
application/common/controller/Uc.php | 162 ------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/common/library/Auth.php | 650 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/common/library/Menu.php | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/common/library/Token.php | 66 ------------------------------------------------------------------
application/common/model/Config.php | 57 +++++++++++----------------------------------------------
application/common/model/Configvalue.php | 76 ----------------------------------------------------------------------------
application/common/model/Crontab.php | 54 ------------------------------------------------------
application/common/model/Page.php | 20 --------------------
application/common/model/User.php | 16 ----------------
application/common/model/UserSignin.php | 16 ----------------
application/common/model/UserThird.php | 16 ----------------
application/common/model/Version.php | 136 ----------------------------------------------------------------------------------------------------------------------------------------
application/common/model/WechatAutoreply.php | 16 ----------------
application/common/model/WechatConfig.php | 32 --------------------------------
application/common/model/WechatContext.php | 16 ----------------
application/common/model/WechatResponse.php | 16 ----------------
application/config.php | 6 ++++++
application/constants.php | 23 -----------------------
application/extra/addons.php | 8 ++++++++
application/extra/payment.php | 48 ------------------------------------------------
application/extra/service.php | 42 ------------------------------------------
application/extra/third.php | 28 ----------------------------
application/extra/upload.php | 28 ++--------------------------
application/extra/wechat.php | 64 ----------------------------------------------------------------
application/index/controller/Ajax.php | 14 +++++---------
application/index/controller/Autotask.php | 135 ---------------------------------------------------------------------------------------------------------------------------------------
application/index/controller/Common.php | 18 ------------------
application/index/controller/Demo.php | 108 ------------------------------------------------------------------------------------------------------------
application/index/controller/Index.php | 2 +-
application/index/controller/Sms.php | 168 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/index/controller/Ucenter.php | 363 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/index/controller/Upyun.php | 58 ----------------------------------------------------------
application/index/controller/User.php | 222 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/index/controller/Wechat.php | 192 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/index/lang/zh-cn.php | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------
application/index/lang/zh-cn/sms.php | 9 ---------
application/index/view/demo/bootstrap.html | 1646 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/index/view/demo/index.html | 7 -------
application/index/view/demo/qrcode.html | 149 -----------------------------------------------------------------------------------------------------------------------------------------------------
application/index/view/index/index.html | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
application/index/view/layout/bootstrap.html | 117 ---------------------------------------------------------------------------------------------------------------------
application/index/view/layout/user.html | 31 -------------------------------
application/index/view/user/changepwd.html | 34 ----------------------------------
application/index/view/user/index.html | 44 --------------------------------------------
application/index/view/user/login.html | 48 ------------------------------------------------
application/index/view/user/register.html | 62 --------------------------------------------------------------
application/uc.php | 24 ------------------------
bower.json | 10 ++++------
composer.json | 3 ++-
extend/fast/Auth.php | 3 +--
extend/fast/Version.php | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
extend/fast/payment/Alipay.php | 447 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/payment/Wechat.php | 440 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/service/Alisms.php | 167 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/service/Easemob.php | 307 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/service/Qiniu.php | 187 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/service/Upyun.php | 572 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/service/Wechat.php | 213 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/third/Application.php | 76 ----------------------------------------------------------------------------
extend/fast/third/Qq.php | 145 -------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/third/Wechat.php | 124 ----------------------------------------------------------------------------------------------------------------------------
extend/fast/third/Weibo.php | 124 ----------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/Client.php | 31 -------------------------------
extend/fast/ucenter/client/uc_client/client.php | 840 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/app.php | 63 ---------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/cache.php | 30 ------------------------------
extend/fast/ucenter/client/uc_client/control/client.php | 817 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/domain.php | 31 -------------------------------
extend/fast/ucenter/client/uc_client/control/feed.php | 114 ------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/friend.php | 64 ----------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/index.htm | 1 -
extend/fast/ucenter/client/uc_client/control/mail.php | 42 ------------------------------------------
extend/fast/ucenter/client/uc_client/control/pm.php | 463 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/tag.php | 102 ------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/control/user.php | 443 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/data/cache/apps.php | 40 ----------------------------------------
extend/fast/ucenter/client/uc_client/data/cache/badwords.php | 5 -----
extend/fast/ucenter/client/uc_client/data/cache/index.htm | 0
extend/fast/ucenter/client/uc_client/data/cache/settings.php | 32 --------------------------------
extend/fast/ucenter/client/uc_client/data/index.htm | 0
extend/fast/ucenter/client/uc_client/index.htm | 1 -
extend/fast/ucenter/client/uc_client/lib/db.class.php | 210 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/lib/dbi.class.php | 200 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/lib/index.htm | 1 -
extend/fast/ucenter/client/uc_client/lib/sendmail.inc.php | 159 ---------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/lib/uccode.class.php | 174 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/lib/xml.class.php | 129 ---------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/app.php | 40 ----------------------------------------
extend/fast/ucenter/client/uc_client/model/base.php | 347 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/cache.php | 119 -----------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/domain.php | 63 ---------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/friend.php | 148 ----------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/index.htm | 1 -
extend/fast/ucenter/client/uc_client/model/mail.php | 181 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/misc.php | 198 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/note.php | 230 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/pm.php | 1261 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/tag.php | 84 ------------------------------------------------------------------------------------
extend/fast/ucenter/client/uc_client/model/user.php | 439 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
extend/fast/ucenter/common/Functions.php | 98 --------------------------------------------------------------------------------------------------
extend/fast/ucenter/common/XML.php | 129 ---------------------------------------------------------------------------------------------------------------------------------
public/assets/css/backend.css | 8 ++++++++
public/assets/css/index.css | 422 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/assets/img/bg-middle.jpg | Bin 0 -> 44976 bytes
public/assets/img/bg-pattern.png | Bin 0 -> 633 bytes
public/assets/img/bootstrap.jpg | Bin 46466 -> 0 bytes
public/assets/img/loginbg.jpg | Bin 0 -> 70837 bytes
public/assets/img/qrcode.jpg | Bin 36360 -> 0 bytes
public/assets/img/third.jpg | Bin 47784 -> 0 bytes
public/assets/img/ucenter.jpg | Bin 24340 -> 0 bytes
public/assets/js/addons.js | 3 +++
public/assets/js/adminlte.js | 44 ++++++++++++++++++++++++++++----------------
public/assets/js/backend.js | 23 +++++++++++++++++------
public/assets/js/backend/addon.js | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/assets/js/backend/auth/admin.js | 7 ++++++-
public/assets/js/backend/auth/group.js | 19 ++++++++-----------
public/assets/js/backend/category.js | 16 +++++++++++-----
public/assets/js/backend/example/bootstraptable.js | 162 ------------------------------------------------------------------------------------------------------------------------------------------------------------------
public/assets/js/backend/example/colorbadge.js | 55 -------------------------------------------------------
public/assets/js/backend/example/controllerjump.js | 62 --------------------------------------------------------------
public/assets/js/backend/example/cxselect.js | 14 --------------
public/assets/js/backend/example/multitable.js | 86 --------------------------------------------------------------------------------------
public/assets/js/backend/example/relationmodel.js | 50 --------------------------------------------------
public/assets/js/backend/example/tabletemplate.js | 128 --------------------------------------------------------------------------------------------------------------------------------
public/assets/js/backend/general/attachment.js | 12 ++++--------
public/assets/js/backend/general/crontab.js | 74 --------------------------------------------------------------------------
public/assets/js/backend/general/database.js | 39 ---------------------------------------
public/assets/js/backend/general/profile.js | 2 +-
public/assets/js/backend/index.js | 107 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
public/assets/js/backend/page.js | 61 -------------------------------------------------------------
public/assets/js/backend/user/third.js | 57 ---------------------------------------------------------
public/assets/js/backend/user/user.js | 65 -----------------------------------------------------------------
public/assets/js/backend/version.js | 58 ----------------------------------------------------------
public/assets/js/backend/wechat/autoreply.js | 77 -----------------------------------------------------------------------------
public/assets/js/backend/wechat/config.js | 97 -------------------------------------------------------------------------------------------------
public/assets/js/backend/wechat/menu.js | 289 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
public/assets/js/backend/wechat/response.js | 187 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
public/assets/js/fast.js | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
public/assets/js/frontend/demo.js | 152 --------------------------------------------------------------------------------------------------------------------------------------------------------
public/assets/js/require-backend.js | 9 +++++++--
public/assets/js/require-backend.min.js | 3 ++-
public/assets/js/require-form.js | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------
public/assets/js/require-table.js | 5 ++---
public/assets/js/require-upload.js | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
public/assets/less/backend.less | 9 +++++++++
252 files changed, 2816 insertions(+), 21910 deletions(-)
create mode 100644 application/admin/command/Addon.php
create mode 100644 application/admin/command/Addon/stubs/addon.stub
create mode 100644 application/admin/command/Addon/stubs/config.stub
create mode 100644 application/admin/command/Addon/stubs/info.stub
create mode 100644 application/admin/controller/Addon.php
delete mode 100644 application/admin/controller/Page.php
delete mode 100644 application/admin/controller/User.php
delete mode 100644 application/admin/controller/Version.php
delete mode 100644 application/admin/controller/example/Bootstraptable.php
delete mode 100644 application/admin/controller/example/Colorbadge.php
delete mode 100644 application/admin/controller/example/Controllerjump.php
delete mode 100644 application/admin/controller/example/Cxselect.php
delete mode 100644 application/admin/controller/example/Multitable.php
delete mode 100644 application/admin/controller/example/Relationmodel.php
delete mode 100644 application/admin/controller/example/Tabletemplate.php
delete mode 100644 application/admin/controller/general/Crontab.php
delete mode 100644 application/admin/controller/general/Database.php
delete mode 100644 application/admin/controller/wechat/Autoreply.php
delete mode 100644 application/admin/controller/wechat/Config.php
delete mode 100644 application/admin/controller/wechat/Menu.php
delete mode 100644 application/admin/controller/wechat/Response.php
create mode 100644 application/admin/lang/zh-cn/addon.php
delete mode 100644 application/admin/lang/zh-cn/general/crontab.php
delete mode 100644 application/admin/lang/zh-cn/general/database.php
delete mode 100644 application/admin/lang/zh-cn/page.php
delete mode 100644 application/admin/lang/zh-cn/version.php
delete mode 100644 application/admin/lang/zh-cn/wechat/autoreply.php
delete mode 100644 application/admin/lang/zh-cn/wechat/config.php
delete mode 100644 application/admin/lang/zh-cn/wechat/response.php
delete mode 100644 application/admin/model/Config.php
delete mode 100644 application/admin/view/add.html
create mode 100644 application/admin/view/addon/add.html
create mode 100644 application/admin/view/addon/config.html
create mode 100644 application/admin/view/addon/index.html
delete mode 100644 application/admin/view/edit.html
delete mode 100644 application/admin/view/example/bootstraptable/detail.html
delete mode 100644 application/admin/view/example/bootstraptable/index.html
delete mode 100644 application/admin/view/example/colorbadge/index.html
delete mode 100644 application/admin/view/example/controllerjump/index.html
delete mode 100644 application/admin/view/example/cxselect/index.html
delete mode 100644 application/admin/view/example/multitable/index.html
delete mode 100644 application/admin/view/example/relationmodel/index.html
delete mode 100644 application/admin/view/example/tabletemplate/index.html
delete mode 100644 application/admin/view/general/configvalue/add.html
delete mode 100644 application/admin/view/general/configvalue/edit.html
delete mode 100644 application/admin/view/general/configvalue/index.html
delete mode 100644 application/admin/view/general/crontab/add.html
delete mode 100644 application/admin/view/general/crontab/edit.html
delete mode 100644 application/admin/view/general/crontab/index.html
delete mode 100644 application/admin/view/general/database/index.html
delete mode 100644 application/admin/view/index.html
delete mode 100644 application/admin/view/page/add.html
delete mode 100644 application/admin/view/page/edit.html
delete mode 100644 application/admin/view/page/index.html
delete mode 100644 application/admin/view/user/third/add.phtml
delete mode 100644 application/admin/view/user/third/edit.phtml
delete mode 100644 application/admin/view/user/third/index.phtml
delete mode 100644 application/admin/view/user/user/add.phtml
delete mode 100644 application/admin/view/user/user/edit.phtml
delete mode 100644 application/admin/view/user/user/index.phtml
delete mode 100644 application/admin/view/version/add.html
delete mode 100644 application/admin/view/version/edit.html
delete mode 100644 application/admin/view/version/index.html
delete mode 100644 application/admin/view/wechat/autoreply/add.html
delete mode 100644 application/admin/view/wechat/autoreply/edit.html
delete mode 100644 application/admin/view/wechat/autoreply/index.html
delete mode 100644 application/admin/view/wechat/config/add.html
delete mode 100644 application/admin/view/wechat/config/edit.html
delete mode 100644 application/admin/view/wechat/config/index.html
delete mode 100644 application/admin/view/wechat/menu/index.html
delete mode 100644 application/admin/view/wechat/response/add.html
delete mode 100644 application/admin/view/wechat/response/edit.html
delete mode 100644 application/admin/view/wechat/response/index.html
delete mode 100644 application/admin/view/wechat/response/select.html
delete mode 100644 application/api/controller/Index.php
delete mode 100644 application/common/controller/Uc.php
delete mode 100644 application/common/library/Auth.php
create mode 100644 application/common/library/Menu.php
delete mode 100644 application/common/library/Token.php
delete mode 100644 application/common/model/Configvalue.php
delete mode 100644 application/common/model/Crontab.php
delete mode 100644 application/common/model/Page.php
delete mode 100644 application/common/model/User.php
delete mode 100644 application/common/model/UserSignin.php
delete mode 100644 application/common/model/UserThird.php
delete mode 100644 application/common/model/Version.php
delete mode 100644 application/common/model/WechatAutoreply.php
delete mode 100644 application/common/model/WechatConfig.php
delete mode 100644 application/common/model/WechatContext.php
delete mode 100644 application/common/model/WechatResponse.php
delete mode 100644 application/constants.php
create mode 100644 application/extra/addons.php
delete mode 100644 application/extra/payment.php
delete mode 100644 application/extra/service.php
delete mode 100644 application/extra/third.php
delete mode 100644 application/extra/wechat.php
delete mode 100644 application/index/controller/Autotask.php
delete mode 100644 application/index/controller/Common.php
delete mode 100644 application/index/controller/Demo.php
delete mode 100644 application/index/controller/Sms.php
delete mode 100644 application/index/controller/Ucenter.php
delete mode 100644 application/index/controller/Upyun.php
delete mode 100644 application/index/controller/User.php
delete mode 100644 application/index/controller/Wechat.php
delete mode 100644 application/index/lang/zh-cn/sms.php
delete mode 100644 application/index/view/demo/bootstrap.html
delete mode 100644 application/index/view/demo/index.html
delete mode 100644 application/index/view/demo/qrcode.html
delete mode 100644 application/index/view/layout/bootstrap.html
delete mode 100644 application/index/view/layout/user.html
delete mode 100644 application/index/view/user/changepwd.html
delete mode 100644 application/index/view/user/index.html
delete mode 100644 application/index/view/user/login.html
delete mode 100644 application/index/view/user/register.html
delete mode 100644 application/uc.php
create mode 100644 extend/fast/Version.php
delete mode 100644 extend/fast/payment/Alipay.php
delete mode 100644 extend/fast/payment/Wechat.php
delete mode 100644 extend/fast/service/Alisms.php
delete mode 100644 extend/fast/service/Easemob.php
delete mode 100644 extend/fast/service/Qiniu.php
delete mode 100644 extend/fast/service/Upyun.php
delete mode 100644 extend/fast/service/Wechat.php
delete mode 100644 extend/fast/third/Application.php
delete mode 100644 extend/fast/third/Qq.php
delete mode 100644 extend/fast/third/Wechat.php
delete mode 100644 extend/fast/third/Weibo.php
delete mode 100644 extend/fast/ucenter/client/Client.php
delete mode 100644 extend/fast/ucenter/client/uc_client/client.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/app.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/cache.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/client.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/domain.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/feed.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/friend.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/index.htm
delete mode 100644 extend/fast/ucenter/client/uc_client/control/mail.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/pm.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/tag.php
delete mode 100644 extend/fast/ucenter/client/uc_client/control/user.php
delete mode 100644 extend/fast/ucenter/client/uc_client/data/cache/apps.php
delete mode 100644 extend/fast/ucenter/client/uc_client/data/cache/badwords.php
delete mode 100644 extend/fast/ucenter/client/uc_client/data/cache/index.htm
delete mode 100644 extend/fast/ucenter/client/uc_client/data/cache/settings.php
delete mode 100644 extend/fast/ucenter/client/uc_client/data/index.htm
delete mode 100644 extend/fast/ucenter/client/uc_client/index.htm
delete mode 100644 extend/fast/ucenter/client/uc_client/lib/db.class.php
delete mode 100644 extend/fast/ucenter/client/uc_client/lib/dbi.class.php
delete mode 100644 extend/fast/ucenter/client/uc_client/lib/index.htm
delete mode 100644 extend/fast/ucenter/client/uc_client/lib/sendmail.inc.php
delete mode 100644 extend/fast/ucenter/client/uc_client/lib/uccode.class.php
delete mode 100644 extend/fast/ucenter/client/uc_client/lib/xml.class.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/app.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/base.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/cache.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/domain.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/friend.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/index.htm
delete mode 100644 extend/fast/ucenter/client/uc_client/model/mail.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/misc.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/note.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/pm.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/tag.php
delete mode 100644 extend/fast/ucenter/client/uc_client/model/user.php
delete mode 100644 extend/fast/ucenter/common/Functions.php
delete mode 100644 extend/fast/ucenter/common/XML.php
create mode 100644 public/assets/css/index.css
create mode 100755 public/assets/img/bg-middle.jpg
create mode 100644 public/assets/img/bg-pattern.png
delete mode 100644 public/assets/img/bootstrap.jpg
create mode 100755 public/assets/img/loginbg.jpg
delete mode 100644 public/assets/img/qrcode.jpg
delete mode 100644 public/assets/img/third.jpg
delete mode 100644 public/assets/img/ucenter.jpg
create mode 100644 public/assets/js/addons.js
create mode 100644 public/assets/js/backend/addon.js
delete mode 100644 public/assets/js/backend/example/bootstraptable.js
delete mode 100644 public/assets/js/backend/example/colorbadge.js
delete mode 100644 public/assets/js/backend/example/controllerjump.js
delete mode 100644 public/assets/js/backend/example/cxselect.js
delete mode 100644 public/assets/js/backend/example/multitable.js
delete mode 100644 public/assets/js/backend/example/relationmodel.js
delete mode 100644 public/assets/js/backend/example/tabletemplate.js
delete mode 100644 public/assets/js/backend/general/crontab.js
delete mode 100755 public/assets/js/backend/general/database.js
delete mode 100644 public/assets/js/backend/page.js
delete mode 100644 public/assets/js/backend/user/third.js
delete mode 100644 public/assets/js/backend/user/user.js
delete mode 100644 public/assets/js/backend/version.js
delete mode 100644 public/assets/js/backend/wechat/autoreply.js
delete mode 100644 public/assets/js/backend/wechat/config.js
delete mode 100644 public/assets/js/backend/wechat/menu.js
delete mode 100644 public/assets/js/backend/wechat/response.js
delete mode 100644 public/assets/js/frontend/demo.js
diff --git a/README.md b/README.md
index 10802d1..5506146 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 0000000..240606f
--- /dev/null
+++ b/application/admin/command/Addon.php
@@ -0,0 +1,226 @@
+<?php
+
+namespace app\admin\command;
+
+use think\addons\AddonException;
+use think\addons\Service;
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\Exception;
+
+class Addon extends Command
+{
+
+ protected function configure()
+ {
+ $this
+ ->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 0000000..22567a4
--- /dev/null
+++ b/application/admin/command/Addon/stubs/addon.stub
@@ -0,0 +1,45 @@
+<?php
+
+namespace addons\{%name%};
+
+use think\Addons;
+
+/**
+ * 插件
+ */
+class {%addonClassName%} extends Addons
+{
+
+ /**
+ * 插件安装方法
+ * @return bool
+ */
+ public function install()
+ {
+ return true;
+ }
+
+ /**
+ * 插件卸载方法
+ * @return bool
+ */
+ public function uninstall()
+ {
+ return true;
+ }
+
+ /**
+ * 实现钩子方法
+ * @return mixed
+ */
+ public function testhook($param)
+ {
+ // 调用钩子时候的参数信息
+ print_r($param);
+ // 当前插件的配置信息，配置信息存在当前目录的config.php文件中，见下方
+ print_r($this->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 0000000..4ad20dc
--- /dev/null
+++ b/application/admin/command/Addon/stubs/config.stub
@@ -0,0 +1,40 @@
+<?php
+
+return [
+ [
+ //配置唯一标识
+ 'name' => '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 0000000..27570c3
--- /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 7f81d96..3b96bde 100644
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -45,6 +45,11 @@ class Crud extends Command
protected $switchSuffix = ['switch'];
/**
+ * 城市后缀
+ */
+ protected $citySuffix = ['city'];
+
+ /**
* Selectpage对应的后缀
*/
protected $selectpageSuffix = ['_id', '_ids'];
@@ -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("<div class='control-relative'>%s</div>", Form::input('text', $fieldName, $defaultValue, $attrArr));
+ $formEditElement = sprintf("<div class='control-relative'>%s</div>", 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 ? '<ul class="row list-inline plupload-preview" id="p-' . $field . '"></ul>' : '';
return <<<EOD
<div class="form-inline">
{$content}
- <span><button type="button" id="plupload-{$field}" class="btn btn-danger plupload" data-input-id="c-{$field}"{$filter}{$multiple}{$preview}><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-{$field}" class="btn btn-primary fachoose" data-input-id="c-{$field}"{$filter}{$multiple}><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+ <span><button type="button" id="plupload-{$field}" class="btn btn-danger plupload" data-input-id="c-{$field}"{$uploadfilter}{$multiple}{$preview}><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+ <span><button type="button" id="fachoose-{$field}" class="btn btn-primary fachoose" data-input-id="c-{$field}"{$selectfilter}{$multiple}><i class="fa fa-list"></i> {:__('Choose')}</button></span>
{$previewcontainer}
</div>
EOD;
diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql
index 5823a76..99711b1 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\":\"<p>\\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\":\"<p>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\":\"<p>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;
-- ----------------------------
@@ -245,65 +215,6 @@ INSERT INTO `fa_config` VALUES ('1', 'name', 'basic', '站点名称', '请填写
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', '<p>test</p>', '', '0', '0', '1499769482', '1499769482', '0', 'normal');
-COMMIT;
-
--- ----------------------------
-- Table structure for `fa_test`
-- ----------------------------
DROP TABLE IF EXISTS `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', '我是一篇测试文章', '<p>我是测试内容</p>', '/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');
-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');
+INSERT INTO `fa_test` VALUES ('1', '12', '12,13', 'monday', 'hot,index', 'male', 'music,reading', '我是一篇测试文章', '<p>我是测试内容</p>', '/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;
-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 751abad..0416467 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 8f8a458..e338534 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 86800c8..00c2f31 100644
--- a/application/admin/common.php
+++ b/application/admin/common.php
@@ -135,3 +135,87 @@ function build_heading($title = NULL, $content = NULL)
return '';
return '<div class="panel-heading"><div class="panel-lead"><em>' . $title . '</em>' . $content . '</div></div>';
}
+
+/**
+ * 判断文件或文件夹是否可写
+ * @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 0000000..0526109
--- /dev/null
+++ b/application/admin/controller/Addon.php
@@ -0,0 +1,293 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\addons\AddonException;
+use think\addons\Service;
+use think\Config;
+use think\Exception;
+
+/**
+ * 插件管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Addon extends Backend
+{
+
+ protected $model = null;
+
+ public function _initialize()
+ {
+ parent::_initialize();
+ }
+
+ /**
+ * 查看
+ */
+ public function index()
+ {
+ $addons = get_addon_list();
+ foreach ($addons as $k => &$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 8a1ac5f..0bf244a 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 c1cb54d..8336e3e 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 b2f2048..b624f4e 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 aeacb90..0000000
--- a/application/admin/controller/Page.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace app\admin\controller;
-
-use app\common\controller\Backend;
-
-/**
- * 单页管理
- *
- * @icon fa fa-circle-o
- * @remark 用于管理普通的单页面,通常用于关于我们、联系我们、商务合作等单一页面
- */
-class Page extends Backend
-{
-
- protected $model = null;
- protected $relationSearch = true;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 cd7748a..0000000
--- a/application/admin/controller/User.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace app\admin\controller;
-
-use app\common\controller\Backend;
-
-/**
- * 会员管理
- *
- * @icon fa fa-circle-o
- * @internal
- */
-class User extends Backend
-{
-
- /**
- * User模型对象
- */
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->model = model('User');
- }
-
-}
diff --git a/application/admin/controller/Version.php b/application/admin/controller/Version.php
deleted file mode 100644
index e0360f7..0000000
--- a/application/admin/controller/Version.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace app\admin\controller;
-
-use app\common\controller\Backend;
-
-use think\Controller;
-use think\Request;
-
-/**
- * 版本管理
- *
- * @icon fa fa-circle-o
- */
-class Version extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->model = model('Version');
- }
-
-}
diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php
index f4a5487..06c7177 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 d33cff8..a889846 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 744f8ce..e1b7890 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 a77c9c9..48a51ac 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 914c84e..0000000
--- a/application/admin/controller/example/Bootstraptable.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 表格完整示例
- *
- * @icon fa fa-table
- * @remark 在使用Bootstrap-table中的常用方式,更多使用方式可查看:http://bootstrap-table.wenzhixin.net.cn/zh-cn/
- */
-class Bootstraptable extends Backend
-{
-
- protected $model = null;
- protected $noNeedRight = ['change', 'detail'];
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 4d0bc21..0000000
--- a/application/admin/controller/example/Colorbadge.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 彩色角标
- *
- * @icon fa fa-table
- * @remark 在JS端控制角标的显示与隐藏,请注意左侧菜单栏角标的数值变化
- */
-class Colorbadge extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->model = model('AdminLog');
- }
-
-}
diff --git a/application/admin/controller/example/Controllerjump.php b/application/admin/controller/example/Controllerjump.php
deleted file mode 100644
index 2bd1540..0000000
--- a/application/admin/controller/example/Controllerjump.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 控制器间跳转
- *
- * @icon fa fa-table
- * @remark FastAdmin支持在控制器间跳转,点击后将切换到另外一个TAB中,无需刷新当前页面
- */
-class Controllerjump extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->model = model('AdminLog');
- }
-
-}
diff --git a/application/admin/controller/example/Cxselect.php b/application/admin/controller/example/Cxselect.php
deleted file mode 100644
index 391c097..0000000
--- a/application/admin/controller/example/Cxselect.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 多级联动
- *
- * @icon fa fa-table
- * @remark FastAdmin使用了jQuery-cxselect实现多级联动,更多文档请参考https://github.com/karsonzhang/cxSelect
- */
-class Cxselect extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- }
-
-}
diff --git a/application/admin/controller/example/Multitable.php b/application/admin/controller/example/Multitable.php
deleted file mode 100644
index bf31c0f..0000000
--- a/application/admin/controller/example/Multitable.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 多表格示例
- *
- * @icon fa fa-table
- * @remark 当一个页面上存在多个Bootstrap-table时该如何控制按钮和表格
- */
-class Multitable extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- }
-
- /**
- * 查看
- */
- public function index()
- {
- $this->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 ae42b76..0000000
--- a/application/admin/controller/example/Relationmodel.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 多模型关联
- *
- * @icon fa fa-table
- * @remark 当使用到关联模型时需要重载index方法
- */
-class Relationmodel extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 fcc5c35..0000000
--- a/application/admin/controller/example/Tabletemplate.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace app\admin\controller\example;
-
-use app\common\controller\Backend;
-
-/**
- * 表格模板示例
- *
- * @icon fa fa-table
- * @remark 可以通过使用表格模板将表格中的行渲染成一样的展现方式，基于此功能可以任意定制自己想要的展示列表
- */
-class Tabletemplate extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 cb549ff..6f5a169 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 ef63405..16c367d 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 73dfdd0..0000000
--- a/application/admin/controller/general/Crontab.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace app\admin\controller\general;
-
-use app\common\controller\Backend;
-use Cron\CronExpression;
-
-/**
- * 定时任务
- *
- * @icon fa fa-tasks
- * @remark 类似于Linux的Crontab定时任务,可以按照设定的时间进行任务的执行,目前仅支持三种任务:请求URL、执行SQL、执行Shell
- */
-class Crontab extends Backend
-{
-
- protected $model = null;
- protected $noNeedRight = ['check_schedule', 'get_schedule_future'];
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 2d31a01..0000000
--- a/application/admin/controller/general/Database.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-namespace app\admin\controller\general;
-
-use app\common\controller\Backend;
-use think\Db;
-use think\Debug;
-
-/**
- * 数据库管理
- *
- * @icon fa fa-database
- * @remark 可在线进行一些简单的数据库表优化或修复,查看表结构和数据。也可以进行SQL语句的操作
- */
-class Database extends Backend
-{
-
- /**
- * 查看
- */
- function index()
- {
- $tables_data_length = $tables_index_length = $tables_free_length = $tables_data_count = 0;
- $tables = $list = [];
- $list = Db::query("SHOW TABLES");
- foreach ($list as $key => $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 '<style type="text/css">
- xmp,body{margin:0;padding:0;line-height:18px;font-size:12px;font-family:"Helvetica Neue", Helvetica, Microsoft Yahei, Hiragino Sans GB, WenQuanYi Micro Hei, sans-serif;}
- hr{height:1px;margin:5px 1px;background:#e3e3e3;border:none;}
- </style>';
- 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 "<br />";
- }
- }
- }
-
- private function viewinfo($name)
- {
- $row = Db::query("SHOW CREATE TABLE `{$name}`");
- $row = array_values($row[0]);
- $info = $row[1];
- echo "<xmp>{$info};</xmp>";
- }
-
- 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 "<br />";
- }
- }
-
- 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 "<br />";
- }
- }
-
- 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：<span style='color:green;'>{$val}</span> ";
- 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) . "<br />";
- 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 .= "<hr/>";
- $r .= "<font color='red'>" . __('Row:%s', $j) . "</font><br />";
- foreach ($n as $k => $v)
- {
- $r .= "<font color='blue'>{$k}：</font>{$v}<br/>\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) . "<br />";
- }
- }
- echo $r;
- }
-
-}
diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php
index 39344b1..3189d7c 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 0de2127..0000000
--- a/application/admin/controller/wechat/Autoreply.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace app\admin\controller\wechat;
-
-use app\common\controller\Backend;
-use app\common\model\WechatResponse;
-
-/**
- * 微信自动回复管理
- *
- * @icon fa fa-circle-o
- */
-class Autoreply extends Backend
-{
-
- protected $model = null;
- protected $noNeedRight = ['check_text_unique'];
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 bf9af55..0000000
--- a/application/admin/controller/wechat/Config.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace app\admin\controller\wechat;
-
-use app\common\controller\Backend;
-use think\Controller;
-use think\Request;
-
-/**
- * 微信配置管理
- *
- * @icon fa fa-circle-o
- */
-class Config extends Backend
-{
-
- protected $model = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 1a1b713..0000000
--- a/application/admin/controller/wechat/Menu.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace app\admin\controller\wechat;
-
-use app\common\controller\Backend;
-use app\common\model\WechatResponse;
-use EasyWeChat\Foundation\Application;
-use think\Config;
-use think\Exception;
-
-/**
- * 菜单管理
- *
- * @icon fa fa-list-alt
- */
-class Menu extends Backend
-{
-
- protected $wechatcfg = NULL;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 d1bbb1a..0000000
--- a/application/admin/controller/wechat/Response.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace app\admin\controller\wechat;
-
-use app\common\controller\Backend;
-use fast\service\Wechat;
-
-/**
- * 资源管理
- *
- * @icon fa fa-list-alt
- */
-class Response extends Backend
-{
-
- protected $model = null;
- protected $searchFields = 'id,title';
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 0000000..8a43807
--- /dev/null
+++ b/application/admin/lang/zh-cn/addon.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+ 'Id' => '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 041aab7..0000000
--- a/application/admin/lang/zh-cn/general/crontab.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-return [
- 'Title' => '任务标题',
- '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 1defa65..0000000
--- a/application/admin/lang/zh-cn/general/database.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-return [
- 'SQL Result' => '查询结果',
- '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 c4b76fd..9bba7d1 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 852303d..0000000
--- a/application/admin/lang/zh-cn/page.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-return [
- 'id' => '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 ce75269..0000000
--- a/application/admin/lang/zh-cn/version.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-return [
- 'id' => '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 6ba7061..0000000
--- a/application/admin/lang/zh-cn/wechat/autoreply.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
- 'Text' => '文本',
- '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 fbbd04a..0000000
--- a/application/admin/lang/zh-cn/wechat/config.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-return [
- 'name' => '配置名称',
- '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 37bb3bd..0000000
--- a/application/admin/lang/zh-cn/wechat/response.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
- 'Resource title' => '资源标题',
- 'Event key' => '事件标识',
- 'Text' => '文本',
- 'App' => '应用',
-];
diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index 145298f..0b1b299 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 cec8a76..0000000
--- a/application/admin/model/Config.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace app\admin\model;
-
-use think\Model;
-
-class Config extends Model
-{
-
- // 表名,不含前缀
- protected $name = 'config';
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = false;
- // 定义时间戳字段名
- protected $createTime = false;
- protected $updateTime = false;
- // 追加属性
- protected $append = [
- ];
-
- /**
- * 读取配置类型
- * @return array
- */
- public static function getTypeList()
- {
- $typeList = [
- 'string' => __('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 746d009..0000000
--- a/application/admin/view/add.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-category_id" class="control-label col-xs-12 col-sm-2">{:__('Category_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-category_id" data-rule="required" data-source="category/selectpage" data-params='{"custom[type]":""}' class="form-control selectpage" name="row[category_id]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-category_ids" class="control-label col-xs-12 col-sm-2">{:__('Category_ids')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-category_ids" data-rule="required" data-source="category/selectpage" data-params='{"custom[type]":""}' data-multiple="true" class="form-control selectpage" name="row[category_ids]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-user_id" class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-user_id" data-rule="required" data-source="user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-user_ids" class="control-label col-xs-12 col-sm-2">{:__('User_ids')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-user_ids" data-rule="required" data-source="user/index" data-multiple="true" data-field="nickname" class="form-control selectpage" name="row[user_ids]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-week" class="control-label col-xs-12 col-sm-2">{:__('Week')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- <select id="c-week" data-rule="required" class="form-control selectpicker" name="row[week]">
- {foreach name="weekList" item="vo"}
- <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
- {/foreach}
- </select>
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- <select id="c-flag" data-rule="required" class="form-control selectpicker" multiple="" name="row[flag][]">
- {foreach name="flagList" item="vo"}
- <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
- {/foreach}
- </select>
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-genderdata" class="control-label col-xs-12 col-sm-2">{:__('Genderdata')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="genderdataList" item="vo"}
- <label for="row[genderdata]-{$key}"><input id="row[genderdata]-{$key}" name="row[genderdata]" type="radio" value="{$key}" {in name="key" value="male"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-hobbydata" class="control-label col-xs-12 col-sm-2">{:__('Hobbydata')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="hobbydataList" item="vo"}
- <label for="row[hobbydata][]-{$key}"><input id="row[hobbydata][]-{$key}" name="row[hobbydata][]" type="checkbox" value="{$key}" {in name="key" value=""}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea id="c-content" data-rule="required" class="form-control summernote" rows="5" name="row[content]" cols="50"></textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="">
- <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
- <ul class="row list-inline plupload-preview" id="p-image"></ul>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-images" class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="">
- <span><button type="button" id="plupload-images" class="btn btn-danger plupload" data-input-id="c-images" data-mimetype="image/*" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
- <ul class="row list-inline plupload-preview" id="p-images"></ul>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-attachfile" class="control-label col-xs-12 col-sm-2">{:__('Attachfile')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-attachfile" data-rule="required" class="form-control" size="50" name="row[attachfile]" type="text" value="">
- <span><button type="button" id="plupload-attachfile" class="btn btn-danger plupload" data-input-id="c-attachfile" data-multiple="false"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-attachfile" class="btn btn-primary fachoose" data-input-id="c-attachfile" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-keywords" data-rule="required" class="form-control" name="row[keywords]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-description" class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-description" data-rule="required" class="form-control" name="row[description]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-price" class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="0.00">
- </div>
- </div>
- <div class="form-group">
- <label for="c-views" class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-views" class="form-control" name="row[views]" type="number" value="0">
- </div>
- </div>
- <div class="form-group">
- <label for="c-startdate" class="control-label col-xs-12 col-sm-2">{:__('Startdate')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-startdate" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[startdate]" type="text" value="{:date('Y-m-d')}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-activitytime" class="control-label col-xs-12 col-sm-2">{:__('Activitytime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-activitytime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[activitytime]" type="text" value="{:date('Y-m-d H:i:s')}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-year" class="control-label col-xs-12 col-sm-2">{:__('Year')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-year" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY" data-use-current="true" name="row[year]" type="text" value="{:date('Y')}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-times" class="control-label col-xs-12 col-sm-2">{:__('Times')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-times" data-rule="required" class="form-control datetimepicker" data-date-format="HH:mm:ss" data-use-current="true" name="row[times]" type="text" value="{:date('H:i:s')}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-refreshtime" class="control-label col-xs-12 col-sm-2">{:__('Refreshtime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-refreshtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refreshtime]" type="text" value="{:date('Y-m-d H:i:s')}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
- </div>
- </div>
- <div class="form-group">
- <label for="c-status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="statusList" item="vo"}
- <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="normal"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-state" class="control-label col-xs-12 col-sm-2">{:__('State')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="stateList" item="vo"}
- <label for="row[state]-{$key}"><input id="row[state]-{$key}" name="row[state]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/addon/add.html b/application/admin/view/addon/add.html
new file mode 100644
index 0000000..6900e4f
--- /dev/null
+++ b/application/admin/view/addon/add.html
@@ -0,0 +1,22 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+ <div class="form-group">
+ <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+ <div class="col-xs-12 col-sm-8">
+ <button type="button" id="plupload-addon" class="btn btn-danger plupload" data-url="addon/local" data-mimetype="application/zip" data-multiple="false"><i class="fa fa-upload"></i> {:__('请选择一个安装包')}</button>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+ <div class="col-xs-12 col-sm-8">
+ <input id="c-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text" value="">
+ </div>
+ </div>
+ <div class="form-group layer-footer">
+ <label class="control-label col-xs-12 col-sm-2"></label>
+ <div class="col-xs-12 col-sm-8">
+ <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+ <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+ </div>
+ </div>
+</form>
diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html
new file mode 100644
index 0000000..e780dc8
--- /dev/null
+++ b/application/admin/view/addon/config.html
@@ -0,0 +1,102 @@
+<form id="config-form" class="edit-form form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th width="15%">{:__('Title')}</th>
+ <th width="85%">{:__('Value')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {foreach $addon.config as $item}
+ <tr>
+ <td>{$item.title}</td>
+ <td>
+ <div class="row">
+ <div class="col-sm-8 col-xs-12">
+ {switch $item.type}
+ {case string}
+ <input type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control" data-rule="{$item.rule}" data-tip="{$item.tip}" {$item.extend} />
+ {/case}
+ {case text}
+ <textarea name="row[{$item.name}]" class="form-control" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}" {$item.extend}>{$item.value}</textarea>
+ {/case}
+ {case array}
+ <dl class="fieldlist" rel="{$item.value|count}" data-name="row[{$item.name}]">
+ <dd>
+ <ins>{:__('Array key')}</ins>
+ <ins>{:__('Array value')}</ins>
+ </dd>
+ {foreach $item.value as $key => $vo}
+ <dd class="form-inline">
+ <input type="text" name="row[{$item.name}][field][{$key}]" class="form-control" value="{$key}" size="10" />
+ <input type="text" name="row[{$item.name}][value][{$key}]" class="form-control" value="{$vo}" size="30" />
+ <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
+ <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span>
+ </dd>
+ {/foreach}
+ <dd><a href="javascript:;" class="append btn btn-sm btn-success"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
+ </dl>
+ {/case}
+ {case datetime}
+ <input type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-tip="{$item.tip}" data-rule="{$item.rule}" {$item.extend} />
+ {/case}
+ {case number}
+ <input type="number" name="row[{$item.name}]" value="{$item.value}" class="form-control" data-tip="{$item.tip}" data-rule="{$item.rule}" {$item.extend} />
+ {/case}
+ {case checkbox}
+ {foreach name="item.content" item="vo"}
+ <label for="row[{$item.name}][]-{$key}"><input id="row[{$item.name}][]-{$key}" name="row[{$item.name}][]" type="checkbox" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value"}checked{/in} /> {$vo}</label>
+ {/foreach}
+ {/case}
+ {case radio}
+ {foreach name="item.content" item="vo"}
+ <label for="row[{$item.name}]-{$key}"><input id="row[{$item.name}]-{$key}" name="row[{$item.name}]" type="radio" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value"}checked{/in} /> {$vo}</label>
+ {/foreach}
+ {/case}
+ {case value="select" break="0"}{/case}
+ {case value="selects"}
+ <select name="row[{$item.name}]{$item.type=='selects'?'[]':''}" class="form-control selectpicker" data-tip="{$item.tip}" {$item.type=='selects'?'multiple':''}>
+ {foreach name="item.content" item="vo"}
+ <option value="{$key}" {in name="key" value="$item.value"}selected{/in}>{$vo}</option>
+ {/foreach}
+ </select>
+ {/case}
+ {case value="image" break="0"}{/case}
+ {case value="images"}
+ <div class="form-inline">
+ <input id="c-{$item.name}" class="form-control" size="37" name="row[{$item.name}]" type="text" value="{$item.value}" data-tip="{$item.tip}">
+ <span><button type="button" id="plupload-{$item.name}" class="btn btn-danger plupload" data-input-id="c-{$item.name}" data-mimetype="image/*" data-multiple="{$item.type=='image'?'false':'true'}" data-preview-id="p-{$item.name}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+ <span><button type="button" id="fachoose-{$item.name}" class="btn btn-primary fachoose" data-input-id="c-{$item.name}" data-mimetype="image/*" data-multiple="{$item.type=='image'?'false':'true'}"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+ <ul class="row list-inline plupload-preview" id="p-{$item.name}"></ul>
+ </div>
+ {/case}
+ {case value="file" break="0"}{/case}
+ {case value="files"}
+ <div class="form-inline">
+ <input id="c-{$item.name}" class="form-control" size="37" name="row[{$item.name}]" type="text" value="{$item.value}" data-tip="{$item.tip}">
+ <span><button type="button" id="plupload-{$item.name}" class="btn btn-danger plupload" data-input-id="c-{$item.name}" data-multiple="{$item.type=='file'?'false':'true'}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+ <span><button type="button" id="fachoose-{$item.name}" class="btn btn-primary fachoose" data-input-id="c-{$item.name}" data-multiple="{$item.type=='file'?'false':'true'}"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+ </div>
+ {/case}
+ {case bool}
+ <label for="row[{$item.name}]-yes"><input id="row[{$item.name}]-yes" name="row[{$item.name}]" type="radio" value="1" {$item.value?'checked':''} data-tip="{$item.tip}" /> {:__('Yes')}</label>
+ <label for="row[{$item.name}]-no"><input id="row[{$item.name}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label>
+ {/case}
+ {/switch}
+ </div>
+ <div class="col-sm-4"></div>
+ </div>
+
+ </td>
+ </tr>
+ {/foreach}
+ </tbody>
+ </table>
+ <div class="form-group layer-footer">
+ <label class="control-label col-xs-12 col-sm-2"></label>
+ <div class="col-xs-12 col-sm-8">
+ <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+ <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+ </div>
+ </div>
+</form>
\ 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 0000000..a4712ea
--- /dev/null
+++ b/application/admin/view/addon/index.html
@@ -0,0 +1,120 @@
+<style type="text/css">
+ .addon {
+ height:100%;position: relative;
+ }
+ .addon > span {
+ position:absolute;left:15px;top:15px;
+ }
+ .layui-layer-pay .layui-layer-content {
+ padding:0;height:600px!important;
+ }
+ .layui-layer-pay {border:none;}
+</style>
+<div class="panel panel-default panel-intro">
+ {:build_heading()}
+
+ <div class="panel-body">
+ <div id="myTabContent" class="tab-content">
+ <div class="tab-pane fade active in" id="one">
+ <div class="widget-body no-padding">
+ <div id="toolbar" class="toolbar">
+ {:build_toolbar('refresh')}
+ <button type="button" id="plupload-addon" class="btn btn-danger plupload" data-url="addon/local" data-mimetype="application/zip" data-multiple="false"><i class="fa fa-upload"></i> {:__('本地安装')}</button>
+ <a class="btn btn-success btn-ajax" href="addon/refresh"><i class="fa fa-refresh"></i> {:__('刷新插件缓存')}</a>
+ </div>
+ <table id="table" class="table table-striped table-hover" width="100%">
+
+ </table>
+
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<script id="paytpl" type="text/html">
+ <div style="position:relative;width:800px;height:600px;background:url('<%=payimg%>') 0 0 no-repeat;">
+ <div style="position:absolute;left:265px;top:442px;">
+ <%=paycode%>
+ </div>
+ <div style="position:absolute;left:660px;top:442px;">
+ <%=paycode%>
+ </div>
+ </div>
+</script>
+<script id="conflicttpl" type="text/html">
+ <div class="alert alert-dismissable alert-danger">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <strong>警告!</strong> 此插件中发现和现有系统中部分文件发现冲突！以下文件将会被影响，请备份好相关文件后再继续操作
+ </div>
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>文件</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%for(var i=0;i < conflictlist.length;i++){%>
+ <tr>
+ <th scope="row"><%=i+1%></th>
+ <td><%=conflictlist[i]%></td>
+ </tr>
+ <%}%>
+ </tbody>
+ </table>
+</script>
+<script id="itemtpl" type="text/html">
+ <div class="col-sm-4 col-md-3">
+ <% var labelarr = ['primary', 'success', 'info', 'danger', 'warning']; %>
+ <% var label = labelarr[item.id % 5]; %>
+ <% var addon = typeof addons[item.name]!= 'undefined' ? addons[item.name] : null; %>
+ <div class="thumbnail addon">
+ <!--<span class="btn btn-<%=label%>">ID:<%=item.id%></span>-->
+ <a href="<%=addon?addon.url:'javascript:;'%>" target="_blank"><img src="<%=item.image%>" class="img-responsive" alt="<%=item.title%>"></a>
+ <div class="caption">
+ <h4><%=item.title?item.title:'无'%>
+ <% if(item.flag.indexOf("recommend")>-1){%>
+ <span class="label label-success">推荐</span>
+ <% } %>
+ <% if(item.flag.indexOf("hot")>-1){%>
+ <span class="label label-danger">热门</span>
+ <% } %>
+ <% if(item.flag.indexOf("free")>-1){%>
+ <span class="label label-info">免费</span>
+ <% } %>
+ <% if(item.flag.indexOf("sale")>-1){%>
+ <span class="label label-warning">折扣</span>
+ <% } %>
+ </h4>
+ <p class="text-<%=item.price>0?'danger':'success'%>"><b>￥<%=item.price%></b></p>
+ <p class="text-muted">作者: <a href="<%=item.url?item.url:'javascript:;'%>" target="_blank"><%=item.author%></a></p>
+ <p class="text-muted">描述: <%=item.intro%></p>
+ <p class="text-muted">版本: <%=# addon && item && addon.version!=item.version?'<span class="label label-danger">'+addon.version+'</span> -> <span class="label label-success">'+item.version+'</span>':item.version%></p>
+ <p class="text-muted">添加时间: <%=Moment(item.createtime*1000).format("YYYY-MM-DD HH:mm:ss")%></p>
+ <!--<p class="text-muted">最后时间: <%=Moment(item.updatetime*1000).format("YYYY-MM-DD HH:mm:ss")%></p>-->
+ <p class="operate" data-id="<%=item.id%>" data-name="<%=item.name%>">
+ <% if(!addon){ %>
+ <a href="javascript:;" class="btn btn-primary btn-success btn-install"><i class="fa fa-cloud-download"></i> 安装</a>
+ <% } %>
+ <% if(addon){ %>
+ <% if(addon.config){ %>
+ <a href="javascript:;" class="btn btn-primary btn-config"><i class="fa fa-pencil"></i> 配置</a>
+ <% } %>
+ <% if(addon.state == "1"){ %>
+ <a href="javascript:;" class="btn btn-warning btn-disable" data-action="disable"><i class="fa fa-times"></i> 点击禁用</a>
+ <% }else{ %>
+ <a href="javascript:;" class="btn btn-success btn-enable" data-action="enable"><i class="fa fa-check"></i> 点击启用</a>
+ <a href="javascript:;" class="btn btn-danger btn-uninstall"><i class="fa fa-times"></i> 卸载</a>
+ <% } %>
+ <% } %>
+ <!--
+ <span class="pull-right" style="margin-top:10px;">
+ <input name="checkbox" data-id="<%=item.id%>" type="checkbox" />
+ </span>
+ -->
+ </p>
+ </div>
+ </div>
+ </div>
+</script>
\ 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 a44c562..9e3f794 100644
--- a/application/admin/view/auth/admin/index.html
+++ b/application/admin/view/auth/admin/index.html
@@ -6,7 +6,7 @@
<div class="tab-pane fade active in" id="one">
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
- {:build_toolbar()}
+ {:build_toolbar('refresh,add,delete')}
</div>
<table id="table" class="table table-striped table-bordered table-hover" width="100%">
diff --git a/application/admin/view/auth/group/add.html b/application/admin/view/auth/group/add.html
index 5e2aa8b..406a5b9 100644
--- a/application/admin/view/auth/group/add.html
+++ b/application/admin/view/auth/group/add.html
@@ -1,4 +1,4 @@
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" data-before-submit="refreshrules" action="">
+<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
<input type="hidden" name="row[rules]" value="" />
<div class="form-group">
<label for="pid" class="control-label col-xs-12 col-sm-2">{:__('Parent')}:</label>
diff --git a/application/admin/view/auth/group/edit.html b/application/admin/view/auth/group/edit.html
index e7b433b..fbd76fe 100644
--- a/application/admin/view/auth/group/edit.html
+++ b/application/admin/view/auth/group/edit.html
@@ -1,4 +1,4 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" method="POST" data-before-submit="refreshrules" action="">
+<form id="edit-form" class="form-horizontal form-ajax" role="form" method="POST" action="">
<input type="hidden" name="row[rules]" value="" />
<div class="form-group">
<label for="pid" class="control-label col-xs-12 col-sm-2">{:__('Parent')}:</label>
diff --git a/application/admin/view/auth/group/index.html b/application/admin/view/auth/group/index.html
index 8832095..327313d 100644
--- a/application/admin/view/auth/group/index.html
+++ b/application/admin/view/auth/group/index.html
@@ -6,7 +6,7 @@
<div class="tab-pane fade active in" id="one">
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
- {:build_toolbar()}
+ {:build_toolbar('refresh,add,delete')}
</div>
<table id="table" class="table table-striped table-bordered table-hover" width="100%">
diff --git a/application/admin/view/category/add.html b/application/admin/view/category/add.html
index 7ab24af..f8ca6c4 100644
--- a/application/admin/view/category/add.html
+++ b/application/admin/view/category/add.html
@@ -3,10 +3,10 @@
<div class="form-group">
<label for="c-type" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-8">
-
- <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+
+ <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
{foreach name="typeList" item="vo"}
- <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
+ <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
{/foreach}
</select>
@@ -15,10 +15,10 @@
<div class="form-group">
<label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
<div class="col-xs-12 col-sm-8">
-
- <select id="c-flag" data-rule="required" class="form-control selectpicker" name="row[pid]">
+
+ <select id="c-pid" data-rule="required" class="form-control selectpicker" name="row[pid]">
{foreach name="parentList" item="vo"}
- <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
+ <option data-type="{$vo.type}" value="{$key}" {in name="key" value=""}selected{/in}>{$vo.name}</option>
{/foreach}
</select>
@@ -39,10 +39,10 @@
<div class="form-group">
<label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
<div class="col-xs-12 col-sm-8">
-
+
<select id="c-flag" class="form-control selectpicker" multiple="" name="row[flag][]">
{foreach name="flagList" item="vo"}
- <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
+ <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
{/foreach}
</select>
diff --git a/application/admin/view/category/edit.html b/application/admin/view/category/edit.html
index eb9403e..d0ae275 100644
--- a/application/admin/view/category/edit.html
+++ b/application/admin/view/category/edit.html
@@ -3,10 +3,10 @@
<div class="form-group">
<label for="c-type" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-8">
-
- <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+
+ <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
{foreach name="typeList" item="vo"}
- <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+ <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
{/foreach}
</select>
@@ -15,10 +15,10 @@
<div class="form-group">
<label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
<div class="col-xs-12 col-sm-8">
-
- <select id="c-flag" data-rule="required" class="form-control selectpicker" name="row[pid]">
+
+ <select id="c-pid" data-rule="required" class="form-control selectpicker" name="row[pid]">
{foreach name="parentList" item="vo"}
- <option value="{$key}" {in name="key" value="$row.pid"}selected{/in}>{$vo}</option>
+ <option data-type="{$vo.type}" class="{:$vo.type==$row.type||$vo.type=='all'?'':'hide'}" value="{$key}" {in name="key" value="$row.pid"}selected{/in}>{$vo.name}</option>
{/foreach}
</select>
@@ -39,10 +39,10 @@
<div class="form-group">
<label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
<div class="col-xs-12 col-sm-8">
-
+
<select id="c-flag" class="form-control selectpicker" multiple="" name="row[flag][]">
{foreach name="flagList" item="vo"}
- <option value="{$key}" {in name="key" value="$row.flag"}selected{/in}>{$vo}</option>
+ <option value="{$key}" {in name="key" value="$row.flag"}selected{/in}>{$vo}</option>
{/foreach}
</select>
diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html
index da3e9dd..49f8ceb 100644
--- a/application/admin/view/common/header.html
+++ b/application/admin/view/common/header.html
@@ -38,28 +38,18 @@
</ul>
</li>
- <li class="footer"><a href="#" target="_blank">{:__('View all')}</a></li>
+ <li class="footer"><a href="#" target="_blank">{:__('View more')}</a></li>
</ul>
</li>
-
- <li class="dropdown messages-menu github-commits">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <i class="fa fa-github"></i>
- <span class="label label-info"></span>
+
+ <li>
+ <a href="javascript:;" data-toggle="checkupdate" title="{:__('Check for updates')}">
+ <i class="fa fa-refresh"></i>
</a>
- <ul class="dropdown-menu">
- <li class="header">{:__('Recent commits')}</li>
- <li>
- <ul class="menu">
-
- </ul>
- </li>
- <li class="footer"><a href="#" target="_blank">{:__('View all')}</a></li>
- </ul>
</li>
-
+
<li>
- <a href="javascript:;" data-toggle="wipecache" title="清空缓存">
+ <a href="javascript:;" data-toggle="wipecache" title="{:__('Wipe cache')}">
<i class="fa fa-trash"></i>
</a>
</li>
@@ -113,10 +103,10 @@
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
- <a href="general/profile" class="btn btn-default btn-flat addtabsit">{:__('Profile')}</a>
+ <a href="general/profile" class="btn btn-primary addtabsit"><i class="fa fa-user"></i> {:__('Profile')}</a>
</div>
<div class="pull-right">
- <a href="{:url('index/logout')}" class="btn btn-default btn-flat">{:__('Logout')}</a>
+ <a href="{:url('index/logout')}" class="btn btn-danger"><i class="fa fa-sign-out"></i> {:__('Logout')}</a>
</div>
</li>
</ul>
diff --git a/application/admin/view/common/menu.html b/application/admin/view/common/menu.html
index 5874fb1..9f8b109 100644
--- a/application/admin/view/common/menu.html
+++ b/application/admin/view/common/menu.html
@@ -29,6 +29,10 @@
<!--如果想始终显示子菜单,则给ul加上show-submenu类即可-->
<ul class="sidebar-menu">
{$menulist}
+ <li class="header">相关链接</li>
+ <li><a href="http://doc.fastadmin.net"><i class="fa fa-list text-red"></i> <span>官方文档</span></a></li>
+ <li><a href="http://forum.fastadmin.net"><i class="fa fa-comment text-yellow"></i> <span>社区交流</span></a></li>
+ <li><a href="https://jq.qq.com/?_wv=1027&k=487PNBb"><i class="fa fa-qq text-aqua"></i> <span>QQ交流群</span></a></li>
</ul>
</section>
<!-- /.sidebar -->
\ 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 6e00ce6..0000000
--- a/application/admin/view/edit.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-category_id" class="control-label col-xs-12 col-sm-2">{:__('Category_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-category_id" data-rule="required" data-source="category/selectpage" data-params='{"custom[type]":""}' class="form-control selectpage" name="row[category_id]" type="text" value="{$row.category_id}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-category_ids" class="control-label col-xs-12 col-sm-2">{:__('Category_ids')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-category_ids" data-rule="required" data-source="category/selectpage" data-params='{"custom[type]":""}' data-multiple="true" class="form-control selectpage" name="row[category_ids]" type="text" value="{$row.category_ids}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-user_id" class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-user_id" data-rule="required" data-source="user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-user_ids" class="control-label col-xs-12 col-sm-2">{:__('User_ids')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-user_ids" data-rule="required" data-source="user/index" data-multiple="true" data-field="nickname" class="form-control selectpage" name="row[user_ids]" type="text" value="{$row.user_ids}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-week" class="control-label col-xs-12 col-sm-2">{:__('Week')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- <select id="c-week" data-rule="required" class="form-control selectpicker" name="row[week]">
- {foreach name="weekList" item="vo"}
- <option value="{$key}" {in name="key" value="$row.week"}selected{/in}>{$vo}</option>
- {/foreach}
- </select>
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- <select id="c-flag" data-rule="required" class="form-control selectpicker" multiple="" name="row[flag][]">
- {foreach name="flagList" item="vo"}
- <option value="{$key}" {in name="key" value="$row.flag"}selected{/in}>{$vo}</option>
- {/foreach}
- </select>
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-genderdata" class="control-label col-xs-12 col-sm-2">{:__('Genderdata')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="genderdataList" item="vo"}
- <label for="row[genderdata]-{$key}"><input id="row[genderdata]-{$key}" name="row[genderdata]" type="radio" value="{$key}" {in name="key" value="$row.genderdata"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-hobbydata" class="control-label col-xs-12 col-sm-2">{:__('Hobbydata')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="hobbydataList" item="vo"}
- <label for="row[hobbydata][]-{$key}"><input id="row[hobbydata][]-{$key}" name="row[hobbydata][]" type="checkbox" value="{$key}" {in name="key" value="$row.hobbydata"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea id="c-content" data-rule="required" class="form-control summernote" rows="5" name="row[content]" cols="50">{$row.content}</textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image}">
- <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
- <ul class="row list-inline plupload-preview" id="p-image"></ul>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-images" class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images}">
- <span><button type="button" id="plupload-images" class="btn btn-danger plupload" data-input-id="c-images" data-mimetype="image/*" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
- <ul class="row list-inline plupload-preview" id="p-images"></ul>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-attachfile" class="control-label col-xs-12 col-sm-2">{:__('Attachfile')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-attachfile" data-rule="required" class="form-control" size="50" name="row[attachfile]" type="text" value="{$row.attachfile}">
- <span><button type="button" id="plupload-attachfile" class="btn btn-danger plupload" data-input-id="c-attachfile" data-multiple="false"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-attachfile" class="btn btn-primary fachoose" data-input-id="c-attachfile" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-keywords" data-rule="required" class="form-control" name="row[keywords]" type="text" value="{$row.keywords}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-description" class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-description" data-rule="required" class="form-control" name="row[description]" type="text" value="{$row.description}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-price" class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-views" class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-views" class="form-control" name="row[views]" type="number" value="{$row.views}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-startdate" class="control-label col-xs-12 col-sm-2">{:__('Startdate')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-startdate" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[startdate]" type="text" value="{$row.startdate}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-activitytime" class="control-label col-xs-12 col-sm-2">{:__('Activitytime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-activitytime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[activitytime]" type="text" value="{$row.activitytime}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-year" class="control-label col-xs-12 col-sm-2">{:__('Year')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-year" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY" data-use-current="true" name="row[year]" type="text" value="{$row.year}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-times" class="control-label col-xs-12 col-sm-2">{:__('Times')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-times" data-rule="required" class="form-control datetimepicker" data-date-format="HH:mm:ss" data-use-current="true" name="row[times]" type="text" value="{$row.times}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-refreshtime" class="control-label col-xs-12 col-sm-2">{:__('Refreshtime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-refreshtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refreshtime]" type="text" value="{$row.refreshtime|datetime}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="statusList" item="vo"}
- <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group">
- <label for="c-state" class="control-label col-xs-12 col-sm-2">{:__('State')}:</label>
- <div class="col-xs-12 col-sm-8">
-
- {foreach name="stateList" item="vo"}
- <label for="row[state]-{$key}"><input id="row[state]-{$key}" name="row[state]" type="radio" value="{$key}" {in name="key" value="$row.state"}checked{/in} /> {$vo}</label>
- {/foreach}
-
- </div>
- </div>
- <div class="form-group layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/example/bootstraptable/detail.html b/application/admin/view/example/bootstraptable/detail.html
deleted file mode 100644
index 07c0ee5..0000000
--- a/application/admin/view/example/bootstraptable/detail.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<table class="table table-striped">
- <thead>
- <tr>
- <th>{:__('Title')}</th>
- <th>{:__('Content')}</th>
- </tr>
- </thead>
- <tbody>
- {volist name="row" id="vo" }
- <tr>
- <td>{$key}</td>
- <td>{$vo}</td>
- </tr>
- {/volist}
- </tbody>
-</table>
-<div class="hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="reset" class="btn btn-primary btn-embossed btn-close" onclick="Layer.closeAll();">{:__('Close')}</button>
- </div>
-</div>
\ 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 81e78ec..0000000
--- a/application/admin/view/example/bootstraptable/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar('refresh,delete')}
- <a class="btn btn-info btn-disabled disabled btn-selected" href="javascript:;"><i class="fa fa-leaf"></i> 获取选中项</a>
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> <?= __('More') ?></a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- <a class="btn btn-success btn-singlesearch" href="javascript:;"><i class="fa fa-user"></i> 自定义搜索</a>
- <a class="btn btn-success btn-change btn-start" data-params="action=start" data-url="example/bootstraptable/change" href="javascript:;"><i class="fa fa-play"></i> 启动</a>
- <a class="btn btn-danger btn-change btn-pause" data-params="action=pause" data-url="example/bootstraptable/change" href="javascript:;"><i class="fa fa-pause"></i> 暂停</a>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
- </table>
-
- </div>
- </div>
-
- </div>
- </div>
-</div>
\ 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 8d61a3a..0000000
--- a/application/admin/view/example/colorbadge/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar('refresh,delete')}
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
- </table>
-
-
- </div>
- </div>
-
- </div>
- </div>
-</div>
\ 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 8d61a3a..0000000
--- a/application/admin/view/example/controllerjump/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar('refresh,delete')}
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
- </table>
-
-
- </div>
- </div>
-
- </div>
- </div>
-</div>
\ 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 478bf5a..0000000
--- a/application/admin/view/example/cxselect/index.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<style>#cxselect-example textarea{margin:10px 0;}</style>
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding" id="cxselect-example">
- <form id="cxselectform" action="">
- <div class="row">
- <div class="col-md-6">
-
- <div class="panel panel-default">
- <div class="panel-heading"><b>省市区联动</b>(通过AJAX读取数据)</div>
- <div class="panel-body">
- <div class="row">
- <div class="col-xs-9">
- <div class="form-inline" data-toggle="cxselect" data-selects="province,city,area">
- <select class="province form-control" name="province" data-url="ajax/area"></select>
- <select class="city form-control" name="city" data-url="ajax/area"></select>
- <select class="area form-control" name="area" data-url="ajax/area"></select>
- </div>
- </div>
- <div class="col-xs-3 text-right">
- <h6><label class="label label-primary"><i class="fa fa-pencil"></i> 增加</label></h6>
- </div>
- <div class="col-xs-12">
- <textarea class="form-control" rows="8">
- </textarea>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-9">
- <div class="form-inline" data-toggle="cxselect" data-selects="province,city,area">
- <select class="province form-control" name="province" data-url="ajax/area">
- <option value="1964" selected>广东省</option>
- </select>
- <select class="city form-control" name="city" data-url="ajax/area">
- <option value="1988" selected>深圳市</option>
- </select>
- <select class="area form-control" name="area" data-url="ajax/area">
- <option value="1991" selected>南山区</option>
- </select>
- </div>
- </div>
- <div class="col-xs-3 text-right">
- <h6><label class="label label-success"><i class="fa fa-edit"></i> 修改</label></h6>
- </div>
- <div class="col-xs-12">
- <textarea class="form-control" rows="8">
- </textarea>
- </div>
- </div>
- </div>
-
- </div>
- </div>
- <div class="col-md-6">
- <div class="panel panel-default">
- <div class="panel-heading"><b>类别联动</b>(Ajax读取数据)</div>
- <div class="panel-body">
- <div class="row">
- <div class="col-xs-9">
- <div class="form-inline" data-toggle="cxselect" data-selects="first,second">
- <select class="first form-control" name="first" data-url="ajax/category?type=page&pid=5"></select>
- <select class="second form-control" name="second" data-url="ajax/category" data-query-name="pid"></select>
- </div>
- </div>
- <div class="col-xs-3 text-right">
- <h6><label class="label label-primary"><i class="fa fa-pencil"></i> 增加</label></h6>
- </div>
- <div class="col-xs-12">
- <textarea class="form-control" rows="8">
- </textarea>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-9">
- <div class="form-inline" data-toggle="cxselect" data-selects="first,second">
- <select class="first form-control" name="first" data-url="ajax/category?type=page&pid=5">
- <option value="6" selected>网站建站</option>
- </select>
- <select class="second form-control" name="second" data-url="ajax/category" data-query-name="pid">
- <option value="9" selected>移动端</option>
- </select>
- </div>
- </div>
- <div class="col-xs-3 text-right">
- <h6><label class="label label-success"><i class="fa fa-edit"></i> 修改</label></h6>
- </div>
- <div class="col-xs-12">
- <textarea class="form-control" rows="8">
- </textarea>
- </div>
- </div>
-
- </div>
- </div>
- </div>
- <div class="col-md-6">
- <div class="panel panel-default">
- <div class="panel-heading"><b>省市区联动</b>(通过JSON渲染数据)</div>
- <div class="panel-body">
- <div class="row">
- <div class="col-xs-9">
- <!--由于在初始化中修改了默认值,所以这里需要修改-jsonSpace/jsonValue/jsonName的值-->
- <div class="form-inline" data-toggle="cxselect" data-url="__CDN__/assets/libs/jquery-cxselect/js/cityData.min.json"
- data-selects="province,city,area" data-json-space="" data-json-name="n" data-json-value="">
- <select class="province form-control" name="province"></select>
- <select class="city form-control" name="city"></select>
- <select class="area form-control" name="area"></select>
- </div>
- </div>
- <div class="col-xs-3 text-right">
- <h6><label class="label label-primary"><i class="fa fa-pencil"></i> 增加</label></h6>
- </div>
- <div class="col-xs-12">
- <textarea class="form-control" rows="8">
- </textarea>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-9">
- <!--由于在初始化中修改了默认值,所以这里需要修改-jsonSpace/jsonValue/jsonName的值-->
- <div class="form-inline" data-toggle="cxselect" data-url="__CDN__/assets/libs/jquery-cxselect/js/cityData.min.json"
- data-selects="province,city,area" data-json-space="" data-json-name="n" data-json-value="">
- <select class="province form-control" data-first-title="选择省">
- <option value="">请选择</option>
- <option value="浙江省" selected>浙江省</option>
- </select>
- <select class="city form-control" data-first-title="选择市">
- <option value="">请选择</option>
- <option value="杭州市" selected>杭州市</option>
- </select>
- <select class="area form-control" data-first-title="选择地区">
- <option value="">请选择</option>
- <option value="西湖区" selected>西湖区</option>
- </select>
- </div>
- </div>
- <div class="col-xs-3 text-right">
- <h6><label class="label label-success"><i class="fa fa-edit"></i> 修改</label></h6>
- </div>
- <div class="col-xs-12">
- <textarea class="form-control" rows="8">
- </textarea>
- </div>
- </div>
- </div>
-
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
-
- </div>
- </div>
-</div>
\ 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 3ada81e..0000000
--- a/application/admin/view/example/multitable/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div class="row">
- <div class="col-md-6">
- <div id="toolbar1" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table1" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- <div class="col-md-6">
- <div id="toolbar2" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table2" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/example/relationmodel/index.html b/application/admin/view/example/relationmodel/index.html
deleted file mode 100644
index c1f4483..0000000
--- a/application/admin/view/example/relationmodel/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar('delete')}
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
- </table>
-
-
- </div>
- </div>
-
- </div>
- </div>
-</div>
\ 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 4d470e6..0000000
--- a/application/admin/view/example/tabletemplate/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar('refresh,delete')}
- <a class="btn btn-info btn-disabled disabled btn-selected" href="javascript:;"><i class="fa fa-leaf"></i> 获取选中项</a>
- <a class="btn btn-success btn-toggle-view" href="javascript:;"><i class="fa fa-leaf"></i> 切换视图</a>
- </div>
- <table id="table" class="table table-striped table-hover" width="100%">
-
- </table>
-
- </div>
- </div>
-
- </div>
- </div>
-</div>
-<style type="text/css">
- .example {
- height:100%;position: relative;
- }
- .example > span {
- position:absolute;left:15px;top:15px;
- }
-</style>
-
-<script id="itemtpl" type="text/html">
- <!--
- 如果启用了templateView,默认调用的是itemtpl这个模板，可以通过设置templateFormatter来修改
- 在当前模板中可以使用三个变量(item:行数据,i:当前第几行,data:所有的行数据)
- 此模板引擎使用的是art-template的native,可参考官方文档
- -->
-
- <div class="col-sm-4 col-md-3">
- <!--下面四行是为了展示随机图片和标签，可移除-->
- <% var imagearr = ['https://ws2.sinaimg.cn/large/006tNc79gy1fgphwokqt9j30dw0990tb.jpg', 'https://ws2.sinaimg.cn/large/006tNc79gy1fgphwt8nq8j30e609f3z4.jpg', 'https://ws1.sinaimg.cn/large/006tNc79gy1fgphwn44hvj30go0b5myb.jpg', 'https://ws1.sinaimg.cn/large/006tNc79gy1fgphwnl37mj30dw09agmg.jpg', 'https://ws3.sinaimg.cn/large/006tNc79gy1fgphwqsvh6j30go0b576c.jpg']; %>
- <% var image = imagearr[item.id % 5]; %>
- <% var labelarr = ['primary', 'success', 'info', 'danger', 'warning']; %>
- <% var label = labelarr[item.id % 5]; %>
- <div class="thumbnail example">
- <span class="btn btn-<%=label%>">ID:<%=item.id%></span>
- <img src="<%=image%>" class="img-responsive" alt="<%=item.title%>">
- <div class="caption">
- <h4><%=item.title?item.title:'无'%></h4>
- <p class="text-muted">操作者IP:<%=item.ip%></p>
- <p class="text-muted">操作时间:<%=Moment(item.createtime*1000).format("YYYY-MM-DD HH:mm:ss")%></p>
- <p>
- <!--详情的事件需要在JS中手动绑定-->
- <a href="#" class="btn btn-primary btn-success btn-detail" data-id="<%=item.id%>"><i class="fa fa-camera"></i> 详情</a>
-
- <!--如果需要响应编辑或删除事件，可以给元素添加 btn-edit或btn-del的类和data-id这个属性值-->
- <a href="#" class="btn btn-primary btn-edit" data-id="<%=item.id%>"><i class="fa fa-pencil"></i> 编辑</a>
- <a href="#" class="btn btn-danger btn-del" data-id="<%=item.id%>"><i class="fa fa-times"></i> 删除</a>
- <span class="pull-right" style="margin-top:10px;">
- <!--如果需要多选操作，请确保有下面的checkbox元素存在,可移除-->
- <input name="checkbox" data-id="<%=item.id%>" type="checkbox" />
- </span>
- </p>
- </div>
- </div>
- </div>
-</script>
\ 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 095a60e..0000000
--- a/application/admin/view/general/configvalue/add.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">ID:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="id" name="row[id]" value="" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="name" name="row[name]" value="" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <dl class="fieldlist" rel="1">
- <dd>
- <ins>{:__('Key')}</ins>
- <ins>{:__('Value')}</ins>
- </dd>
- <dd>
- <input type="text" name="field[0]" class="form-control" id="field-0" value="" size="10" required />
- <input type="text" name="value[0]" class="form-control" id="value-0" value="" size="40" required />
- <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
- <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span>
- </dd>
- <dd><a href="javascript:;" class="append btn btn-sm btn-success"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
- </dl>
- </div>
- </div>
- <div class="form-group">
- <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="weigh" name="row[weigh]" value="0" data-rule="required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group hidden layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-
-</form>
diff --git a/application/admin/view/general/configvalue/edit.html b/application/admin/view/general/configvalue/edit.html
deleted file mode 100644
index dfd1e28..0000000
--- a/application/admin/view/general/configvalue/edit.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">ID:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="id" name="row[id]" value="{$row.id}" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="name" name="row[name]" value="{$row.name}" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <dl class="fieldlist" rel="{$row.content|count}">
- <dd>
- <ins>{:__('Key')}</ins>
- <ins>{:__('Value')}</ins>
- </dd>
- {foreach $row.content as $key => $vo}
- <dd class="form-inline">
- <input type="text" name="field[{$key}]" class="form-control" id="field-{$key}" value="{$key}" size="10" />
- <input type="text" name="value[{$key}]" class="form-control" id="value-{$key}" value="{$vo}" size="40" />
- <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
- <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span>
- </dd>
- {/foreach}
- <dd><a href="javascript:;" class="append btn btn-sm btn-success"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
- </dl>
- </div>
- </div>
- <div class="form-group">
- <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-2">
- <input type="text" class="form-control" id="weigh" name="row[weigh]" value="{$row.weigh}" data-rule="required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hidden layer-footer">
- <div class="col-xs-2"></div>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/general/configvalue/index.html b/application/admin/view/general/configvalue/index.html
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/general/configvalue/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/general/crontab/add.html b/application/admin/view/general/crontab/add.html
deleted file mode 100644
index 826e56b..0000000
--- a/application/admin/view/general/crontab/add.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<style type="text/css">
- #schedulepicker {
- padding-top:7px;
- }
-</style>
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="title" name="row[title]" value="" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_select('row[type]', $typedata, null, ['class'=>'form-control', 'data-rule'=>'required'])}
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea name="row[content]" id="conent" cols="30" rows="5" class="form-control" data-rule="required"></textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="schedule" class="control-label col-xs-12 col-sm-2">{:__('Schedule')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="schedule" style="font-size:12px;font-family: Verdana;word-spacing:23px;" name="row[schedule]" value="* * * * *" data-rule="required; remote(general/crontab/check_schedule)" />
- <div id="schedulepicker">
- <pre><code>* * * * *
-- - - - -
-| | | | +--- day of week (0 - 7) (Sunday=0 or 7)
-| | | +-------- month (1 - 12)
-| | +------------- day of month (1 - 31)
-| +------------------ hour (0 - 23)
-+----------------------- min (0 - 59)</code></pre>
- <h5>{:__('The next %s times the execution time', '<input type="number" id="pickdays" class="form-control text-center" value="7" style="display: inline-block;width:80px;">')}</h5>
- <ol id="scheduleresult" class="list-group">
- </ol>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="maximums" class="control-label col-xs-12 col-sm-2">{:__('Maximums')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="number" class="form-control" id="maximums" name="row[maximums]" value="0" data-rule="required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="begintime" class="control-label col-xs-12 col-sm-2">{:__('Begin time')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="text" class="form-control datetimepicker" id="begintime" name="row[begintime]" value="" data-rule="{:__('Begin time')}:required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="endtime" class="control-label col-xs-12 col-sm-2">{:__('End time')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="text" class="form-control datetimepicker" id="endtime" name="row[endtime]" value="" data-rule="{:__('End time')}:required;match(gte, row[begintime], datetime)" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="text" class="form-control" id="weigh" name="row[weigh]" value="0" data-rule="required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-
-</form>
diff --git a/application/admin/view/general/crontab/edit.html b/application/admin/view/general/crontab/edit.html
deleted file mode 100644
index caa2aea..0000000
--- a/application/admin/view/general/crontab/edit.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<style type="text/css">
- #schedulepicker {
- padding-top:7px;
- }
-</style>
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="title" name="row[title]" value="{$row.title}" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_select('row[type]', $typedata, $row['type'], ['class'=>'form-control', 'data-rule'=>'required'])}
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea name="row[content]" id="conent" cols="30" rows="5" class="form-control" data-rule="required">{$row.content}</textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="schedule" class="control-label col-xs-12 col-sm-2">{:__('Schedule')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="schedule" style="font-size:12px;font-family: Verdana;word-spacing:23px;" name="row[schedule]" value="{$row.schedule}" data-rule="required; remote(general/crontab/check_schedule)" />
- <div id="schedulepicker">
- <pre><code>* * * * *
-- - - - -
-| | | | +--- day of week (0 - 7) (Sunday=0 or 7)
-| | | +-------- month (1 - 12)
-| | +------------- day of month (1 - 31)
-| +------------------ hour (0 - 23)
-+----------------------- min (0 - 59)</code></pre>
- <h5>{:__('The next %s times the execution time', '<input type="number" id="pickdays" class="form-control text-center" value="7" style="display: inline-block;width:80px;">')}</h5>
- <ol id="scheduleresult" class="list-group">
- </ol>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="maximums" class="control-label col-xs-12 col-sm-2">{:__('Maximums')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="number" class="form-control" id="maximums" name="row[maximums]" value="{$row.maximums}" data-rule="required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="begintime" class="control-label col-xs-12 col-sm-2">{:__('Begin time')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="text" class="form-control datetimepicker" id="begintime" name="row[begintime]" value="{$row.begintime|datetime}" data-rule="{:__('Begin time')}:required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="endtime" class="control-label col-xs-12 col-sm-2">{:__('End time')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="text" class="form-control datetimepicker" id="endtime" name="row[endtime]" value="{$row.endtime|datetime}" data-rule="{:__('End time')}:required;match(gte, row[begintime], datetime)" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label for="weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-4">
- <input type="text" class="form-control" id="weigh" name="row[weigh]" value="{$row.weigh}" data-rule="required" size="6" />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-
-</form>
diff --git a/application/admin/view/general/crontab/index.html b/application/admin/view/general/crontab/index.html
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/general/crontab/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/general/database/index.html b/application/admin/view/general/database/index.html
deleted file mode 100644
index aaabdd5..0000000
--- a/application/admin/view/general/database/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<style type="text/css">
- #searchfloat {position:absolute;top:40px;right:20px;background:#F7F0A0;padding:10px;}
- #saved {position: relative;}
- #saved_sql {position:absolute;bottom:0;height:300px;background:#F7F0A0;width:100%;overflow:auto;display:none;}
- #saved_sql li {display:block;clear:both;width:100%;float:left;line-height:18px;padding:1px 0}
- #saved_sql li a{float:left;text-decoration: none;display:block;padding:0 5px;}
- #saved_sql li i{display:none;float:left;color:#06f;font-size: 14px;font-style: normal;margin-left:2px;line-height:18px;}
- #saved_sql li:hover{background:#fff;}
- #saved_sql li:hover i{display:block;cursor:pointer;}
- #database #tablename {height:205px;width:100%;padding:5px;}
- #database #tablename option{height:18px;}
- #database #subaction {height:210px;width:100%;}
- #database .select-striped > option:nth-of-type(odd) {background-color: #f9f9f9;}
- #database .dropdown-menu ul {margin:-3px 0;}
- #database .dropdown-menu ul li{margin:3px 0;}
- #database .dropdown-menu.row .col-xs-6{padding:0 5px;}
- #sqlquery {font-size:12px;color:#444;}
- #resultparent {padding:5px;}
-</style>
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="database" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
-
- <div class="row">
- <div class="col-xs-4">
- <h4>{:__('SQL Result')}:</h4>
- </div>
- <div class="col-xs-8 text-right">
- <form action="{:url('general.database/query')}" method="post" name="infoform" target="resultframe">
- <input type="hidden" name="do_action" id="topaction" />
-
- <div class="btn-group">
- <button data-toggle="dropdown" class="btn btn-primary btn-embossed dropdown-toggle" type="button">{:__('Basic query')} <span class="caret"></span></button>
- <div class="row dropdown-menu pull-right" style="width:300px;">
- <div class="col-xs-6">
- <select class="form-control select-striped" id="tablename" name="tablename[]" multiple="multiple">
- {foreach $tables as $table}
- <option value="{$table.name}" title="">{$table.name}<!--({$table.rows})--></option>
- {/foreach}
- </select>
- </div>
- <div class="col-xs-6">
- <ul id="subaction" class="list-unstyled">
- <li><input type="submit" name="submit1" value="{:__('View structure')}" rel="viewinfo" class="btn btn-primary btn-embossed btn-sm btn-block"/></li>
- <li><input type="submit" name="submit2" value="{:__('View data')}" rel="viewdata" class="btn btn-primary btn-embossed btn-sm btn-block"/></li>
- <li><input type="submit" name="submit3" value="{:__('Optimize')}" rel="optimize" class="btn btn-primary btn-embossed btn-sm btn-block" /></li>
- <li><input type="submit" name="submit4" value="{:__('Repair')}" rel="repair" class="btn btn-primary btn-embossed btn-sm btn-block"/></li>
- <li><input type="submit" name="submit5" value="{:__('Optimize all')}" rel="optimizeall" class="btn btn-primary btn-embossed btn-sm btn-block" /></li>
- <li><input type="submit" name="submit6" value="{:__('Repair all')}" rel="repairall" class="btn btn-primary btn-embossed btn-sm btn-block" /></li>
- </ul>
- </div>
- <div class="clear"></div>
- </div>
-
- </div>
- </form>
- </div>
-
- </div>
- <div class="well" id="resultparent">
- <iframe name="resultframe" frameborder="0" id="resultframe" style="height:100%;" width="100%" height="100%"></iframe>
- </div>
- <form action="{:url('general.database/query')}" method="post" id="sqlexecute" name="form1" target="resultframe">
- <input type="hidden" name="do_action" value="doquery" />
- <div class="form-group">
- <textarea name="sqlquery" placeholder="{:__('Executes one or multiple queries which are concatenated by a semicolon')}" cols="60" rows="5" class="form-control" id="sqlquery"></textarea>
- </div>
-
- <input type="submit" class="btn btn-success btn-embossed" value="{:__('Execute')}" />
- <input type="reset" class="btn btn-default btn-embossed" value="{:__('Reset')}" />
- </form>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/index.html b/application/admin/view/index.html
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html
index d985f90..d0f2cc6 100644
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -6,7 +6,7 @@
<style type="text/css">
body {
color:#999;
- background:url('http://img.infinitynewtab.com/wallpaper/{:date("Ymd")%4000}.jpg');
+ background:url('{$background}');
background-size:cover;
}
a {
@@ -54,16 +54,6 @@
}
</style>
- <script>
- //此处为FastAdmin的统计代码,正式使用请移除
- var _hmt = _hmt || [];
- (function () {
- var hm = document.createElement("script");
- hm.src = "https://hm.baidu.com/hm.js?58347d769d009bcf6074e9a0ab7ba05e";
- var s = document.getElementsByTagName("script")[0];
- s.parentNode.insertBefore(hm, s);
- })();
- </script>
</head>
<body>
<div class="container">
diff --git a/application/admin/view/page/add.html b/application/admin/view/page/add.html
deleted file mode 100644
index 3304c70..0000000
--- a/application/admin/view/page/add.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="c-category_id" class="control-label col-xs-12 col-sm-2">{:__('Category')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-category_id" class="form-control selectpage" data-source="category/selectpage" data-params='{"custom[type]":"page"}' name="row[category_id]" type="text" value="" data-rule="required">
- </div>
- </div>
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-title" class="form-control" name="row[title]" type="text" value="" data-rule="required" >
- </div>
- </div>
- <div class="form-group">
- <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-keywords" class="form-control" name="row[keywords]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], null, ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])}
- </div>
- </div>
- <div class="form-group">
- <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="" data-rule="required">
- <span><button id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-multiple="false" data-input-id="c-image"><i class="fa fa-list-ul"></i> {:__('Choose')}</button></span>
- <ul class="row list-inline plupload-preview" id="p-image"></ul>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea id="c-content" class="form-control summernote" name="row[content]" cols="50" rows="10"></textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="c-icon" class="control-label col-xs-12 col-sm-2">{:__('Icon')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-icon" class="form-control" name="row[icon]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-views" class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-views" class="form-control" name="row[views]" type="text" value="0">
- </div>
- </div>
- <div class="form-group">
- <label for="c-comments" class="control-label col-xs-12 col-sm-2">{:__('Comments')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-comments" class="form-control" name="row[comments]" type="number" value="0">
- </div>
- </div>
- <div class="form-group">
- <label for="c-weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
- </div>
- </div>
- <div class="form-group">
- <label for="c-status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/page/edit.html b/application/admin/view/page/edit.html
deleted file mode 100644
index abb2647..0000000
--- a/application/admin/view/page/edit.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-category_id" class="control-label col-xs-12 col-sm-2">{:__('Category')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-category_id" class="form-control selectpage" data-source="category/selectpage" data-params='{"custom[type]":"page"}' name="row[category_id]" type="text" value="{$row.category_id}" data-rule="required">
- </div>
- </div>
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title}" data-rule="required" >
- </div>
- </div>
- <div class="form-group">
- <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-keywords" class="form-control" name="row[keywords]" type="text" value="{$row.keywords}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-flag" class="control-label col-xs-12 col-sm-2">{:__('Flag')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])}
- </div>
- </div>
- <div class="form-group">
- <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image}">
- <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-multiple="false" data-input-id="c-image" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-multiple="false" data-input-id="c-image"><i class="fa fa-list-ul"></i> {:__('Choose')}</button></span>
- <ul class="row list-inline plupload-preview" id="p-image"></ul>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea id="c-content" class="form-control summernote" name="row[content]" cols="50" rows="10">{$row.content}</textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="c-icon" class="control-label col-xs-12 col-sm-2">{:__('Icon')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-icon" class="form-control" name="row[icon]" type="text" value="{$row.icon}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-views" class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-views" class="form-control" name="row[views]" type="number" value="{$row.views}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-comments" class="control-label col-xs-12 col-sm-2">{:__('Comments')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-comments" class="form-control" name="row[comments]" type="number" value="{$row.comments}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/page/index.html b/application/admin/view/page/index.html
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/page/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/user/third/add.phtml b/application/admin/view/user/third/add.phtml
deleted file mode 100644
index b0b6189..0000000
--- a/application/admin/view/user/third/add.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="c-user_id" class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[user_id]" value="0" id="c-user_id" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-platform" class="control-label col-xs-12 col-sm-2">{:__('Platform')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_select("row[{'platform'}]", 'weibo,wechat,qq', "", ['id' => 'c-platform', 'class' => 'form-control selectpicker', 'multiple', 'required'])}
- </div>
- </div>
- <div class="form-group">
- <label for="c-openid" class="control-label col-xs-12 col-sm-2">{:__('Openid')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[openid]" value="" id="c-openid" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-openname" class="control-label col-xs-12 col-sm-2">{:__('Openname')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[openname]" value="" id="c-openname" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-access_token" class="control-label col-xs-12 col-sm-2">{:__('Access_token')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[access_token]" value="" id="c-access_token" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-refresh_token" class="control-label col-xs-12 col-sm-2">{:__('Refresh_token')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[refresh_token]" value="" id="c-refresh_token" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-expires_in" class="control-label col-xs-12 col-sm-2">{:__('Expires_in')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[expires_in]" value="0" id="c-expires_in" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[logintime]" value="0" id="c-logintime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-expiretime" class="control-label col-xs-12 col-sm-2">{:__('Expiretime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[expiretime]" value="0" id="c-expiretime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-
-</form>
diff --git a/application/admin/view/user/third/edit.phtml b/application/admin/view/user/third/edit.phtml
deleted file mode 100644
index c89ccde..0000000
--- a/application/admin/view/user/third/edit.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-user_id" class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[user_id]" value="{$row.user_id}" id="c-user_id" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-platform" class="control-label col-xs-12 col-sm-2">{:__('Platform')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_select("row[platform]", 'weibo,wechat,qq', $row['platform'], ['id' => 'c-platform', 'class' => 'form-control selectpicker', 'multiple', 'required']);}
- </div>
- </div>
- <div class="form-group">
- <label for="c-openid" class="control-label col-xs-12 col-sm-2">{:__('Openid')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[openid]" value="{$row.openid}" id="c-openid" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-openname" class="control-label col-xs-12 col-sm-2">{:__('Openname')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[openname]" value="{$row.openname}" id="c-openname" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-access_token" class="control-label col-xs-12 col-sm-2">{:__('Access_token')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[access_token]" value="{$row.access_token}" id="c-access_token" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-refresh_token" class="control-label col-xs-12 col-sm-2">{:__('Refresh_token')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[refresh_token]" value="{$row.refresh_token}" id="c-refresh_token" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-expires_in" class="control-label col-xs-12 col-sm-2">{:__('Expires_in')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[expires_in]" value="{$row.expires_in}" id="c-expires_in" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[logintime]" value="{$row.logintime|datetime}" id="c-logintime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-expiretime" class="control-label col-xs-12 col-sm-2">{:__('Expiretime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[expiretime]" value="{$row.expiretime|datetime}" id="c-expiretime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/user/third/index.phtml b/application/admin/view/user/third/index.phtml
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/user/third/index.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/user/user/add.phtml b/application/admin/view/user/user/add.phtml
deleted file mode 100644
index a980345..0000000
--- a/application/admin/view/user/user/add.phtml
+++ /dev/null
@@ -1,193 +0,0 @@
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="c-partner_id" class="control-label col-xs-12 col-sm-2">{:__('Partner_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[partner_id]" value="" id="c-partner_id" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-role_id" class="control-label col-xs-12 col-sm-2">{:__('Role_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[role_id]" value="0" id="c-role_id" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-area_id" class="control-label col-xs-12 col-sm-2">{:__('Area_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[area_id]" value="0" id="c-area_id" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-editor_id" class="control-label col-xs-12 col-sm-2">{:__('Editor_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[editor_id]" value="0" id="c-editor_id" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-editor_id" class="control-label col-xs-12 col-sm-2">{:__('Wx_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[wx_id]" value="" id="c-wx_id" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-level" class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[level]" value="0" id="c-level" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-star" class="control-label col-xs-12 col-sm-2">{:__('Star')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[star]" value="0" id="c-star" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[username]" value="" id="c-username" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[nickname]" value="" id="c-nickname" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[password]" value="" id="c-password" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-salt" class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[salt]" value="" id="c-salt" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[email]" value="" id="c-email" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[mobile]" value="" id="c-mobile" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input type="text" name="row[avatar]" value="" id="c-avatar" class="form-control" required size="50" />
- <span><button id="plupload-avatar" class="btn btn-danger plupload" data-input-id="c-avatar"><i class="fa fa-upload"></i> {:__("Upload")}</button></span>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[gender]" value="0" id="c-gender" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-birthday" class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[birthday]" value="" id="c-birthday" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-score" class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[score]" value="0" id="c-score" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-feeds" class="control-label col-xs-12 col-sm-2">{:__('Feeds')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[feeds]" value="0" id="c-feeds" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-follows" class="control-label col-xs-12 col-sm-2">{:__('Follows')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[follows]" value="0" id="c-follows" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-fans" class="control-label col-xs-12 col-sm-2">{:__('Fans')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[fans]" value="0" id="c-fans" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-prevtime" class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[prevtime]" value="0" id="c-prevtime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-loginfailure" class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[loginfailure]" value="0" id="c-loginfailure" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[logintime]" value="0" id="c-logintime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-loginip" class="control-label col-xs-12 col-sm-2">{:__('Loginip')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[loginip]" value="" id="c-loginip" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-joinip" class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[joinip]" value="" id="c-joinip" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-jointime" class="control-label col-xs-12 col-sm-2">{:__('Jointime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[jointime]" value="0" id="c-jointime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-address" class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[address]" value="" id="c-address" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-receiver" class="control-label col-xs-12 col-sm-2">{:__('Receiver')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[receiver]" value="" id="c-receiver" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-token" class="control-label col-xs-12 col-sm-2">{:__('Token')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[token]" value="" id="c-token" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-
-</form>
diff --git a/application/admin/view/user/user/edit.phtml b/application/admin/view/user/user/edit.phtml
deleted file mode 100644
index b4579aa..0000000
--- a/application/admin/view/user/user/edit.phtml
+++ /dev/null
@@ -1,187 +0,0 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-partner_id" class="control-label col-xs-12 col-sm-2">{:__('Partner_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[partner_id]" value="{$row.partner_id}" id="c-partner_id" class="form-control "required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-role_id" class="control-label col-xs-12 col-sm-2">{:__('Role_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[role_id]" value="{$row.role_id}" id="c-role_id" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-area_id" class="control-label col-xs-12 col-sm-2">{:__('Area_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[area_id]" value="{$row.area_id}" id="c-area_id" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-editor_id" class="control-label col-xs-12 col-sm-2">{:__('Editor_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[editor_id]" value="{$row.editor_id}" id="c-editor_id" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-editor_id" class="control-label col-xs-12 col-sm-2">{:__('Wx_id')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[wx_id]" value="{$row.wx_id}" id="c-wx_id" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-level" class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[level]" value="{$row.level}" id="c-level" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-star" class="control-label col-xs-12 col-sm-2">{:__('Star')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[star]" value="{$row.star}" id="c-star" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[username]" value="{$row.username}" id="c-username" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[nickname]" value="{$row.nickname}" id="c-nickname" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[password]" value="{$row.password}" id="c-password" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-salt" class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[salt]" value="{$row.salt}" id="c-salt" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[email]" value="{$row.email}" id="c-email" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[mobile]" value="{$row.mobile}" id="c-mobile" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="form-inline">
- <input type="text" name="row[avatar]" value="{$row.avatar}" id="c-avatar" class="form-control" required size="50" />
- <span><button id="plupload-avatar" class="btn btn-danger plupload" data-input-id="c-avatar"><i class="fa fa-upload"></i> {:__("Upload")}</button></span>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[gender]" value="{$row.gender}" id="c-gender" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-birthday" class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[birthday]" value="{$row.birthday}" id="c-birthday" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-score" class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[score]" value="{$row.score}" id="c-score" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-feeds" class="control-label col-xs-12 col-sm-2">{:__('Feeds')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[feeds]" value="{$row.feeds}" id="c-feeds" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-follows" class="control-label col-xs-12 col-sm-2">{:__('Follows')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[follows]" value="{$row.follows}" id="c-follows" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-fans" class="control-label col-xs-12 col-sm-2">{:__('Fans')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[fans]" value="{$row.fans}" id="c-fans" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-loginfailure" class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="number" name="row[loginfailure]" value="{$row.loginfailure}" id="c-loginfailure" class="form-control " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[logintime]" value="{$row.logintime|datetime}" id="c-logintime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-loginip" class="control-label col-xs-12 col-sm-2">{:__('Loginip')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[loginip]" value="{$row.loginip}" id="c-loginip" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-joinip" class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[joinip]" value="{$row.joinip}" id="c-joinip" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label for="c-jointime" class="control-label col-xs-12 col-sm-2">{:__('Jointime')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="datetime" name="row[jointime]" value="{$row.jointime|datetime}" id="c-jointime" class="form-control datetimepicker " />
- </div>
- </div>
- <div class="form-group">
- <label for="c-address" class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[address]" value="{$row.address}" id="c-address" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-receiver" class="control-label col-xs-12 col-sm-2">{:__('Receiver')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[receiver]" value="{$row.receiver}" id="c-receiver" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-token" class="control-label col-xs-12 col-sm-2">{:__('Token')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[token]" value="{$row.token}" id="c-token" class="form-control" required />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/user/user/index.phtml b/application/admin/view/user/user/index.phtml
deleted file mode 100644
index 43c6636..0000000
--- a/application/admin/view/user/user/index.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/version/add.html b/application/admin/view/version/add.html
deleted file mode 100644
index 6887392..0000000
--- a/application/admin/view/version/add.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<style>
- .content {
- padding-bottom:50px;
- }
-</style>
-
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-oldversion" class="control-label col-xs-12 col-sm-2">{:__('Oldversion')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-oldversion" class="form-control" name="row[oldversion]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-newversion" class="control-label col-xs-12 col-sm-2">{:__('Newversion')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-newversion" class="form-control" name="row[newversion]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-packagesize" class="control-label col-xs-12 col-sm-2">{:__('Packagesize')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-packagesize" class="form-control" name="row[packagesize]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea id="c-content" class="form-control" name="row[content]"></textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="c-downloadurl" class="control-label col-xs-12 col-sm-2">{:__('Downloadurl')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-downloadurl" class="form-control" name="row[downloadurl]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-enforce" class="control-label col-xs-12 col-sm-2">{:__('Enforce')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[enforce]', [1=>__('Yes'), 0=>__('No')], 1)}
- </div>
- </div>
- <div class="form-group">
- <label for="c-weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
- </div>
- </div>
- <div class="form-group">
- <label for="c-status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/version/edit.html b/application/admin/view/version/edit.html
deleted file mode 100644
index 34b1b73..0000000
--- a/application/admin/view/version/edit.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-oldversion" class="control-label col-xs-12 col-sm-2">{:__('Oldversion')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-oldversion" class="form-control" name="row[oldversion]" type="text" value="{$row.oldversion}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-newversion" class="control-label col-xs-12 col-sm-2">{:__('Newversion')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-newversion" class="form-control" name="row[newversion]" type="text" value="{$row.newversion}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-packagesize" class="control-label col-xs-12 col-sm-2">{:__('Packagesize')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-packagesize" class="form-control" name="row[packagesize]" type="text" value="{$row.packagesize}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea id="c-content" class="form-control" name="row[content]">{$row.content}</textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="c-downloadurl" class="control-label col-xs-12 col-sm-2">{:__('Downloadurl')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-downloadurl" class="form-control" name="row[downloadurl]" type="text" value="{$row.downloadurl}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-enforce" class="control-label col-xs-12 col-sm-2">{:__('Enforce')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[enforce]', [1=>__('Yes'), 0=>__('No')], $row['enforce'])}
- </div>
- </div>
- <div class="form-group">
- <label for="c-weigh" class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/version/index.html b/application/admin/view/version/index.html
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/version/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/wechat/autoreply/add.html b/application/admin/view/wechat/autoreply/add.html
deleted file mode 100644
index bd31f5c..0000000
--- a/application/admin/view/wechat/autoreply/add.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<link href="{:$site['cdnurl']}/assets/css/wechat/menu.css?v={:$site['version']}" rel="stylesheet">
-<style>
- .clickbox {margin:0;text-align: left;}
- .create-click {
- margin-left:0;
- }
-</style>
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[title]" value="" id="c-title" class="form-control" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-text" class="control-label col-xs-12 col-sm-2">{:__('Text')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[text]" value="" id="c-text" class="form-control" data-rule="required; remote(wechat/autoreply/check_text_unique)" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Event key')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="hidden" name="row[eventkey]" id="c-eventkey" class="form-control" value="" data-rule="required" readonly />
- <div class="clickbox">
- <span class="create-click"><a href="{:url('wechat.response/select')}" id="select-resources"><i class="weixin-icon big-add-gray"></i><strong>选择现有资源</strong></a></span>
- <span class="create-click"><a href="{:url('wechat.response/add')}" id="add-resources"><i class="weixin-icon big-add-gray"></i><strong>添加新资源</strong></a></span>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-remark" class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[remark]" value="" id="c-remark" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-
-</form>
diff --git a/application/admin/view/wechat/autoreply/edit.html b/application/admin/view/wechat/autoreply/edit.html
deleted file mode 100644
index 9c74994..0000000
--- a/application/admin/view/wechat/autoreply/edit.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<link href="{:$site['cdnurl'] ?>/assets/css/wechat/menu.css?v={$site.version}" rel="stylesheet">
-<style>
- .clickbox {margin:0;text-align: left;}
- .create-click {
- margin-left:0;
- }
-</style>
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[title]" value="{$row.title}" id="c-title" class="form-control" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-text" class="control-label col-xs-12 col-sm-2">{:__('Text')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[text]" value="{$row.text}" id="c-text" class="form-control" data-rule="required; remote(wechat/autoreply/check_text_unique, except={$row.text})" />
- </div>
- </div>
- <div class="form-group">
- <label for="c-content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="clickbox">
- <input type="hidden" name="row[eventkey]" id="c-eventkey" class="form-control" value="{$row.eventkey}" data-rule="required" readonly />
- <span class="create-click"><a href="{:url('wechat.response/select')}" id="select-resources"><i class="weixin-icon big-add-gray"></i><strong>选择现有资源</strong></a><div class="keytitle">资源名:{:$response['title'] ?></div></span>
- <span class="create-click"><a href="{:url('wechat.response/add')}" id="add-resources"><i class="weixin-icon big-add-gray"></i><strong>添加新资源</strong></a></span>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="c-remark" class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" name="row[remark]" value="{$row.remark}" id="c-remark" class="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/wechat/autoreply/index.html b/application/admin/view/wechat/autoreply/index.html
deleted file mode 100644
index f1bdef1..0000000
--- a/application/admin/view/wechat/autoreply/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> <?= __('More') ?></a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/wechat/config/add.html b/application/admin/view/wechat/config/add.html
deleted file mode 100644
index 015f524..0000000
--- a/application/admin/view/wechat/config/add.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
- <input type="hidden" name="row[mode]" value="textarea" />
- <div class="form-group">
- <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
- </div>
- </div>
- <div class="form-group">
- <label for="c-value" class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
- <div class="col-xs-12 col-sm-8">
- <p>
- <a href="javascript:;" class="btn btn-info btn-jsoneditor"><i class="fa fa-pencil"></i> {:__('Json editor')}</a>
- <a href="javascript:;" class="btn btn-primary btn-insertlink"><i class="fa fa-link"></i> {:__('Insert link')}</a>
- </p>
- <textarea id="c-value" class="form-control " rows="15" name="row[value]"></textarea>
- <dl class="fieldlist hide" rel="1">
- <dd>
- <ins>{:__('Json key')}</ins>
- <ins>{:__('Json value')}</ins>
- </dd>
- <dd>
- <input type="text" name="field[0]" class="form-control" id="field-0" value="" size="10" required />
- <input type="text" name="value[0]" class="form-control" id="value-0" value="" size="40" required />
- <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
- <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span>
- </dd>
- <dd><a href="javascript:;" class="append btn btn-sm btn-success"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
- </dl>
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/wechat/config/edit.html b/application/admin/view/wechat/config/edit.html
deleted file mode 100644
index 334731c..0000000
--- a/application/admin/view/wechat/config/edit.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
- <input type="hidden" name="row[mode]" value="textarea" />
- <div class="form-group">
- <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title}">
- </div>
- </div>
- <div class="form-group">
- <label for="c-value" class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
- <div class="col-xs-12 col-sm-8">
- <p>
- <a href="javascript:;" class="btn btn-info btn-jsoneditor"><i class="fa fa-pencil"></i> {:__('Json editor')}</a>
- <a href="javascript:;" class="btn btn-primary btn-insertlink"><i class="fa fa-link"></i> {:__('Insert link')}</a>
- </p>
- <textarea id="c-value" class="form-control " rows="15" name="row[value]">{$row.value}</textarea>
- <dl class="fieldlist hide" rel="{$value|count}">
- <dd>
- <ins>{:__('Json key')}</ins>
- <ins>{:__('Json value')}</ins>
- </dd>
- {foreach $value as $key => $vo}
- <dd class="form-inline">
- <input type="text" name="field[{$key}]" class="form-control" id="field-{$key}" value="{$key}" size="10" />
- <input type="text" name="value[{$key}]" class="form-control" id="value-{$key}" value="{:is_array($vo)?'':$vo}" size="40" />
- <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
- <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span>
- </dd>
- {/foreach}
- <dd><a href="javascript:;" class="append btn btn-sm btn-success"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
- </dl>
- </div>
- </div>
- <div class="form-group hide layer-footer">
- <label class="control-label col-xs-12 col-sm-2"></label>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
-</form>
diff --git a/application/admin/view/wechat/config/index.html b/application/admin/view/wechat/config/index.html
deleted file mode 100644
index d3eefa4..0000000
--- a/application/admin/view/wechat/config/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar()}
- <div class="dropdown btn-group">
- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
- <ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
- </ul>
- </div>
- </div>
- <table id="table" class="table table-striped table-bordered table-hover" width="100%">
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/wechat/menu/index.html b/application/admin/view/wechat/menu/index.html
deleted file mode 100644
index ebc1fdf..0000000
--- a/application/admin/view/wechat/menu/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<link href="__CDN__/assets/css/wechat/menu.css?v={$site['version']}" rel="stylesheet">
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div class="weixin-menu-setting clearfix">
- <div class="mobile-menu-preview">
- <div class="mobile-head-title">{$site.name}</div>
- <ul class="menu-list" id="menu-list">
- <li class="add-item extra" id="add-item">
- <a href="javascript:;" class="menu-link" title="添加菜单"><i class="weixin-icon add-gray"></i></a>
- </li>
- </ul>
- </div>
- <div class="weixin-body">
- <div class="weixin-content" style="display:none">
- <div class="item-info">
- <form id="form-item" class="form-item" data-value="" >
- <div class="item-head">
- <h4 id="current-item-name">添加子菜单</h4>
- <div class="item-delete"><a href="javascript:;" id="item_delete">删除菜单</a></div>
- </div>
- <div style="margin-top: 20px;">
- <dl>
- <dt id="current-item-option"><span class="is-sub-item">子</span>菜单标题：</dt>
- <dd><div class="input-box"><input id="item_title" name="item-title" type="text" value=""></div></dd>
- </dl>
- <dl class="is-item">
- <dt id="current-item-type"><span class="is-sub-item">子</span>菜单内容：</dt>
- <dd>
- <input id="type1" type="radio" name="type" value="click"><label for="type1" data-editing="1"><span class="lbl_content">发送消息</span></label>
- <input id="type2" type="radio" name="type" value="view" ><label for="type2" data-editing="1"><span class="lbl_content">跳转网页</span></label>
- <input id="type3" type="radio" name="type" value="scancode_push"><label for="type3" data-editing="1"><span class="lbl_content">扫码推</span></label>
- <input id="type4" type="radio" name="type" value="scancode_waitmsg"><label for="type4" data-editing="1"><span class="lbl_content">扫码推提示框</span></label>
- <input id="type5" type="radio" name="type" value="pic_sysphoto"><label for="type5" data-editing="1"><span class="lbl_content">拍照发图</span></label>
- <input id="type6" type="radio" name="type" value="pic_photo_or_album"><label for="type6" data-editing="1"><span class="lbl_content">拍照相册发图</span></label>
- <input id="type7" type="radio" name="type" value="pic_weixin"><label for="type7" data-editing="1"><span class="lbl_content">相册发图</span></label>
- <input id="type8" type="radio" name="type" value="location_select"><label for="type8" data-editing="1"><span class="lbl_content">地理位置选择</span></label>
- </dd>
- </dl>
- <div id="menu-content" class="is-item">
- <div class="viewbox is-view">
- <p class="menu-content-tips">点击该<span class="is-sub-item">子</span>菜单会跳到以下链接</p>
- <dl>
- <dt>页面地址：</dt>
- <dd><div class="input-box"><input type="text" id="url" name="url"></div>
- </dd>
- </dl>
- </div>
- <div class="clickbox is-click" style="display: none;">
- <input type="hidden" name="key" id="key" value="" />
- <span class="create-click"><a href="{:url('wechat.response/select')}" id="select-resources"><i class="weixin-icon big-add-gray"></i><strong>选择现有资源</strong></a></span>
- <span class="create-click"><a href="{:url('wechat.response/add')}" id="add-resources"><i class="weixin-icon big-add-gray"></i><strong>添加新资源</strong></a></span>
- </div>
- </div>
- </div>
- </form>
- </div>
-
- </div>
- <div class="no-weixin-content">
- 点击左侧菜单进行编辑操作
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-4 text-center text-danger">
- <i class="fa fa-lightbulb-o"></i> <small>可直接拖动菜单排序</small>
- </div>
- <div class="col-xs-8 text-center"><a href="javascript:;" id="menuSyn" class="btn btn-danger">保存并发布</a></div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
-</div>
-<script type="text/javascript">
- var menu = {:json_encode($menu, JSON_UNESCAPED_UNICODE)};
- var responselist = {:json_encode($responselist, JSON_UNESCAPED_UNICODE)};
-</script>
diff --git a/application/admin/view/wechat/response/add.html b/application/admin/view/wechat/response/add.html
deleted file mode 100644
index 6d718a5..0000000
--- a/application/admin/view/wechat/response/add.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
- <div class="form-group">
- <label for="module" class="control-label col-xs-12 col-sm-2">{:__('Resource title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="title" name="row[title]" value="" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Memo')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea class="form-control" id="remark" name="row[remark]"></textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="radio" name="row[type]" value="text" id="type-text" checked />
- <label for="type-text">{:__('Text')}</label>
- <input type="radio" name="row[type]" value="app" id="type-app" />
- <label for="type-app">{:__('App')}</label>
- </div>
- </div>
- <div id="expand">
-
- </div>
- <div class="form-group">
- <label for="status" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
- </div>
- </div>
- <div class="form-group {:input('get.callback')?'':'hidden layer-footer'}">
- <div class="col-xs-2"></div>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
- <select name="applist" disabled="true" class="hidden">
- {foreach $applist as $k => $v}
- <option value="{$k}">{$v.name}</option>
- {/foreach}
- </select>
-</form>
-<script>
- var apps = {:json_encode($applist)};
- var datas = {};
-</script>
\ 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 9ee6d32..0000000
--- a/application/admin/view/wechat/response/edit.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
-
- <div class="form-group">
- <label for="module" class="control-label col-xs-12 col-sm-2">{:__('Resource title')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type="text" class="form-control" id="title" name="row[title]" value="{$row.title}" data-rule="required" />
- </div>
- </div>
- <div class="form-group">
- <label for="controller" class="control-label col-xs-12 col-sm-2">{:__('Event key')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input type='text' class="form-control" id="eventkey" name="row[eventkey]" value="{$row.eventkey}" data-rule="required" readonly />
- </div>
- </div>
- <div class="form-group">
- <label for="remark" class="control-label col-xs-12 col-sm-2">{:__('Memo')}:</label>
- <div class="col-xs-12 col-sm-8">
- <textarea class="form-control" id="remark" name="row[remark]">{$row.remark}</textarea>
- </div>
- </div>
- <div class="form-group">
- <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[type]', ['text' => __('Text'), 'app' => __('App')], $row['type'])}
- </div>
- </div>
- <div id="expand">
-
- </div>
- <div class="form-group">
- <div class="col-xs-2"></div>
- <div class="col-xs-12 col-sm-8">
- {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
- </div>
- </div>
- <div class="form-group hidden layer-footer">
- <div class="col-xs-2"></div>
- <div class="col-xs-12 col-sm-8">
- <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
- <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
- </div>
- </div>
- <select name="applist" disabled="true" class="hidden">
- {foreach $applist as $k => $v}
- <option value="{$k}">{$v.name}</option>
- {/foreach}
- </select>
-</form>
-<script>
- var apps = {:json_encode($applist)};
- var datas = {$row.content};
-</script>
\ 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 ca4b549..0000000
--- a/application/admin/view/wechat/response/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <div id="toolbar" class="toolbar">
- {:build_toolbar();}
- </div>
- <table id="table" class="table table-bordered table-hover" width="100%">
-
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/admin/view/wechat/response/select.html b/application/admin/view/wechat/response/select.html
deleted file mode 100644
index 6139835..0000000
--- a/application/admin/view/wechat/response/select.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="panel panel-default panel-intro">
- {:build_heading()}
-
- <div class="panel-body">
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="one">
- <div class="widget-body no-padding">
- <table id="table" class="table table-bordered table-hover" width="100%">
-
- </table>
- </div>
- </div>
-
- </div>
- </div>
-</div>
diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php
deleted file mode 100644
index 52bd44c..0000000
--- a/application/api/controller/Index.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace app\api\controller;
-
-use app\common\controller\Api;
-
-class Index extends Api
-{
-
- public function index()
- {
- return json(['code' => 0]);
- }
-
-}
diff --git a/application/command.php b/application/command.php
index da724a9..062fa2e 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 95d30fc..7189c99 100755
--- a/application/common.php
+++ b/application/common.php
@@ -1,7 +1,5 @@
<?php
-use think\Lang;
-
// 公共助手函数
if (!function_exists('__'))
@@ -24,7 +22,7 @@ if (!function_exists('__'))
array_shift($vars);
$lang = '';
}
- return Lang::get($name, $vars, $lang);
+ return think\Lang::get($name, $vars, $lang);
}
}
@@ -64,3 +62,35 @@ if (!function_exists('datetime'))
}
}
+
+if (!function_exists('human_date'))
+{
+
+ /**
+ * 获取语义化时间
+ * @param int $time 时间
+ * @param int $local 本地时间
+ * @return string
+ */
+ function human_date($time, $local = null)
+ {
+ return \fast\Date::human($time, $local);
+ }
+
+}
+
+if (!function_exists('cdnurl'))
+{
+
+ /**
+ * 获取CDN的地址
+ * @param int $time 时间戳
+ * @param string $format 日期时间格式
+ * @return string
+ */
+ function cdnurl($url)
+ {
+ return preg_match("/^https?:\/\/(.*)/i", $url) ? $url : think\Config::get('cdnurl') . $url;
+ }
+
+}
diff --git a/application/common/behavior/Common.php b/application/common/behavior/Common.php
index a7600aa..bcb3451 100644
--- a/application/common/behavior/Common.php
+++ b/application/common/behavior/Common.php
@@ -9,6 +9,7 @@ class Common
public function run(&$params)
{
+ // 如果修改了index.php入口地址，则需要手动修改cdnurl的值
$cdnurl = preg_replace("/\/(\w+)\.php$/i", '', $params->root());
// 如果未设置__CDN__则自动匹配得出
if (!Config::get('view_replace_str.__CDN__'))
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 94868ff..09c6612 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -5,11 +5,10 @@ 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');
-
/**
* 后台控制器基类
*/
@@ -17,24 +16,6 @@ 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'));
}
@@ -187,6 +179,16 @@ class Backend extends Controller
}
/**
+ * 渲染配置信息
+ * @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 查询条件
* @param boolean $relationSearch 是否关联查询
@@ -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('/(?<!^)[A-Z]/', '_$0', $name));
- $modelName = $name . ".";
+ $tableName = $this->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 8366b01..fe9dde0 100644
--- a/application/common/controller/Frontend.php
+++ b/application/common/controller/Frontend.php
@@ -12,24 +12,6 @@ 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 fb51f35..0000000
--- a/application/common/controller/Uc.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-namespace app\common\controller;
-
-use app\common\library\Auth;
-use think\Controller;
-use think\Loader;
-
-//UC通信接口基类,抽象类，必须继承使用
-
-define('API_ADDUSER', 1); //note 用户添加 API 接口开关
-define('API_DELETEUSER', 1); //note 用户删除 API 接口开关
-define('API_GETTAG', 1); //note 获取标签 API 接口开关
-define('API_SYNLOGIN', 1); //note 同步登录 API 接口开关
-define('API_SYNLOGOUT', 1); //note 同步登出 API 接口开关
-define('API_UPDATEPW', 1); //note 更改用户密码 开关
-define('API_UPDATEINFO', 1); //note 更改用户信息 开关
-define('API_UPDATEBADWORDS', 1); //note 更新关键字列表 开关
-define('API_UPDATEHOSTS', 1); //note 更新域名解析缓存 开关
-define('API_UPDATEAPPS', 1); //note 更新应用列表 开关
-define('API_UPDATECLIENT', 1); //note 更新客户端缓存 开关
-define('API_UPDATECREDIT', 1); //note 更新用户积分 开关
-define('API_GETCREDITSETTINGS', 1); //note 向 UCenter 提供积分设置 开关
-define('API_GETCREDIT', 1); //note 获取用户的某项积分 开关
-define('API_UPDATECREDITSETTINGS', 1); //note 更新应用积分设置 开关
-
-define('API_RETURN_SUCCEED', '1');
-define('API_RETURN_FAILED', '-1');
-define('API_RETURN_FORBIDDEN', '-2');
-
-abstract class Uc extends Controller
-{
-
- /**
- *
- * @var \app\common\library\Auth
- */
- protected $user = null;
- public $code; //code参数原始字符串
- public $action; //解析code得到的动作名
- public $error = NULL;
- public $get; //get数据
- public $post; //post数据
- protected $appdir; //uc_client所在目录
-
- /**
- * 初始化方法
- */
-
- public function _initialize()
- {
- parent::_initialize();
- $modulename = $this->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 8cf8661..0000000
--- a/application/common/library/Auth.php
+++ /dev/null
@@ -1,650 +0,0 @@
-<?php
-
-namespace app\common\library;
-
-use app\common\model\User;
-use app\common\model\UserThird;
-use fast\Random;
-use fast\ucenter\client\Client;
-use think\Cookie;
-use think\Db;
-use think\Exception;
-use think\Request;
-use think\Validate;
-
-/**
- * Auth类
- */
-class Auth implements \JsonSerializable, \ArrayAccess
-{
-
- const ERR_ACCOUNT_IS_INCORRECT = 'Account is incorrect';
- const ERR_ACCOUNT_NOT_EXIST = 'Account not exist';
- const ERR_USERNAME_IS_INCORRECT = 'Username is incorrect';
- const ERR_EMAIL_IS_INCORRECT = 'Email is incorrect';
- const ERR_PASSWORD_IS_INCORRECT = 'Password is incorrect';
- const ERR_USERNAME_OR_PASSWORD_IS_INCORRECT = 'Username or password is incorrect';
- const ERR_USERNAME_ALREADY_EXIST = 'Username already exist';
- const ERR_EMAIL_ALREADY_EXIST = 'Email already exist';
- const ERR_MOBILE_ALREADY_EXIST = 'Mobile already exist';
- const ERR_ACCOUNT_IS_LOCKED = 'Account is locked';
- const ERR_USERNAME_OR_PASSWORD_IS_MODIFIED = 'Username or password is modified';
- const ERR_YOU_ARE_NOT_LOGGED_IN = 'You are not logged in';
- const ERR_ACCOUNT_ALREADY_LOGGED_IN_AT_ANOTHER_PLACE = 'Account already logged in at another';
-
- protected static $instance = null;
- private $_error = '';
- private $_logined = FALSE;
- private $user = NULL;
- private $keeptime = 0;
- private $requestUri = '';
-
- public function __construct()
- {
- $this->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 0000000..fb63ab5
--- /dev/null
+++ b/application/common/library/Menu.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace app\common\library;
+
+use app\admin\model\AuthRule;
+use fast\Tree;
+use think\exception\PDOException;
+
+class Menu
+{
+
+ /**
+ * 创建菜单
+ * @param array $menu
+ * @param mixed $parent 父类的name或pid
+ */
+ public static function create($menu, $parent = 0)
+ {
+ if (!is_numeric($parent))
+ {
+ $parentRule = AuthRule::getByName($parent);
+ $pid = $parentRule ? $parentRule['id'] : 0;
+ }
+ else
+ {
+ $pid = $parent;
+ }
+ $allow = array_flip(['file', 'name', 'title', 'icon', 'condition', 'remark', 'ismenu']);
+ foreach ($menu as $k => $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 268790c..0000000
--- a/application/common/library/Token.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace app\common\library;
-
-use think\Cache;
-
-/**
- * Token类
- */
-class Token
-{
-
- /**
- * 缓存用户的Token及UID
- *
- * @param string $token
- * @param int $uid
- * @param int $expire
- */
- public static function set($token, $uid, $expire)
- {
- Cache::set($token, $uid, $expire);
- }
-
- /**
- * 通过Token获取用户的身份标识
- *
- * @param string $token
- * @return string
- */
- public static function identity($token)
- {
- $uid = Cache::get($token);
- return $uid;
- }
-
- /**
- * 验证Token是否可用
- * @param string $token
- */
- public static function check($token)
- {
- return Cache::has($token);
- }
-
- /**
- * 延长Token的有效期
- * key 用户的Token(随机Hash)
- */
- public static function refresh($token)
- {
- $uid = Cache::get($token);
- Cache::set($token, $uid);
- }
-
- /**
- * 删除用户的Token缓存
- *
- * @param string $token
- */
- public static function delete($token)
- {
- Cache::rm($token);
- }
-
-}
diff --git a/application/common/model/Config.php b/application/common/model/Config.php
index 17ef8c4..9effc07 100644
--- a/application/common/model/Config.php
+++ b/application/common/model/Config.php
@@ -53,58 +53,23 @@ class Config extends Model
}
/**
- * 加载上传配置
- *
- * @param array $params 扩展参数,常用字段savekey,mimetype,maxsize,ext-param,notify-url,return-url<br>
- * 更多字段可参考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 dfbbec6..0000000
--- a/application/common/model/Configvalue.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-use think\Config;
-
-class Configvalue extends Model
-{
-
- // 开启自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
- // 定义字段类型
- protected $type = [
- 'content' => 'json',
- ];
-
- /**
- * 加载上传配置
- *
- * @param array $params 扩展参数,常用字段savekey,mimetype,maxsize,ext-param,notify-url,return-url<br>
- * 更多字段可参考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 f0681dd..0000000
--- a/application/common/model/Crontab.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class Crontab extends Model
-{
-
- // 开启自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
- // 定义字段类型
- protected $type = [
- ];
- // 追加属性
- protected $append = [
- 'type_text'
- ];
-
- public static function getTypeList()
- {
- return [
- 'url' => __('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 18cd2f8..0000000
--- a/application/common/model/Page.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class Page extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
-
- public function category()
- {
- return $this->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 b81500e..0000000
--- a/application/common/model/User.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class User extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = false;
- // 定义时间戳字段名
- protected $createTime = false;
- protected $updateTime = false;
-
-}
diff --git a/application/common/model/UserSignin.php b/application/common/model/UserSignin.php
deleted file mode 100644
index 43b69e8..0000000
--- a/application/common/model/UserSignin.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class UserSignin extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = false;
-
-}
diff --git a/application/common/model/UserThird.php b/application/common/model/UserThird.php
deleted file mode 100644
index 9466d43..0000000
--- a/application/common/model/UserThird.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class UserThird extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
-
-}
diff --git a/application/common/model/Version.php b/application/common/model/Version.php
deleted file mode 100644
index 31864ba..0000000
--- a/application/common/model/Version.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class Version extends Model
-{
-
- // 开启自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
- // 定义字段类型
- protected $type = [
- ];
-
- /**
- * 检测版本号
- *
- * @param string $version 客户端版本号
- * @return array
- */
- public static function check($version)
- {
- $versionlist = self::all(['status' => '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;
- }
- }
-
-}
diff --git a/application/common/model/WechatAutoreply.php b/application/common/model/WechatAutoreply.php
deleted file mode 100644
index b5f5363..0000000
--- a/application/common/model/WechatAutoreply.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class WechatAutoreply extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
-
-}
diff --git a/application/common/model/WechatConfig.php b/application/common/model/WechatConfig.php
deleted file mode 100644
index b02bb43..0000000
--- a/application/common/model/WechatConfig.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class WechatConfig extends Model
-{
-
- // 表名,不含前缀
- public $name = 'wechat_config';
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
- // 追加属性
- protected $append = [
- ];
-
- /**
- * 读取指定配置名称的值
- * @param string $name
- * @return string
- */
- public static function value($name)
- {
- $item = self::get(['name' => $name]);
- return $item ? $item->value : '';
- }
-
-}
diff --git a/application/common/model/WechatContext.php b/application/common/model/WechatContext.php
deleted file mode 100644
index c51aee0..0000000
--- a/application/common/model/WechatContext.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class WechatContext extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
-
-}
diff --git a/application/common/model/WechatResponse.php b/application/common/model/WechatResponse.php
deleted file mode 100644
index ff1989c..0000000
--- a/application/common/model/WechatResponse.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class WechatResponse extends Model
-{
-
- // 自动写入时间戳字段
- protected $autoWriteTimestamp = 'int';
- // 定义时间戳字段名
- protected $createTime = 'createtime';
- protected $updateTime = 'updatetime';
-
-}
diff --git a/application/config.php b/application/config.php
index df78ed8..08cf414 100755
--- a/application/config.php
+++ b/application/config.php
@@ -221,6 +221,7 @@ return [
'var_page' => '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 c670814..0000000
--- a/application/constants.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-// Ucenter配置配置
-define('UC_STATUS', TRUE); //是否开启Ucenter同步
-
-define('UC_CONNECT', 'mysql');
-
-// 数据库相关 (mysql 连接时, 并且没有设置 UC_DBLINK 时, 需要配置以下变量)
-define('UC_DBHOST', 'localhost'); // UCenter 数据库主机
-define('UC_DBUSER', 'root'); // UCenter 数据库用户名
-define('UC_DBPW', '123456'); // UCenter 数据库密码
-define('UC_DBNAME', 'ucenter'); // UCenter 数据库名称
-define('UC_DBCHARSET', 'utf8'); // UCenter 数据库字符集
-define('UC_DBTABLEPRE', 'ucenter.uc_'); // UCenter 数据库表前缀
-define('UC_DBCONNECT', '0'); //是否持久链接
-//
-// 通信相关
-define('UC_KEY', '123456789'); // 与 UCenter 的通信密钥, 要与 UCenter 保持一致
-define('UC_API', 'http://www.ucenter.com'); // UCenter 的 URL 地址, 在调用头像时依赖此常量
-define('UC_CHARSET', 'utf-8'); // UCenter 的字符集
-define('UC_IP', ''); // UCenter 的 IP, 当 UC_CONNECT 为非 mysql 方式时, 并且当前应用服务器解析域名有问题时, 请设置此值
-define('UC_APPID', 1); // 当前应用的 ID
-define('UC_PPP', '20'); //在线默认分页大小
\ No newline at end of file
diff --git a/application/extra/addons.php b/application/extra/addons.php
new file mode 100644
index 0000000..d6131b5
--- /dev/null
+++ b/application/extra/addons.php
@@ -0,0 +1,8 @@
+<?php
+
+return array (
+ 'autoload' => 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 eeb49b1..0000000
--- a/application/extra/payment.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-//支付配置
-
-return [
- 'alipay' => [
- // 即时到账方式
- '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 4c7c64f..0000000
--- a/application/extra/service.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-//支付配置
-
-return [
- // 阿里大鱼短信配置
- 'alisms' => [
- '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 9001c58..0000000
--- a/application/extra/third.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-// 第三方登录配置
-return [
- // 微博配置
- // 申请请到http://open.weibo.com
- 'weibo' => [
- '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 d461c3b..e04fd0c 100644
--- a/application/extra/upload.php
+++ b/application/extra/upload.php
@@ -3,30 +3,14 @@
//上传配置
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' => '',
- /**
* 文件保存格式
*/
'savekey' => '/uploads/{year}{mon}{day}/{filemd5}{.suffix}',
@@ -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 e8fdfe7..0000000
--- a/application/extra/wechat.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-//微信配置,仅适用于easywechat
-
-return [
- /**
- * Debug 模式，bool 值：true/false
- *
- * 当值为 false 时，所有的日志都不会记录
- */
- 'debug' => 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 738f0a7..26ee7a9 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 03f7537..0000000
--- a/application/index/controller/Autotask.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\model\Crontab;
-use fast\Date;
-use fast\Http;
-use think\Controller;
-use think\Db;
-use think\Exception;
-use think\Log;
-
-/**
- * 定时任务接口
- *
- * 以Crontab方式每分钟定时执行,且只可以Cli方式运行
- * @internal
- */
-class Autotask extends Controller
-{
-
- /**
- * 初始化方法,最前且始终执行
- */
- public function _initialize()
- {
- // 只可以以cli方式执行
- if (!$this->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 3dab595..0000000
--- a/application/index/controller/Common.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Frontend;
-
-/**
- * 公共控制器
- */
-class Common extends Frontend
-{
-
- public function _initialize()
- {
- parent::_initialize();
- }
-
-}
diff --git a/application/index/controller/Demo.php b/application/index/controller/Demo.php
deleted file mode 100644
index d82d964..0000000
--- a/application/index/controller/Demo.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Frontend;
-use Endroid\QrCode\QrCode;
-use think\Response;
-
-/**
- * Demo接口
- */
-class Demo extends Frontend
-{
-
- // 使用布局
- protected $layout = 'bootstrap';
-
- public function _initialize()
- {
- parent::_initialize();
- }
-
- public function index()
- {
- return $this->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 aa611de..598385f 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 3dc4bbb..0000000
--- a/application/index/controller/Sms.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Frontend;
-use app\common\library\Email;
-use app\common\library\Sms as Smslib;
-use app\common\model\User;
-use think\Session;
-
-/**
- * 短信控制器
- */
-class Sms extends Frontend
-{
-
- /**
- * 发送验证码
- *
- * 必选参数:mobile,type<br>
- * 可选参数:无
- */
- 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<br>
- * 可选参数:无
- */
- 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 6ea1318..0000000
--- a/application/index/controller/Ucenter.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Uc;
-use app\common\model\User;
-use app\common\model\UserThird;
-use fast\Random;
-use think\Loader;
-
-/**
- * Ucenter接口,接收来自Ucenter服务器的请求
- *
- */
-class Ucenter extends Uc
-{
-
- public function _initialize()
- {
- //导入UC常量
- Loader::import('uc', APP_PATH);
- parent::_initialize();
- }
-
- /**
- * Ucenter接口接收方法
- */
- public function api()
- {
- $this->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 = "<?php\r\n";
- $s .= '$_CACHE[\'badwords\'] = ' . var_export($data, TRUE) . ";\r\n";
- fwrite($fp, $s);
- fclose($fp);
- return API_RETURN_SUCCEED;
- }
-
- /**
- * 更新HOSTS
- */
- protected function updatehosts()
- {
- if (!API_UPDATEHOSTS)
- {
- return API_RETURN_FORBIDDEN;
- }
- $cachefile = $this->appdir . './uc_client/data/cache/hosts.php';
- $fp = fopen($cachefile, 'w');
- $s = "<?php\r\n";
- $s .= '$_CACHE[\'hosts\'] = ' . var_export($this->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 = "<?php\r\n";
- $s .= '$_CACHE[\'apps\'] = ' . var_export($this->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 = "<?php\r\n";
- $s .= '$_CACHE[\'settings\'] = ' . var_export($this->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 d84eaba..0000000
--- a/application/index/controller/Upyun.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Frontend;
-use think\Config;
-
-/**
- * 又拍云异步接口
- */
-class Upyun extends Frontend
-{
-
- public function notify()
- {
- $url = $this->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 eb545e4..0000000
--- a/application/index/controller/User.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Frontend;
-use fast\Random;
-use fast\third\Application;
-use fast\ucenter\client\Client;
-use think\Config;
-use think\Cookie;
-use think\Loader;
-
-/**
- * 会员中心
- */
-class User extends Frontend
-{
-
- // 使用布局
- protected $layout = 'bootstrap';
- protected $noNeedLogin = ['*'];
-
- public function _initialize()
- {
- parent::_initialize();
- //导入UC常量
- Loader::import('uc', APP_PATH);
- }
-
- public function index()
- {
- return $this->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 eca6846..0000000
--- a/application/index/controller/Wechat.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\common\controller\Frontend;
-use app\common\model\WechatAutoreply;
-use app\common\model\WechatContext;
-use app\common\model\WechatResponse;
-use app\common\model\WechatConfig;
-use EasyWeChat\Foundation\Application;
-use EasyWeChat\Payment\Order;
-use fast\service\Wechat as WechatService;
-use think\Config;
-use think\Log;
-
-/**
- * 微信接口
- */
-class Wechat extends Frontend
-{
-
- public $app = null;
-
- public function _initialize()
- {
- parent::_initialize();
- $this->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 840dfe4..69ff6cf 100644
--- a/application/index/lang/zh-cn.php
+++ b/application/index/lang/zh-cn.php
@@ -1,105 +1,90 @@
<?php
return [
- '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' => '网络错误!',
- '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 1e1459f..0000000
--- a/application/index/lang/zh-cn/sms.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-return [
- 'SMS sent frequently' => '短信发送频繁',
- '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 51a645d..0000000
--- a/application/index/view/demo/bootstrap.html
+++ /dev/null
@@ -1,1646 +0,0 @@
-<div class="container">
-
- <!-- Navbar
- ================================================== -->
- <div class="bs-docs-section clearfix">
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="navbar">Navbar</h1>
- </div>
-
- <div class="bs-component">
- <div class="navbar navbar-default">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">Brand</a>
- </div>
- <div class="navbar-collapse collapse navbar-responsive-collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#">Active</a></li>
- <li><a href="#">Link</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="dropdown-header">Dropdown header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <form class="navbar-form navbar-left">
- <input type="text" class="form-control col-lg-8" placeholder="Search">
- </form>
- <ul class="nav navbar-nav navbar-right">
- <li><a href="#">Link</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- </div>
-
- <div class="bs-component">
- <div class="navbar navbar-inverse">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">Brand</a>
- </div>
- <div class="navbar-collapse collapse navbar-responsive-collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#">Active</a></li>
- <li><a href="#">Link</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="dropdown-header">Dropdown header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <form class="navbar-form navbar-left">
- <input type="text" class="form-control col-lg-8" placeholder="Search">
- </form>
- <ul class="nav navbar-nav navbar-right">
- <li><a href="#">Link</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- </div><!-- /example -->
-
- </div>
- </div>
- </div>
-
-
- <!-- Buttons
- ================================================== -->
- <div class="bs-docs-section">
- <div class="page-header">
- <div class="row">
- <div class="col-lg-12">
- <h1 id="buttons">Buttons</h1>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-6">
-
- <p class="bs-component">
- <button type="button" class="btn btn-default">Default</button>
- <button type="button" class="btn btn-primary">Primary</button>
- <button type="button" class="btn btn-success">Success</button>
- <button type="button" class="btn btn-info">Info</button>
- <button type="button" class="btn btn-warning">Warning</button>
- <button type="button" class="btn btn-danger">Danger</button>
- <button type="button" class="btn btn-link">Link</button>
- </p>
-
- <p class="bs-component">
- <button type="button" class="btn btn-default disabled">Default</button>
- <button type="button" class="btn btn-primary disabled">Primary</button>
- <button type="button" class="btn btn-success disabled">Success</button>
- <button type="button" class="btn btn-info disabled">Info</button>
- <button type="button" class="btn btn-warning disabled">Warning</button>
- <button type="button" class="btn btn-danger disabled">Danger</button>
- <button type="button" class="btn btn-link disabled">Link</button>
- </p>
-
-
- <div style="margin-bottom: 15px;">
- <div class="bs-component" style="margin: 0;">
- <div class="btn-group">
- <button type="button" class="btn btn-default">Default</button>
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div>
-
- <div class="btn-group">
- <button type="button" class="btn btn-primary">Primary</button>
- <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div>
-
- <div class="btn-group">
- <button type="button" class="btn btn-success">Success</button>
- <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div>
-
- <div class="btn-group">
- <button type="button" class="btn btn-info">Info</button>
- <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div>
-
- <div class="btn-group">
- <button type="button" class="btn btn-warning">Warning</button>
- <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div>
- </div>
- </div>
-
- <p class="bs-component">
- <button type="button" class="btn btn-primary btn-lg">Large button</button>
- <button type="button" class="btn btn-primary">Default button</button>
- <button type="button" class="btn btn-primary btn-sm">Small button</button>
- <button type="button" class="btn btn-primary btn-xs">Mini button</button>
- </p>
-
- <p>
- <a class="btn btn-danger" href="javascript:;">
- <i class="fa fa-trash-o fa-lg"></i> Delete</a>
- <a class="btn btn-default btn-sm" href="javascript:;">
- <i class="fa fa-cog"></i> Settings</a>
- </p>
- <p>
- <a class="btn btn-lg btn-success" href="javascript:;">
- <i class="fa fa-flag fa-2x pull-left"></i> Font Awesome<br>Version 4.4.0</a>
- </p>
- <p>
- <div class="btn-group">
- <a class="btn btn-default" href="javascript:;"><i class="fa fa-align-left"></i></a>
- <a class="btn btn-default" href="javascript:;"><i class="fa fa-align-center"></i></a>
- <a class="btn btn-default" href="javascript:;"><i class="fa fa-align-right"></i></a>
- <a class="btn btn-default" href="javascript:;"><i class="fa fa-align-justify"></i></a>
- </div>
- </p>
- <p>
- <div class="input-group margin-bottom-sm">
- <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
- <input class="form-control" type="text" placeholder="Email address">
- </div>
- </p>
- <p>
- <div class="input-group">
- <span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
- <input class="form-control" type="password" placeholder="Password" autocomplete="off" style="cursor: auto; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAYAAABSO15qAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QsPDhss3LcOZQAAAU5JREFUOMvdkzFLA0EQhd/bO7iIYmklaCUopLAQA6KNaawt9BeIgnUwLHPJRchfEBR7CyGWgiDY2SlIQBT/gDaCoGDudiy8SLwkBiwz1c7y+GZ25i0wnFEqlSZFZKGdi8iiiOR7aU32QkR2c7ncPcljAARAkgckb8IwrGf1fg/oJ8lRAHkR2VDVmOQ8AKjqY1bMHgCGYXhFchnAg6omJGcBXEZRtNoXYK2dMsaMt1qtD9/3p40x5yS9tHICYF1Vn0mOxXH8Uq/Xb389wff9PQDbQRB0t/QNOiPZ1h4B2MoO0fxnYz8dOOcOVbWhqq8kJzzPa3RAXZIkawCenHMjJN/+GiIqlcoFgKKq3pEMAMwAuCa5VK1W3SAfbAIopum+cy5KzwXn3M5AI6XVYlVt1mq1U8/zTlS1CeC9j2+6o1wuz1lrVzpWXLDWTg3pz/0CQnd2Jos49xUAAAAASUVORK5CYII="); background-attachment: scroll; background-position: 100% 50%; background-repeat: no-repeat;">
- </div>
- </p>
- <p class="margin-bottom">
- <div class="btn-group">
- <a class="btn btn-primary" href="javascript:;"><i class="fa fa-user fa-fw"></i> User</a>
- <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="javascript:;">
- <span class="fa fa-caret-down"></span></a>
- <ul class="dropdown-menu">
- <li><a href="javascript:;"><i class="fa fa-pencil fa-fw"></i> Edit</a></li>
- <li><a href="javascript:;"><i class="fa fa-trash-o fa-fw"></i> Delete</a></li>
- <li><a href="javascript:;"><i class="fa fa-ban fa-fw"></i> Ban</a></li>
- <li class="divider"></li>
- <li><a href="javascript:;"><i class="i"></i> Make admin</a></li>
- </ul>
- </div>
- </p>
- <p>
- <div class="dropdown">
- <a id="dLabel" role="button" data-toggle="dropdown" class="btn btn-primary" data-target="#" href="/page.html">
- Dropdown <span class="caret"></span>
- </a>
- <ul class="dropdown-menu multi-level" role="menu" aria-labelledby="dropdownMenu">
- <li><a href="#">Some action</a></li>
- <li><a href="#">Some other action</a></li>
- <li class="divider"></li>
- <li class="dropdown-submenu">
- <a tabindex="-1" href="#">Hover me for more options</a>
- <ul class="dropdown-menu">
- <li><a tabindex="-1" href="#">Second level</a></li>
- <li class="dropdown-submenu">
- <a href="#">Even More..</a>
- <ul class="dropdown-menu">
- <li><a href="#">3rd level</a></li>
- <li><a href="#">3rd level</a></li>
- </ul>
- </li>
- <li><a href="#">Second level</a></li>
- <li><a href="#">Second level</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </p>
- </div>
- <div class="col-lg-6">
-
- <p class="bs-component">
- <button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
- </p>
-
-
- <div class="bs-component" style="margin-bottom: 15px;">
- <div class="btn-group btn-group-justified">
- <a href="#" class="btn btn-default">Left</a>
- <a href="#" class="btn btn-default">Middle</a>
- <a href="#" class="btn btn-default">Right</a>
- </div>
- </div>
-
- <div class="bs-component" style="margin-bottom: 15px;">
- <div class="btn-toolbar">
- <div class="btn-group">
- <button type="button" class="btn btn-default">1</button>
- <button type="button" class="btn btn-default">2</button>
- <button type="button" class="btn btn-default">3</button>
- <button type="button" class="btn btn-default">4</button>
- </div>
-
- <div class="btn-group">
- <button type="button" class="btn btn-default">5</button>
- <button type="button" class="btn btn-default">6</button>
- <button type="button" class="btn btn-default">7</button>
- </div>
-
- <div class="btn-group">
- <button type="button" class="btn btn-default">8</button>
- <div class="btn-group">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
- Dropdown
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- <li><a href="#">Dropdown link</a></li>
- <li><a href="#">Dropdown link</a></li>
- <li><a href="#">Dropdown link</a></li>
- </ul>
- </div>
- </div>
- </div>
- </div>
-
- <div class="bs-component">
- <div class="btn-group-vertical">
- <button type="button" class="btn btn-default">Button</button>
- <button type="button" class="btn btn-default">Button</button>
- <button type="button" class="btn btn-default">Button</button>
- <button type="button" class="btn btn-default">Button</button>
- </div>
- </div>
-
- </div>
- </div>
- </div>
-
- <!-- Typography
- ================================================== -->
- <div class="bs-docs-section">
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="type">Typography</h1>
- </div>
- </div>
- </div>
-
- <!-- Headings -->
-
- <div class="row">
- <div class="col-lg-4">
- <div class="bs-component">
- <h1>Heading 1</h1>
- <h2>Heading 2</h2>
- <h3>Heading 3</h3>
- <h4>Heading 4</h4>
- <h5>Heading 5</h5>
- <h6>Heading 6</h6>
- <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <h2>Example body text</h2>
- <p>Nullam quis risus eget <a href="#">urna mollis ornare</a> vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
- <p><small>This line of text is meant to be treated as fine print.</small></p>
- <p>The following snippet of text is <strong>rendered as bold text</strong>.</p>
- <p>The following snippet of text is <em>rendered as italicized text</em>.</p>
- <p>The following snippet of text is <code>rendered as code</code>.</p>
- <p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p>
- </div>
-
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <h2>Emphasis classes</h2>
- <p class="text-muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
- <p class="text-primary">Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
- <p class="text-danger">Donec ullamcorper nulla non metus auctor fringilla.</p>
- <p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
- <p class="text-info">Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
- </div>
-
- </div>
- </div>
-
- <!-- Blockquotes -->
-
- <div class="row">
- <div class="col-lg-12">
- <h2 id="type-blockquotes">Blockquotes</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-6">
- <div class="bs-component">
- <blockquote>
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
- <small>Someone famous in <cite title="Source Title">Source Title</cite></small>
- </blockquote>
- </div>
- </div>
- <div class="col-lg-6">
- <div class="bs-component">
- <blockquote class="pull-right">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
- <small>Someone famous in <cite title="Source Title">Source Title</cite></small>
- </blockquote>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row text-center hidden-xs">
- <a href="/" target="_blank" rel="nofollow"><img src="http://temp.im/728x90.jpg"></a>
- </div>
-
- <div class="row text-center visible-xs">
- <a href="/" target="_blank" rel="nofollow"><img src="http://temp.im/300x250.jpg"></a>
- </div>
-
- <!-- Tables
- ================================================== -->
- <div class="bs-docs-section">
-
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="tables">Tables</h1>
- </div>
- <h3>Bordered table && Hover rows</h3>
- <div class="bs-component">
- <table id="dt_basic" class="table table-striped table-bordered table-hover" width="100%">
- <thead>
- <tr>
- <th data-hide="phone">ID</th>
- <th data-class="expand"><i class="fa fa-fw fa-user text-muted hidden-md hidden-sm hidden-xs"></i> Name</th>
- <th data-hide="phone"><i class="fa fa-fw fa-phone text-muted hidden-md hidden-sm hidden-xs"></i> Phone</th>
- <th>Company</th>
- <th data-hide="phone,tablet"><i class="fa fa-fw fa-map-marker txt-color-blue hidden-md hidden-sm hidden-xs"></i> Zip</th>
- <th data-hide="phone,tablet">City</th>
- <th data-hide="phone,tablet"><i class="fa fa-fw fa-calendar txt-color-blue hidden-md hidden-sm hidden-xs"></i> Date</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>1</td>
- <td>Jennifer</td>
- <td>1-342-463-8341</td>
- <td>Et Rutrum Non Associates</td>
- <td>35728</td>
- <td>Fogo</td>
- <td>03/04/14</td>
- </tr>
- <tr>
- <td>2</td>
- <td>Clark</td>
- <td>1-516-859-1120</td>
- <td>Nam Ac Inc.</td>
- <td>7162</td>
- <td>Machelen</td>
- <td>03/23/13</td>
- </tr>
- <tr>
- <td>3</td>
- <td>Brendan</td>
- <td>1-724-406-2487</td>
- <td>Enim Commodo Limited</td>
- <td>98611</td>
- <td>Norman</td>
- <td>02/13/14</td>
- </tr>
- <tr>
- <td>4</td>
- <td>Warren</td>
- <td>1-412-485-9725</td>
- <td>Odio Etiam Institute</td>
- <td>10312</td>
- <td>Sautin</td>
- <td>01/01/13</td>
- </tr>
- <tr>
- <td>5</td>
- <td>Rajah</td>
- <td>1-849-642-8777</td>
- <td>Neque Ltd</td>
- <td>29131</td>
- <td>Glovertown</td>
- <td>02/16/13</td>
- </tr>
- </tbody>
- </table>
- </div>
- <h3>Striped rows</h3>
- <div class="bs-component">
- <table class="table table-striped">
- <thead>
- <tr>
- <th>#</th>
- <th>First Name</th>
- <th>Last Name</th>
- <th>Username</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th scope="row">1</th>
- <td>Mark</td>
- <td>Otto</td>
- <td>@mdo</td>
- </tr>
- <tr>
- <th scope="row">2</th>
- <td>Jacob</td>
- <td>Thornton</td>
- <td>@fat</td>
- </tr>
- <tr>
- <th scope="row">3</th>
- <td>Larry</td>
- <td>the Bird</td>
- <td>@twitter</td>
- </tr>
- </tbody>
- </table>
- </div>
- <h3>Contextual classes</h3>
- <div class="bs-component">
- <table class="table table-striped table-hover ">
- <thead>
- <tr>
- <th>#</th>
- <th>Column heading</th>
- <th>Column heading</th>
- <th>Column heading</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>1</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- <tr>
- <td>2</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- <tr class="info">
- <td>3</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- <tr class="success">
- <td>4</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- <tr class="danger">
- <td>5</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- <tr class="warning">
- <td>6</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- <tr class="active">
- <td>7</td>
- <td>Column content</td>
- <td>Column content</td>
- <td>Column content</td>
- </tr>
- </tbody>
- </table>
- </div><!-- /example -->
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12">
- <h2 id="type-blockquotes">Thumbnails</h2>
- </div>
- </div>
- <div class="bs-example" data-example-id="simple-thumbnails">
- <div class="row">
- <div class="col-xs-6 col-md-3">
- <a href="#" class="thumbnail">
- <img data-src="holder.js/100%x180" alt="100%x180" style="height: 180px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDE3MSAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YmJhMDQgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMHB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliYmEwNCI+PHJlY3Qgd2lkdGg9IjE3MSIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI2MSIgeT0iOTQuNSI+MTcxeDE4MDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="col-xs-6 col-md-3">
- <a href="#" class="thumbnail">
- <img data-src="holder.js/100%x180" alt="100%x180" style="height: 180px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDE3MSAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YjZiZTAgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMHB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliNmJlMCI+PHJlY3Qgd2lkdGg9IjE3MSIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI2MSIgeT0iOTQuNSI+MTcxeDE4MDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="col-xs-6 col-md-3">
- <a href="#" class="thumbnail">
- <img data-src="holder.js/100%x180" alt="100%x180" style="height: 180px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDE3MSAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YmFkZmUgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMHB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliYWRmZSI+PHJlY3Qgd2lkdGg9IjE3MSIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI2MSIgeT0iOTQuNSI+MTcxeDE4MDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="col-xs-6 col-md-3">
- <a href="#" class="thumbnail">
- <img data-src="holder.js/100%x180" alt="100%x180" style="height: 180px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTcxIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDE3MSAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5Yjk4NTMgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMHB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliOTg1MyI+PHJlY3Qgd2lkdGg9IjE3MSIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI2MSIgeT0iOTQuNSI+MTcxeDE4MDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-12">
- <h2 id="type-blockquotes">Custom content</h2>
- </div>
- </div>
- <div class="bs-example" data-example-id="thumbnails-with-custom-content">
- <div class="row">
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <img data-src="holder.js/100%x200" alt="100%x200" style="height: 200px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQyIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDI0MiAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MjAwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YmI1OGYgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMnB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliYjU4ZiI+PHJlY3Qgd2lkdGg9IjI0MiIgaGVpZ2h0PSIyMDAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI4OS44NTkzNzUiIHk9IjEwNS4xIj4yNDJ4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
- <div class="caption">
- <h3>Thumbnail label</h3>
- <p>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.</p>
- <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
- </div>
- </div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <img data-src="holder.js/100%x200" alt="100%x200" style="height: 200px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQyIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDI0MiAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MjAwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YmEwYWIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMnB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliYTBhYiI+PHJlY3Qgd2lkdGg9IjI0MiIgaGVpZ2h0PSIyMDAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI4OS44NTkzNzUiIHk9IjEwNS4xIj4yNDJ4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
- <div class="caption">
- <h3>Thumbnail label</h3>
- <p>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.</p>
- <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
- </div>
- </div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <img data-src="holder.js/100%x200" alt="100%x200" style="height: 200px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQyIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDI0MiAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MjAwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YjY5YzQgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMnB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliNjljNCI+PHJlY3Qgd2lkdGg9IjI0MiIgaGVpZ2h0PSIyMDAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI4OS44NTkzNzUiIHk9IjEwNS4xIj4yNDJ4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
- <div class="caption">
- <h3>Thumbnail label</h3>
- <p>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.</p>
- <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12">
- <h2 id="type-blockquotes">Default media</h2>
- </div>
- </div>
- <div class="bs-example" data-example-id="default-media">
- <div class="media">
- <div class="media-left">
- <a href="#">
- <img class="media-object" data-src="holder.js/64x64" alt="64x64" style="width: 64px; height: 64px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTFkODliNWU1YiB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1MWQ4OWI1ZTViIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Media heading</h4>
- 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.
- </div>
- </div>
- <div class="media">
- <div class="media-left">
- <a href="#">
- <img class="media-object" data-src="holder.js/64x64" alt="64x64" style="width: 64px; height: 64px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTFkODliOGYxOSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1MWQ4OWI4ZjE5Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Media heading</h4>
- 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.
- <div class="media">
- <div class="media-left">
- <a href="#">
- <img class="media-object" data-src="holder.js/64x64" alt="64x64" style="width: 64px; height: 64px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTFkODliNzg2ZiB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1MWQ4OWI3ODZmIj48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Nested media heading</h4>
- 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.
- </div>
- </div>
- </div>
- </div>
- <div class="media">
- <div class="media-body">
- <h4 class="media-heading">Media heading</h4>
- 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.
- </div>
- <div class="media-right">
- <a href="#">
- <img class="media-object" data-src="holder.js/64x64" alt="64x64" style="width: 64px; height: 64px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTFkODliM2M5OSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1MWQ4OWIzYzk5Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- </div>
- <div class="media">
- <div class="media-left">
- <a href="#">
- <img class="media-object" data-src="holder.js/64x64" alt="64x64" style="width: 64px; height: 64px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTFkODliNmMzNSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1MWQ4OWI2YzM1Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Media heading</h4>
- 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.
- </div>
- <div class="media-right">
- <a href="#">
- <img class="media-object" data-src="holder.js/64x64" alt="64x64" style="width: 64px; height: 64px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvNjR4NjQKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTFkODliOGJjOSB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1MWQ4OWI4YmM5Ij48cmVjdCB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSIxNC41IiB5PSIzNi41Ij42NHg2NDwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
- </a>
- </div>
- </div>
- </div>
-
- <!-- Forms
- ================================================== -->
- <div class="bs-docs-section">
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="forms">Forms</h1>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-6">
- <div class="well bs-component">
- <form class="form-horizontal">
- <fieldset>
- <legend>Legend</legend>
- <div class="form-group">
- <label for="inputEmail" class="col-lg-2 control-label">Email</label>
- <div class="col-lg-10">
- <input type="text" class="form-control" id="inputEmail" placeholder="Email">
- </div>
- </div>
- <div class="form-group">
- <label for="inputPassword" class="col-lg-2 control-label">Password</label>
- <div class="col-lg-10">
- <input type="password" class="form-control" id="inputPassword" placeholder="Password">
- <div class="checkbox">
- <label>
- <input type="checkbox"> Checkbox
- </label>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="textArea" class="col-lg-2 control-label">Textarea</label>
- <div class="col-lg-10">
- <textarea class="form-control" rows="3" id="textArea"></textarea>
- <span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-2 control-label">Radios</label>
- <div class="col-lg-10">
- <div class="radio">
- <label>
- <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked="">
- Option one is this
- </label>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- Option two can be something else
- </label>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label for="select" class="col-lg-2 control-label">Selects</label>
- <div class="col-lg-10">
- <select class="form-control" id="select">
- <option>1</option>
- <option>2</option>
- <option>3</option>
- <option>4</option>
- <option>5</option>
- </select>
- <br>
- <select multiple="" class="form-control">
- <option>1</option>
- <option>2</option>
- <option>3</option>
- <option>4</option>
- <option>5</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-10 col-lg-offset-2">
- <button class="btn btn-default">Cancel</button>
- <button type="submit" class="btn btn-primary">Submit</button>
- </div>
- </div>
- </fieldset>
- </form>
- </div>
- </div>
- <div class="col-lg-4 col-lg-offset-1">
-
- <form class="bs-component">
- <div class="form-group">
- <label class="control-label" for="focusedInput">Focused input</label>
- <input class="form-control" id="focusedInput" type="text" value="This is focused...">
- </div>
-
- <div class="form-group">
- <label class="control-label" for="disabledInput">Disabled input</label>
- <input class="form-control" id="disabledInput" type="text" placeholder="Disabled input here..." disabled="">
- </div>
-
- <div class="form-group has-warning">
- <label class="control-label" for="inputWarning">Input warning</label>
- <input type="text" class="form-control" id="inputWarning">
- </div>
-
- <div class="form-group has-error">
- <label class="control-label" for="inputError">Input error</label>
- <input type="text" class="form-control" id="inputError">
- </div>
-
- <div class="form-group has-success">
- <label class="control-label" for="inputSuccess">Input success</label>
- <input type="text" class="form-control" id="inputSuccess">
- </div>
-
- <div class="form-group">
- <label class="control-label" for="inputLarge">Large input</label>
- <input class="form-control input-lg" type="text" id="inputLarge">
- </div>
-
- <div class="form-group">
- <label class="control-label" for="inputDefault">Default input</label>
- <input type="text" class="form-control" id="inputDefault">
- </div>
-
- <div class="form-group">
- <label class="control-label" for="inputSmall">Small input</label>
- <input class="form-control input-sm" type="text" id="inputSmall">
- </div>
-
- <div class="form-group">
- <label class="control-label">Input addons</label>
- <div class="input-group">
- <span class="input-group-addon">$</span>
- <input type="text" class="form-control">
- <span class="input-group-btn">
- <button class="btn btn-default" type="button">Button</button>
- </span>
- </div>
- </div>
- </form>
-
- </div>
- </div>
- </div>
-
- <!-- Navs
- ================================================== -->
- <div class="bs-docs-section">
-
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="nav">Navs</h1>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-4">
- <h2 id="nav-tabs">Tabs</h2>
- <div class="bs-component">
- <ul class="nav nav-tabs" style="margin-bottom: 15px;">
- <li class="active"><a href="#home" data-toggle="tab">Home</a></li>
- <li><a href="#profile" data-toggle="tab">Profile</a></li>
- <li class="disabled"><a>Disabled</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">
- Dropdown <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#dropdown1" data-toggle="tab">Action</a></li>
- <li class="divider"></li>
- <li><a href="#dropdown2" data-toggle="tab">Another action</a></li>
- </ul>
- </li>
- </ul>
- <div id="myTabContent" class="tab-content">
- <div class="tab-pane fade active in" id="home">
- <p>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.</p>
- </div>
- <div class="tab-pane fade" id="profile">
- <p>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.</p>
- </div>
- <div class="tab-pane fade" id="dropdown1">
- <p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork.</p>
- </div>
- <div class="tab-pane fade" id="dropdown2">
- <p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater.</p>
- </div>
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <h2 id="nav-pills">Pills</h2>
- <div class="bs-component">
- <ul class="nav nav-pills">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Profile</a></li>
- <li class="disabled"><a href="#">Disabled</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">
- Dropdown <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div>
- <br>
- <div class="bs-component">
- <ul class="nav nav-pills nav-stacked" style="max-width: 300px;">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Profile</a></li>
- <li class="disabled"><a href="#">Disabled</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">
- Dropdown <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- <div class="col-lg-4">
- <h2 id="nav-breadcrumbs">Breadcrumbs</h2>
- <div class="bs-component">
- <ul class="breadcrumb">
- <li class="active">Home</li>
- </ul>
-
- <ul class="breadcrumb">
- <li><a href="#">Home</a></li>
- <li class="active">Library</li>
- </ul>
-
- <ul class="breadcrumb" style="margin-bottom: 5px;">
- <li><a href="#">Home</a></li>
- <li><a href="#">Library</a></li>
- <li class="active">Data</li>
- </ul>
- </div>
-
- </div>
- </div>
-
-
- <div class="row">
- <div class="col-lg-4">
- <h2 id="pagination">Pagination</h2>
- <div class="bs-component">
- <ul class="pagination">
- <li class="disabled"><a href="#">«</a></li>
- <li class="active"><a href="#">1</a></li>
- <li><a href="#">2</a></li>
- <li><a href="#">3</a></li>
- <li><a href="#">4</a></li>
- <li><a href="#">5</a></li>
- <li><a href="#">»</a></li>
- </ul>
-
- <ul class="pagination pagination-lg">
- <li class="disabled"><a href="#">«</a></li>
- <li class="active"><a href="#">1</a></li>
- <li><a href="#">2</a></li>
- <li><a href="#">3</a></li>
- <li><a href="#">»</a></li>
- </ul>
-
- <ul class="pagination pagination-sm">
- <li class="disabled"><a href="#">«</a></li>
- <li class="active"><a href="#">1</a></li>
- <li><a href="#">2</a></li>
- <li><a href="#">3</a></li>
- <li><a href="#">4</a></li>
- <li><a href="#">5</a></li>
- <li><a href="#">»</a></li>
- </ul>
- </div>
- </div>
- <div class="col-lg-4">
- <h2 id="pager">Pager</h2>
- <div class="bs-component">
- <ul class="pager">
- <li><a href="#">Previous</a></li>
- <li><a href="#">Next</a></li>
- </ul>
-
- <ul class="pager">
- <li class="previous disabled"><a href="#">← Older</a></li>
- <li class="next"><a href="#">Newer →</a></li>
- </ul>
- </div>
- </div>
- <div class="col-lg-4">
-
- </div>
- </div>
- </div>
-
- <div class="row text-center hidden-xs">
- <a href="/" target="_blank" rel="nofollow"><img src="http://temp.im/728x90.jpg"></a>
- </div>
-
- <div class="row text-center visible-xs">
- <a href="/" target="_blank" rel="nofollow"><img src="http://temp.im/300x250.jpg"></a>
- </div>
-
- <!-- Indicators
- ================================================== -->
- <div class="bs-docs-section">
-
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="indicators">Indicators</h1>
- </div>
- <div id="carousel-example-generic" class="carousel slide">
- <!-- Indicators -->
- <ol class="carousel-indicators">
- <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
- <li data-target="#carousel-example-generic" data-slide-to="1"></li>
- <li data-target="#carousel-example-generic" data-slide-to="2"></li>
- </ol>
-
- <!-- Wrapper for slides -->
- <div class="carousel-inner">
- <div class="item active">
- <img src="http://temp.im/1500x400/3498db/fff" alt="...">
- <div class="carousel-caption">
- <h1>Large Desktops are everywhere</h1>
- <p><button class="btn btn-default btn-md">Button 1</button></p>
- </div>
- </div>
- <div class="item">
- <img src="http://temp.im/1500x400/15a589/fff" alt="...">
- <div class="carousel-caption">
- <h1>Mobiles are outnumbering desktops</h1>
- <p><button class="btn btn-default btn-md">Button 2</button></p>
- </div>
- </div>
- <div class="item">
- <img src="http://temp.im/1500x400/e43725/fff" alt="...">
- <div class="carousel-caption">
- <h1>Enterprises are adopting Cloud computing fast</h1>
- <p><button class="btn btn-default btn-md">Button 3</button></p>
- </div>
- </div>
- </div>
- <!-- Controls -->
- <a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
- <span class="icon-prev"></span>
- </a>
- <a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
- <span class="icon-next"></span>
- </a>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12">
- <h2>Alerts</h2>
- <div class="bs-component">
- <div class="alert alert-dismissable alert-warning">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <h4>Warning!</h4>
- <p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, <a href="#" class="alert-link">vel scelerisque nisl consectetur et</a>.</p>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="alert alert-dismissable alert-danger">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <strong>Oh snap!</strong> <a href="#" class="alert-link">Change a few things up</a> and try submitting again.
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="alert alert-dismissable alert-success">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <strong>Well done!</strong> You successfully read <a href="#" class="alert-link">this important alert message</a>.
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="alert alert-dismissable alert-info">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <strong>Heads up!</strong> This <a href="#" class="alert-link">alert needs your attention</a>, but it's not super important.
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2>Labels</h2>
- <div class="bs-component" style="margin-bottom: 40px;">
- <span class="label label-default">Default</span>
- <span class="label label-primary">Primary</span>
- <span class="label label-success">Success</span>
- <span class="label label-warning">Warning</span>
- <span class="label label-danger">Danger</span>
- <span class="label label-info">Info</span>
- </div>
- </div>
- <div class="col-lg-4">
- <h2>Badges</h2>
- <div class="bs-component">
- <ul class="nav nav-pills">
- <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
- <li><a href="#">Profile <span class="badge"></span></a></li>
- <li><a href="#">Messages <span class="badge">3</span></a></li>
- </ul>
- </div>
- </div>
- </div>
-
- <!-- Progress bars
- ================================================== -->
- <div class="bs-docs-section">
-
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="progress">Progress bars</h1>
- </div>
-
- <h3 id="progress-basic">Basic</h3>
- <div class="bs-component">
- <div class="progress">
- <div class="progress-bar" style="width: 60%;"></div>
- </div>
- </div>
-
- <h3 id="progress-alternatives">Contextual alternatives</h3>
- <div class="bs-component">
- <div class="progress">
- <div class="progress-bar progress-bar-info" style="width: 20%"></div>
- </div>
-
- <div class="progress">
- <div class="progress-bar progress-bar-success" style="width: 40%"></div>
- </div>
-
- <div class="progress">
- <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
- </div>
-
- <div class="progress">
- <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
- </div>
- </div>
-
- <h3 id="progress-striped">Striped</h3>
- <div class="bs-component">
- <div class="progress progress-striped">
- <div class="progress-bar progress-bar-info" style="width: 20%"></div>
- </div>
-
- <div class="progress progress-striped">
- <div class="progress-bar progress-bar-success" style="width: 40%"></div>
- </div>
-
- <div class="progress progress-striped">
- <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
- </div>
-
- <div class="progress progress-striped">
- <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
- </div>
- </div>
-
- <h3 id="progress-animated">Animated</h3>
- <div class="bs-component">
- <div class="progress progress-striped active">
- <div class="progress-bar" style="width: 45%"></div>
- </div>
- </div>
-
- <h3 id="progress-stacked">Stacked</h3>
- <div class="bs-component">
- <div class="progress">
- <div class="progress-bar progress-bar-success" style="width: 35%"></div>
- <div class="progress-bar progress-bar-warning" style="width: 20%"></div>
- <div class="progress-bar progress-bar-danger" style="width: 10%"></div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Containers
- ================================================== -->
- <div class="bs-docs-section">
-
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="container">Containers</h1>
- </div>
- <div class="bs-component">
- <div class="jumbotron">
- <h1>Jumbotron</h1>
- <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
- <p><a class="btn btn-primary btn-lg">Learn more</a></p>
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="row">
- <div class="col-lg-12">
- <h2>List groups</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <div class="bs-component">
- <ul class="list-group">
- <li class="list-group-item">
- <span class="badge">14</span>
- Cras justo odio
- </li>
- <li class="list-group-item">
- <span class="badge">2</span>
- Dapibus ac facilisis in
- </li>
- <li class="list-group-item">
- <span class="badge">1</span>
- Morbi leo risus
- </li>
- </ul>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="list-group">
- <a href="#" class="list-group-item active">
- Cras justo odio
- </a>
- <a href="#" class="list-group-item">Dapibus ac facilisis in
- </a>
- <a href="#" class="list-group-item">Morbi leo risus
- </a>
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="list-group">
- <a href="#" class="list-group-item">
- <h4 class="list-group-item-heading">List group item heading</h4>
- <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
- </a>
- <a href="#" class="list-group-item">
- <h4 class="list-group-item-heading">List group item heading</h4>
- <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
- </a>
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="row">
- <div class="col-lg-12">
- <h2>Panels</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="panel panel-default">
- <div class="panel-body">
- Basic panel
- </div>
- </div>
-
- <div class="panel panel-default">
- <div class="panel-heading">Panel heading</div>
- <div class="panel-body">
- Panel content
- </div>
- </div>
-
- <div class="panel panel-default">
- <div class="panel-body">
- Panel content
- </div>
- <div class="panel-footer">Panel footer</div>
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="panel panel-primary">
- <div class="panel-heading">
- <h3 class="panel-title">Panel primary</h3>
- </div>
- <div class="panel-body">
- Panel content
- </div>
- </div>
-
- <div class="panel panel-success">
- <div class="panel-heading">
- <h3 class="panel-title">Panel success</h3>
- </div>
- <div class="panel-body">
- Panel content
- </div>
- </div>
-
- <div class="panel panel-warning">
- <div class="panel-heading">
- <h3 class="panel-title">Panel warning</h3>
- </div>
- <div class="panel-body">
- Panel content
- </div>
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="panel panel-danger">
- <div class="panel-heading">
- <h3 class="panel-title">Panel danger</h3>
- </div>
- <div class="panel-body">
- Panel content
- </div>
- </div>
-
- <div class="panel panel-info">
- <div class="panel-heading">
- <h3 class="panel-title">Panel info</h3>
- </div>
- <div class="panel-body">
- Panel content
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12">
- <h2>Wells</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="well">
- Look, I'm in a well!
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="well well-sm">
- Look, I'm in a small well!
- </div>
- </div>
- </div>
- <div class="col-lg-4">
- <div class="bs-component">
- <div class="well well-lg">
- Look, I'm in a large well!
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Dialogs
- ================================================== -->
- <div class="bs-docs-section">
-
- <div class="row">
- <div class="col-lg-12">
- <div class="page-header">
- <h1 id="dialogs">Dialogs</h1>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-6">
- <h2>Modals</h2>
- <div class="bs-component">
- <a class="btn btn-default" data-toggle="modal" data-target="#previewModal">Show modal dialog</a>
- <div id="previewModal" class="modal">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h4 class="modal-title">Modal title</h4>
- </div>
- <div class="modal-body">
- <p>One fine body…</p>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
- <button type="button" class="btn btn-primary">Save changes</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- <h2>Bootstrap3-Dialog Plugin</h2>
- <div class="bs-component">
- <a href="javascript:;" class="btn btn-primary" id="dialog-normal">Normal modal</a>
- <a href="javascript:;" class="btn btn-danger" id="dialog-alert">Alert modal</a>
- <a href="javascript:;" class="btn btn-warning" id="dialog-confirm">Confirm modal</a>
- <a href="https://nakupanda.github.io/bootstrap3-dialog/" class="btn btn-success" target="_blank">More sample</a>
- </div>
- </div>
- <div class="col-lg-6">
- <h2>Popovers</h2>
- <div class="bs-component">
- <button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">Left</button>
-
- <button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">Top</button>
-
- <button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">Bottom</button>
-
- <button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">Right</button>
- </div>
- <h2>Tooltips</h2>
- <div class="bs-component">
- <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="" data-original-title="Tooltip on left">Left</button>
-
- <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="" data-original-title="Tooltip on top">Top</button>
-
- <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Tooltip on bottom">Bottom</button>
-
- <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="" data-original-title="Tooltip on right">Right</button>
- </div>
- </div>
- </div>
- </div>
-
- <div class="bs-docs-section">
- <h2>Toastr</h2>
- <div class="well">
- <div class="row">
- <div class="col-md-4">
- <div class="form-group">
- <label class="control-label" for="title">Title</label>
- <input id="title" type="text" class="form-control" placeholder="Enter a title ..." />
- </div>
- <div class="form-group">
- <label class="control-label" for="message">Message</label>
- <textarea class="form-control" id="message" rows="3" placeholder="Enter a message ..."></textarea>
- </div>
- <div class="form-group radio">
- <label class="checkbox" for="closeButton">
- <input id="closeButton" type="checkbox" value="checked" class="input-mini" />Close Button
- </label>
- </div>
- <div class="form-group radio">
- <label class="checkbox" for="addBehaviorOnToastClick">
- <input id="addBehaviorOnToastClick" type="checkbox" value="checked" class="input-mini" />Add behavior on toast click
- </label>
- </div>
- <div class="form-group radio">
- <label class="checkbox" for="debugInfo">
- <input id="debugInfo" type="checkbox" value="checked" class="input-mini" />Debug
- </label>
- </div>
- </div>
-
- <div class="col-md-2">
- <div id="toastTypeGroup">
- <label>Toast Type</label>
- <div class="form-group radio">
- <label>
- <input type="radio" name="toasts" value="success" checked />Success
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="toasts" value="info" />Info
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="toasts" value="warning" />Warning
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="toasts" value="error" />Error
- </label>
- </div>
- </div>
- <div id="positionGroup">
- <label>Position</label>
- <div class="form-group radio">
- <label>
- <input type="radio" name="positions" value="toast-top-right" checked />Top Right
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="positions" value="toast-bottom-right" />Bottom Right
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="positions" value="toast-bottom-left" />Bottom Left
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="positions" value="toast-top-left" />Top Left
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="positions" value="toast-top-full-width" />Top Full Width
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="positions" value="toast-bottom-full-width" />Bottom Full Width
- </label>
- </div>
- </div>
- </div>
-
- <div class="col-md-2">
- <div class="form-group">
- <div class="form-group">
- <label class="control-label" for="showEasing">Show Easing</label>
- <input id="showEasing" type="text" placeholder="swing, linear" class="form-control" value="swing" />
- </div>
- <div class="form-group">
- <label class="control-label" for="hideEasing">Hide Easing</label>
- <input id="hideEasing" type="text" placeholder="swing, linear" class="form-control" value="linear" />
- </div>
- <div class="form-group">
- <label class="control-label" for="showMethod">Show Method</label>
- <input id="showMethod" type="text" placeholder="show, fadeIn, slideDown" class="form-control" value="fadeIn" />
- </div>
- <div class="form-group">
- <label class="control-label" for="hideMethod">Hide Method</label>
- <input id="hideMethod" type="text" placeholder="hide, fadeOut, slideUp" class="form-control" value="fadeOut" />
- </div>
- </div>
- </div>
-
- <div class="col-md-3">
- <div class="form-group">
- <label class="control-label" for="showDuration">Show Duration</label>
- <input id="showDuration" type="text" placeholder="ms" class="form-control" value="300" />
- </div>
- <div class="form-group">
- <label class="control-label" for="hideDuration">Hide Duration</label>
- <input id="hideDuration" type="text" placeholder="ms" class="form-control" value="1000" />
- </div>
- <div class="form-group">
- <label class="control-label" for="timeOut">Time out</label>
- <input id="timeOut" type="text" placeholder="ms" class="form-control" value="5000" />
- </div>
- <div class="form-group">
- <label class="control-label" for="timeOut">Extended time out</label>
- <input id="extendedTimeOut" type="text" placeholder="ms" class="form-control" value="1000" />
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-12">
- <button type="button" class="btn btn-primary" id="showtoast">Show Toast</button>
- <button type="button" class="btn btn-danger" id="cleartoasts">Clear Toasts</button>
- <button type="button" class="btn btn-danger" id="clearlasttoast">Clear Last Toast</button>
- </div>
- </div>
-
- <div class="row" style='margin-top: 25px;'>
- <div class="col-md-12">
- <pre id='toastrOptions'></pre>
- </div>
- </div>
- </div>
-
-</div>
\ 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 d6fd440..0000000
--- a/application/index/view/demo/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="container">
- <div class="row">
- <div class="col-sm-12">
- Demo
- </div>
- </div>
-</div>
\ 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 3e85d00..0000000
--- a/application/index/view/demo/qrcode.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<div class="container">
- <h2>二维码生成</h2>
- <div class="well">
- <form action="" method="post">
- <input type="hidden" name="issubmit" value="1">
- <div class="row">
- <div class="col-md-4">
- <div class="form-group">
- <label class="control-label">文本内容</label>
- <input type="text" name="text" class="form-control" placeholder="" value="http://www.fastadmin.net">
- </div>
- <div class="form-group">
- <label class="control-label">标签</label>
- <input type="text" name="label" placeholder="" class="form-control" value="FastAdmin">
- </div>
- <div class="form-group">
- <label class="control-label">Logo</label>
- <div class="form-inline">
- <div class="radio">
- <label>
- <input type="radio" name="logo" id="logoyes" value="1" checked="">
- 显示(Logo地址在代码中修改)
- </label>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="logo" id="logono" value="0">
- 不显示
- </label>
- </div>
- </div>
- </div>
- <div class="form-group">
- <input type="submit" class="btn btn-info" />
- <input type="reset" class="btn btn-default" />
- </div>
- </div>
-
- <div class="col-md-2">
- <div id="toastTypeGroup">
- <label>标签水平位置</label>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="0" checked="">居中</label>
- </div>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="1">左</label>
- </div>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="2">左边框</label>
- </div>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="3">左图片</label>
- </div>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="4">右</label>
- </div>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="5">右边框</label>
- </div>
- <div class="form-group radio">
- <label><input type="radio" name="labelhalign" value="6">右图片</label>
- </div>
- </div>
- <div id="positionGroup">
- <label>标签垂直位置</label>
- <div class="form-group radio">
- <label>
- <input type="radio" name="labelvalign" value="1">上
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="labelvalign" value="2">上边框
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="labelvalign" value="3" checked="">中
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="labelvalign" value="4">下
- </label>
- </div>
- </div>
- </div>
-
- <div class="col-md-2">
- <div class="form-group">
- <div class="form-group">
- <label class="control-label">前景色</label>
- <input type="text" name="foreground" placeholder="" class="form-control" value="#ffffff">
- </div>
- <div class="form-group">
- <label class="control-label">背景色</label>
- <input type="text" name="background" placeholder="" class="form-control" value="#000000">
- </div>
- <div class="form-group">
- <label class="control-label">大小</label>
- <input type="number" name="size" placeholder="" class="form-control" value="300">
- </div>
- <div class="form-group">
- <label class="control-label">内边距</label>
- <input type="number" name="padding" placeholder="" class="form-control" value="10">
- </div>
- </div>
- </div>
-
- <div class="col-md-3">
- <div class="form-group">
- <label class="control-label">Logo大小</label>
- <input type="number" name="logosize" placeholder="" class="form-control" value="50">
- </div>
- <div class="form-group">
- <label class="control-label">标签大小</label>
- <input type="number" name="labelfontsize" placeholder="" class="form-control" value="14">
- </div>
- <div class="form-group">
- <div id="positionGroup">
- <label>容错级别</label>
- <div class="form-group radio">
- <label>
- <input type="radio" name="errorcorrection" value="low">低
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="errorcorrection" value="medium" checked="">中等
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="errorcorrection" value="quartile">高
- </label>
- </div>
- <div class="form-group radio">
- <label>
- <input type="radio" name="errorcorrection" value="high">超高
- </label>
- </div>
- </div>
- </div>
- </div>
- </div>
- </form>
- </div>
- <img src="" alt="" id='qrcodeimg' />
-</div>
\ No newline at end of file
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 207946b..ce236ac 100644
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -1,55 +1,224 @@
-<div class="container">
- <div class="row">
- <div class="col-xs-6">
-
- <a href="{:url('admin/index/login')}" class="btn btn-block btn-lg btn-success">FastAdmin后台演示</a>
- </div>
- <div class="col-xs-6">
- <a href="http://git.oschina.net/karson/fastadmin?ref=fastadmin" target="_blank" class="btn btn-block btn-lg btn-info">FastAdmin源码下载</a>
- </div>
- </div>
- <div class="page-header"><h3>组件</h3></div>
-
- <div class="row" id="component-list">
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <a href="{:url('index/user/login')}"><img style="height: 200px; width: 100%; display: block;" src="__CDN__/assets/img/third.jpg" data-holder-rendered="true"></a>
- <div class="caption">
- <h3>第三方登录</h3>
- <p>FastAdmin中自带第三方登录扩展组件,包括微博登录、QQ登录、微信登录,可极速进行第三方登录的融合,同时系统中已提供注册登录的代码</p>
- <p><a href="{:url('index/user/login')}" class="btn btn-primary" role="button">预览</a> <a href="http://git.oschina.net/karson/fastadmin" class="btn btn-default" role="button">下载</a></p>
+<!DOCTYPE html>
+<html>
+
+ <head>
+
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <title>FastAdmin - 基于ThinkPHP5和Bootstrap的极速后台开发框架</title>
+
+ <!-- Bootstrap Core CSS -->
+ <link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/assets/css/index.css" rel="stylesheet">
+
+ <!-- Custom Fonts -->
+ <link href="https://fonts.lug.ustc.edu.cn/css?family=Lato" rel="stylesheet">
+ <link href="https://fonts.lug.ustc.edu.cn/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel="stylesheet">
+ <link href="https://fonts.lug.ustc.edu.cn/css?family=Muli" rel="stylesheet">
+
+ <!-- Plugin CSS -->
+ <link href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="//cdn.bootcss.com/simple-line-icons/2.4.1/css/simple-line-icons.min.css" rel="stylesheet">
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!--[if lt IE 9]>
+ <script src="//cdn.bootcss.com/html5shiv/3.7.0/html5shiv.min.js"></script>
+ <script src="//cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ </head>
+
+ <body id="page-top">
+
+ <nav id="mainNav" class="navbar navbar-default navbar-fixed-top">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-menu">
+ <span class="sr-only">Toggle navigation</span><i class="fa fa-bars"></i>
+ </button>
+ <a class="navbar-brand page-scroll" href="#page-top"><img src="/assets/img/logo.png" style="width:200px;" alt=""></a>
+ </div>
+
+ <div class="collapse navbar-collapse" id="navbar-collapse-menu">
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="http://www.fastadmin.net">首页</a></li>
+ <li><a href="http://www.fastadmin.net#features">特性</a></li>
+ <li><a href="http://doc.fastadmin.net">文档</a></li>
+ <li><a href="http://forum.fastadmin.net">论坛</a></li>
+ <li><a href="http://www.fastadmin.net#donate">打赏</a></li>
+ <li><a href="http://www.fastadmin.net#contact">联系</a></li>
+ <li><a href="http://html.fastadmin.net" target="_blank">HTML版</a></li>
+ <li><a href="http://demo.fastadmin.net?ref=nav" target="_blank">演示</a></li>
+
+ </ul>
</div>
+ <!-- /.navbar-collapse -->
</div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <a href="{:url('index/user/login')}"><img style="height: 200px; width: 100%; display: block;" src="__CDN__/assets/img/ucenter.jpg" data-holder-rendered="true"></a>
- <div class="caption">
- <h3>Ucenter整合登录</h3>
- <p>FastAdmin中基于Ucenter融合一套账号同步登录注册退出的方案,同时提供修改版Ucenter和Discuz论坛代码下载,同时适应于PHP7,此版本改动较大,建议适用于新系统的开发</p>
- <p><a href="{:url('index/user/login')}" class="btn btn-primary" role="button">预览</a> <a href="http://git.oschina.net/karson/fastadmin" class="btn btn-default" role="button">下载</a></p>
+ <!-- /.container-fluid -->
+ </nav>
+
+ <header>
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="header-content">
+ <div class="header-content-inner">
+ <h1>FastAdmin</h1>
+ <h3>基于ThinkPHP5和Bootstrap的极速后台开发框架</h3>
+ <a href="{:url('admin/index/login')}" class="btn btn-outline btn-xl page-scroll">登录后台</a>
+ </div>
+ </div>
+ </div>
</div>
</div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <a href="{:url('index/demo/qrcode')}"><img style="height: 200px; width: 100%; display: block;" src="__CDN__/assets/img/qrcode.jpg" data-holder-rendered="true"></a>
- <div class="caption">
- <h3>二维码生成</h3>
- <p>基于第三方组件增加了一个二维码的生成示例,可快速的调整文字、标签、Logo的大小、颜色、字体等等。此外还可对标签位置、容错率等进行相关设置。</p>
- <p><a href="{:url('index/demo/qrcode')}" class="btn btn-primary" role="button">预览</a> <a href="http://git.oschina.net/karson/fastadmin" class="btn btn-default" role="button">下载</a></p>
+ </header>
+
+ <section id="features" class="features">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 text-center">
+ <div class="section-heading">
+ <h2>功能特性</h2>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-md-4">
+ <div class="feature-item">
+ <i class="icon-user text-primary"></i>
+ <h3>权限管理</h3>
+ <p class="text-muted">基于完善的Auth权限控制管理、无限父子级权限分组、可自由分配子级权限、一个管理员可同时属于多个组别</p>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="feature-item">
+ <i class="icon-screen-smartphone text-primary"></i>
+ <h3>响应式开发</h3>
+ <p class="text-muted">基于Bootstrap和AdminLTE进行二次开发,手机、平板、PC均自动适配,无需要担心兼容性问题</p>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="feature-item">
+ <i class="icon-present text-primary"></i>
+ <h3>多语言</h3>
+ <p class="text-muted">不仅仅后台开发支持多语言,同时视图部分和JS部分仍然共享同一个语言包,语法相同且自动加载</p>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="feature-item">
+ <i class="icon-layers text-primary"></i>
+ <h3>模块化开发</h3>
+ <p class="text-muted">控制器、模型、视图、JS一一对应,使用RequireJS进行JS模块化管理,采用Bower进行前端包组件管理</p>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="feature-item">
+ <i class="icon-docs text-primary"></i>
+ <h3>CRUD</h3>
+ <p class="text-muted">控制台进行一键生成控制器、模型、视图和JS文件,同时可一键生成后台权限节点和菜单栏</p>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="feature-item">
+ <i class="icon-puzzle text-primary"></i>
+ <h3>自由可扩展</h3>
+ <p class="text-muted">FastAdmin提供强大的扩展中心，可直接在线安装和卸载插件，同时支持命令行一键操作</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <a href="{:url('index/demo/bootstrap')}"><img style="height: 200px; width: 100%; display: block;" src="__CDN__/assets/img/bootstrap.jpg" data-holder-rendered="true"></a>
- <div class="caption">
- <h3>Bootstrap组件</h3>
- <p>由于FastAdmin对Bootstrap进行了大量的二次开发,对Bootstrap的组件样式有许多更改,你可以直接在这里预览到Bootstrap的部分组件</p>
- <p><a href="{:url('index/demo/bootstrap')}" class="btn btn-primary" role="button">预览</a> <a href="http://git.oschina.net/karson/fastadmin" class="btn btn-default" role="button">下载</a></p>
+ </section>
+
+ <section class="cta">
+ <div class="cta-content">
+ <div class="container">
+ <h2>不要犹豫<br>开始行动</h2>
+ <a href="http://doc.fastadmin.net/docs/contributing.html" class="btn btn-outline btn-xl page-scroll">为FastAdmin贡献代码!</a>
</div>
</div>
- </div>
- </div>
-</div>
\ No newline at end of file
+ <div class="overlay"></div>
+ </section>
+
+ <footer>
+ <div class="container">
+ <p>© 2017 FastAdmin. All Rights Reserved.</p>
+ <ul class="list-inline">
+ <li>
+ <a href="https://gitee.com/karsonzhang/fastadmin">码云</a>
+ </li>
+ <li>
+ <a href="https://github.com/karsonzhang/fastadmin">Github</a>
+ </li>
+ <li>
+ <a href="http://shang.qq.com/wpa/qunwpa?idkey=46c326e570d0f97cfae1f8257ae82322192ec8841c79b2136446df0b3b62028c">QQ群</a>
+ </li>
+ </ul>
+ </div>
+ </footer>
+
+ <!-- jQuery -->
+ <script src="//cdn.bootcss.com/jquery/2.1.4/jquery.min.js"></script>
+
+ <!-- Bootstrap Core JavaScript -->
+ <script src="//cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+
+ <!-- Plugin JavaScript -->
+ <script src="//cdn.bootcss.com/jquery-easing/1.4.1/jquery.easing.min.js"></script>
+
+ <script>
+ $(function () {
+ $(window).on("scroll", function () {
+ $("#mainNav").toggleClass("affix", $(window).height() - $(window).scrollTop() <= 50);
+ });
+
+
+ //发送版本统计信息
+ try {
+ var installed = localStorage.getItem("installed");
+ console.log(installed);
+ if (!installed) {
+ $.ajax({
+ url: "http://fast/api/statistics/installed",
+ data: {
+ version: "{:config('fastadmin.version')}",
+ os: "{$Think.PHP_OS}",
+ sapi: "{$Think.PHP_SAPI}",
+ tpversion: "{$Think.THINK_VERSION}",
+ phpversion: "{$Think.PHP_VERSION}",
+ software: "{$Request.server.SERVER_SOFTWARE}",
+ url: location.href,
+ },
+ dataType: 'jsonp',
+ });
+ localStorage.setItem("installed", true);
+ }
+ } catch (e) {
+
+ }
+
+ });
+ </script>
+
+ <script>
+ var _hmt = _hmt || [];
+ (function () {
+ var hm = document.createElement("script");
+ hm.src = "https://hm.baidu.com/hm.js?f8d0a8c400404989e195270b0bbf060a";
+ var s = document.getElementsByTagName("script")[0];
+ s.parentNode.insertBefore(hm, s);
+ })();
+ </script>
+
+ </body>
+
+</html>
+
diff --git a/application/index/view/layout/bootstrap.html b/application/index/view/layout/bootstrap.html
deleted file mode 100644
index ee32581..0000000
--- a/application/index/view/layout/bootstrap.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html lang="{$config.language}">
- <head>
- <meta charset="utf-8">
- <title>FastAdmin</title>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="description" content="基于ThinkPHP5和Bootstrap的极速后台开发框架">
- <meta name="renderer" content="webkit">
- <link rel="shortcut icon" href="__CDN__/assets/img/favicon.ico" />
- <!-- Loading Bootstrap -->
- <link href="__CDN__/assets/css/frontend{$Think.config.app_debug?'':'.min'}.css?v={$Think.config.site.version}" rel="stylesheet">
-
- <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
- <!--[if lt IE 9]>
- <script src="__CDN__/assets/js/html5shiv.js"></script>
- <script src="__CDN__/assets/js/respond.min.js"></script>
- <![endif]-->
- <script type="text/javascript">
- var require = {
- config: {$config | json_encode}
- };
- </script>
- <style>
- html{height:100%;overflow:auto;-webkit-overflow-scrolling: touch;}
- body{padding:70px 0 0 0;}
- footer {margin-top:20px;font-size:14px;padding:25px 0;background:#f4f6f6;}
- .footer-link ul li a{margin-top:10px;line-height: 25px;}
- #component-list .caption p {font-size:13px;line-height:20px;}
- </style>
-
- <script>
- var _hmt = _hmt || [];
- (function () {
- var hm = document.createElement("script");
- hm.src = "https://hm.baidu.com/hm.js?58347d769d009bcf6074e9a0ab7ba05e";
- var s = document.getElementsByTagName("script")[0];
- s.parentNode.insertBefore(hm, s);
- })();
- </script>
- </head>
- <body>
- <div class="navbar navbar-default navbar-fixed-top">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-main">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a href="{:url('/')}" class="navbar-brand">FastAdmin</a>
- </div>
- <div class="collapse navbar-collapse" id="navbar-collapse-main">
- <ul class="nav navbar-nav">
- <li><a href="http://www.fastadmin.net">官网</a></li>
- <li><a href="http://doc.fastadmin.net">文档</a></li>
- <li><a href="http://forum.fastadmin.net">论坛</a></li>
- <li class="divider"></li>
- <li><a href="http://www.fastadmin.net#donate">打赏</a></li>
- <li><a href="http://demo.fastadmin.net">演示</a></li>
- </ul>
- <form class="navbar-form navbar-left" action="http://forum.fastadmin.net">
- <input name="q" type="text" class="form-control col-lg-8" placeholder="搜索">
- </form>
- <ul class="nav navbar-nav pull-right">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">你好!{:$user->id?$user->nickname:'游客'} <span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li><a id="admin" href="{:url('admin/index/index')}"><span class="text text-danger">后台演示</span></a></li>
- <li><a id="home" href="http://www.fastadmin.net?ref=demo"><span class="text text-info">返回官网</span></a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- </div>
-
-
- {__CONTENT__}
-
- <footer>
- <div class="container">
- <div class="row">
- <div class="col-xs-12">
- <div class="footer-link">
- <ul class="list-inline">
- <li><a href="http://www.fastadmin.net">官方网站</a></li>
- <li><a href="http://doc.fastadmin.net">帮助文档</a></li>
- <li><a href="https://git.oschina.net/karson/fastadmin">Git@OSC</a></li>
- <li><a href="http://www.fastadmin.net/#donate" class="">捐赠打赏</a></li>
- <li><a href="http://forum.fastadmin.net" class="">交流社区</a></li>
- <li><a href="http://demo.fastadmin.net/" class="">在线演示</a></li>
- </ul>
- </div>
-
- <div class="pull-left">
- <p>
- <span class="text-muted"><a href="http://www.miitbeian.gov.cn/" target="_blank">{$site.beian}</a></span>
- </p>
- <span class="small"></span>
- <p>
- Copyright © fastadmin.net 2017-2018 All rights reserved
- </p>
- </div>
- <div class="pull-right hidden-xs hidden-sm">
-
- </div>
- <div class="clearfix"></div>
- </div>
-
- </div>
- </div>
- </footer>
-
- <script src="__CDN__/assets/js/require.js" data-main="__CDN__/assets/js/require-frontend{$Think.config.app_debug?'':'.min'}.js?v={$site.version}"></script>
- </body>
-</html>
\ 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 309c2fe..0000000
--- a/application/index/view/layout/user.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html lang="{$config.language}">
- <head>
- <title>会员中心</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="renderer" content="webkit" />
- <link href="__CDN__/assets/css/bootstrap.min.css" rel="stylesheet" />
- <link href="__CDN__/assets/css/fastadmin.min.css" rel="stylesheet" />
- <link href="__CDN__/assets/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
-
- <link rel="shortcut icon" href="__CDN__/assets/img/favicon.ico" />
-
- <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
- <!--[if lt IE 9]>
- <script src="__CDN__/assets/js/html5shiv.js"></script>
- <script src="__CDN__/assets/js/respond.min.js"></script>
- <![endif]-->
- </head>
- <body>
- <div class="row tips">
- <div class="col-xs-12">
- <div class="box box-gray">
- <div class="box-body">
- {__CONTENT__}
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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 5c8a71a..0000000
--- a/application/index/view/user/changepwd.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="container">
- <div class="panel panel-default">
- <div class="panel-body">
- <div class="page-header" style="margin-top:10px;">
- <h4>修改密码</h4>
- </div>
- <div class="row">
- <div class="col-md-6 col-xs-12">
- <div class="well">
- <form id="loginForm" method="POST" action="#">
- <div class="form-group">
- <label for="oldpassword" class="control-label">旧密码</label>
- <input type="password" class="form-control" id="oldpassword" name="oldpassword" value="" required="" placeholder="旧密码">
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="newpassword" class="control-label">新密码</label>
- <input type="password" class="form-control" id="newpassword" name="newpassword" value="" required="" placeholder="新密码" />
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="renewpassword" class="control-label">确认新密码</label>
- <input type="password" class="form-control" id="renewpassword" name="renewpassword" value="" required="" placeholder="确认新密码" />
- <span class="help-block"></span>
- </div>
- <button type="submit" class="btn btn-success btn-block">提 交</button>
- <a href="{:url('user/index')}" class="btn btn-default btn-block">返回</a>
- </form>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
\ 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 1c86640..0000000
--- a/application/index/view/user/index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="container">
- <div class="panel panel-default">
- <div class="panel-body">
- <div class="page-header" style="margin-top:10px;">
- <h4>会员中心</h4>
- </div>
- <div class="row">
- <div class="col-xs-12">
- {if $user->check()}
- <div class="alert alert-dismissable bg-gray-light clearfix">
- <div class="pull-left"><img class="img-responsive img-circle" style="width:100px;" src="/assets/img/avatar.png" /></div>
- <div class="pull-left text-left" style="margin-left:15px;">
- <p>
- {:__('Welcome', $user->nickname)}<br />
- Lv:{$user->level}
- </p>
- </div>
- </div>
- <div>
- <div class="list-group">
- <a href="{:url('user/changepwd')}" class="list-group-item">
- <i class="fa fa-user"></i> 修改密码
- </a>
- <a href="#" class="list-group-item">
- <span class="badge">2</span>
- <i class="fa fa-list"></i> 我发表的帖子
- </a>
- <a href="#" class="list-group-item">
- <span class="badge">1</span>
- <i class="fa fa-list-alt"></i> 我发表的主题
- </a>
- </div>
- </div>
-
- <a class="btn btn-danger btn-block" href="{:url('user/logout')}"><i class="fa fa-user"></i> 立即注销</a>
- {else/}
- <a class="btn btn-info btn-block" href="{:url('user/register')}"><i class="fa fa-user"></i> 立即注册</a>
- <a class="btn btn-success btn-block" href="{:url('user/login')}"><i class="fa fa-user"></i> 立即登录</a>
- {/if}
- </div>
- </div>
- </div>
- </div>
-</div>
\ 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 06f74d3..0000000
--- a/application/index/view/user/login.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="container">
- <div class="panel panel-default">
- <div class="panel-body">
- <div class="page-header" style="margin-top:10px;">
- <h4>登录</h4>
- </div>
- <div class="row">
- <div class="col-md-6 col-xs-12">
- <div class="well">
- <form id="loginForm" method="POST" action="#">
- <div class="form-group">
- <label for="account" class="control-label">账号</label>
- <input type="text" class="form-control" id="account" name="account" value="" required="" placeholder="用户名、手机或邮箱">
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="password" class="control-label">密码</label>
- <input type="password" class="form-control" id="password" name="password" value="" required="" />
- <span class="help-block"></span>
- </div>
- <div id="loginErrorMsg" class="alert alert-error hide">Wrong username og password</div>
- <div class="checkbox">
- <label>
- <input type="checkbox" name="remember" id="remember"> 记住我
- </label>
- </div>
- <button type="submit" class="btn btn-success btn-block">提 交</button>
- <a href="{:url('user/register')}" class="btn btn-default btn-block">注册一个新账号</a>
- </form>
- </div>
- </div>
- <div class="col-md-6 col-xs-12">
- <p class="lead">会员权益</p>
- <ul class="list-unstyled" style="line-height: 2">
- <li><span class="fa fa-check text-success"></span> 最新代码推送</li>
- <li><span class="fa fa-check text-success"></span> 发布评论</li>
- <li><span class="fa fa-check text-success"></span> 个性化头像</li>
- <li><span class="fa fa-check text-success"></span> 定制专属页面</li>
- <li><span class="fa fa-check text-success"></span> 发现更多</li>
- </ul>
- <a href="{:url('user/third?action=redirect&platform=weibo')}" class="btn btn-danger btn-block"><i class="fa fa-weibo"></i> 微博登录</a>
- <a href="{:url('user/third?action=redirect&platform=wechat')}" class="btn btn-success btn-block"><i class="fa fa-wechat"></i> 微信登录</a>
- <a href="{:url('user/third?action=redirect&platform=qq')}" class="btn btn-info btn-block"><i class="fa fa-qq"></i> QQ登录</a>
- </div>
- </div>
- </div>
- </div>
-</div>
\ 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 01af6d5..0000000
--- a/application/index/view/user/register.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="container">
- <div class="panel panel-default">
- <div class="panel-body">
- <div class="page-header" style="margin-top:10px;">
- <h4>注册</h4>
- </div>
- <div class="row">
- <div class="col-md-6 col-xs-12">
- <div class="well">
- <form id="registerForm" method="POST" action="#">
- <div class="form-group">
- <label for="email" class="control-label">邮箱</label>
- <input type="text" class="form-control" id="email" name="email" value="" required="" placeholder="">
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="username" class="control-label">用户名</label>
- <input type="text" class="form-control" id="username" name="username" value="" required="" placeholder="">
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="mobile" class="control-label">手机</label>
- <input type="text" class="form-control" id="mobile" name="mobile" value="" placeholder="可选">
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="password" class="control-label">密码</label>
- <input type="password" class="form-control" id="password" name="password" value="" required="" />
- <span class="help-block"></span>
- </div>
- <div class="form-group">
- <label for="password" class="control-label">验证码</label>
- <div class="input-group">
- <input type="text" name="captcha" class="form-control" />
- <span class="input-group-addon" style="padding:0;border:none;">
- <img src="{:captcha_src()}" width="100" height="30" onclick="this.src = '{:captcha_src()}?r=' + Math.random();"/>
- </span>
- </div>
- <span class="help-block"></span>
- </div>
- <button type="submit" class="btn btn-success btn-block">提 交</button>
- <a href="{:url('user/login')}" class="btn btn-default btn-block">已经账号,立即登录</a>
- </form>
- </div>
- </div>
- <div class="col-md-6 col-xs-12">
- <p class="lead">会员权益</p>
- <ul class="list-unstyled" style="line-height: 2">
- <li><span class="fa fa-check text-success"></span> 最新代码推送</li>
- <li><span class="fa fa-check text-success"></span> 发布评论</li>
- <li><span class="fa fa-check text-success"></span> 个性化头像</li>
- <li><span class="fa fa-check text-success"></span> 定制专属页面</li>
- <li><span class="fa fa-check text-success"></span> 发现更多</li>
- </ul>
- <a href="{:url('user/third?action=redirect&platform=weibo')}" class="btn btn-danger btn-block"><i class="fa fa-weibo"></i> 微博登录</a>
- <a href="{:url('user/third?action=redirect&platform=wechat')}" class="btn btn-success btn-block"><i class="fa fa-wechat"></i> 微信登录</a>
- <a href="{:url('user/third?action=redirect&platform=qq')}" class="btn btn-info btn-block"><i class="fa fa-qq"></i> QQ登录</a>
- </div>
- </div>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/application/uc.php b/application/uc.php
deleted file mode 100644
index 17976ba..0000000
--- a/application/uc.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-//UC配置
-// Ucenter配置配置
-define('UC_STATUS', false); //是否开启Ucenter同步
-
-define('UC_CONNECT', 'mysql');
-
-// 数据库相关 (mysql 连接时, 并且没有设置 UC_DBLINK 时, 需要配置以下变量)
-define('UC_DBHOST', 'localhost'); // UCenter 数据库主机
-define('UC_DBUSER', 'root'); //
-define('UC_DBPW', ''); //
-define('UC_DBNAME', 'ucenter'); //
-define('UC_DBCHARSET', 'utf8'); //
-define('UC_DBTABLEPRE', 'ucenter.uc_'); // UCenter 数据库表前缀
-define('UC_DBCONNECT', '0'); //是否持久链接
-//
-// 通信相关
-define('UC_KEY', '123456789'); // 与 UCenter 的通信密钥, 要与 UCenter 保持一致
-define('UC_API', 'http://www.ucenter.com'); // UCenter 的 URL 地址, 在调用头像时依赖此常量
-define('UC_CHARSET', 'utf-8'); // UCenter 的字符集
-define('UC_IP', ''); // UCenter 的 IP, 当 UC_CONNECT 为非 mysql 方式时, 并且当前应用服务器解析域名有问题时, 请设置此值
-define('UC_APPID', 1); // 当前应用的 ID
-define('UC_PPP', '20'); //在线默认分页大小
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 3a8ea47..dc2c4c7 100644
--- a/bower.json
+++ b/bower.json
@@ -6,7 +6,7 @@
"homepage": "http://www.fastadmin.net",
"private": true,
"dependencies": {
- "jquery": "^2.2.3",
+ "jquery": "^2.1.4",
"bootstrap": "^3.3.7",
"font-awesome": "fontawesome#^4.6.1",
"bootstrap-table": "^1.11.0",
@@ -14,7 +14,6 @@
"jstree": "^3.3.2",
"summernote": "^0.8.2",
"jquery-pjax": "^1.9.6",
- "bootstrap-validator": "^0.11.5",
"moment": "^2.15.2",
"plupload": "^2.2.0",
"toastr": "^2.1.3",
@@ -23,21 +22,20 @@
"jquery-qrcode": "*",
"eonasdan-bootstrap-datetimepicker": "^4.17.43",
"bootstrap-select": "^1.11.2",
- "bootstrap3-dialog": "bootstrap-dialog#^1.35.3",
"require-css": "^0.1.8",
"less": "^2.7.1",
"tableExport.jquery.plugin": "^1.9.0",
"jquery-slimscroll": "slimscroll#^1.3.8",
"jquery.cookie": "^1.4.1",
"Sortable": "^1.5.0",
- "nice-validator": "^1.0.10",
- "art-template": "^3.0.1"
+ "nice-validator": "^1.1.1",
+ "art-template": "^3.0.1",
+ "requirejs-plugins": "^1.0.3"
},
"devDependencies": {
"dragsort": "https://github.com/karsonzhang/dragsort.git",
"jquery-addtabs": "https://github.com/karsonzhang/jquery-addtabs.git",
"jquery-cxselect": "https://github.com/karsonzhang/cxSelect.git",
- "jqcron": "https://github.com/karsonzhang/jqcron.git",
"selectpage": "https://github.com/karsonzhang/selectpage.git"
}
}
diff --git a/composer.json b/composer.json
index 68d66cb..de76555 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
"endroid/qrcode": "^1.9",
"topthink/think-captcha": "^1.0",
"mtdowling/cron-expression": "^1.2",
- "phpmailer/phpmailer": "^5.2"
+ "phpmailer/phpmailer": "^5.2",
+ "karsonzhang/karsonzhang-addons": "^2.1"
},
"config": {
"preferred-install": "dist"
diff --git a/extend/fast/Auth.php b/extend/fast/Auth.php
index 86473eb..f17fdb6 100644
--- a/extend/fast/Auth.php
+++ b/extend/fast/Auth.php
@@ -220,7 +220,7 @@ class Auth
}
//读取用户组所有权限规则
$this->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/extend/fast/Version.php b/extend/fast/Version.php
new file mode 100644
index 0000000..fb50a2d
--- /dev/null
+++ b/extend/fast/Version.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace fast;
+
+/**
+ * 版本检测和对比
+ */
+class Version
+{
+
+ /**
+ * 检测版本是否的版本要求的数据中
+ *
+ * @param string $version
+ * @param array $data
+ */
+ public static function check($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;
+ }
+ }
+
+}
diff --git a/extend/fast/payment/Alipay.php b/extend/fast/payment/Alipay.php
deleted file mode 100644
index 97d4e52..0000000
--- a/extend/fast/payment/Alipay.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-
-namespace fast\payment;
-
-use DOMDocument;
-use Exception;
-
-/**
- * 支付宝
- * @link https://github.com/mytharcher/alipay-php-sdk
- */
-class Alipay
-{
-
- const SERVICE = 'create_direct_pay_by_user';
- const SERVICE_WAP = 'alipay.wap.trade.create.direct';
- const SERVICE_WAP_AUTH = 'alipay.wap.auth.authAndExecute';
- const SERVICE_APP = 'mobile.securitypay.pay';
- const GATEWAY = 'https://mapi.alipay.com/gateway.do?';
- const GATEWAY_MOBILE = 'http://wappaygw.alipay.com/service/rest.htm?';
- const VERIFY_URL = 'http://notify.alipay.com/trade/notify_query.do?';
- const VERIFY_URL_HTTPS = 'https://mapi.alipay.com/gateway.do?service=notify_verify&';
-
- // 配置信息在实例化时传入，以下为范例
- private $config = array(
- // 即时到账方式
- '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' => '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 <Array>
- * @return <String>
- *
- */
- 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 <Array>
- * $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 <Array>
- */
- 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 <Array>
- * @return <Array>
- */
- 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 <Array> 请求参数（未签名的）
- * @param $method <String> 请求方法，默认：post，可选 get
- * @param $target <String> 提交目标，默认：_self
- * @return <String>
- *
- */
- function buildRequestFormHTML($params, $method = 'post', $target = '_self')
- {
- $params = $this->buildSignedParameters($params);
- $html = '<meta charset="' . $this->config['input_charset'] . '" /><form id="alipaysubmit" name="alipaysubmit" action="' . $this->gateway . ' _input_charset="' . trim(strtolower($this->config['input_charset'])) . '" method="' . $method . ' target="$target">';
- foreach ($params as $key => $value)
- {
- $html .= "<input type='hidden' name='$key' value='$value'/>";
- }
- $html .= "</form><script>document.forms['alipaysubmit'].submit();</script>";
- return $html;
- }
-
- /**
- * 准备移动网页支付的请求参数
- *
- * 移动网页支付接口不同，需要先服务器提交一次请求，拿到返回 token 再返回客户端发起真实支付请求。
- * 该方法只完成第一次服务端请求，生成参数后需要客户端另行处理（可调用`buildRequestFormHTML`生成表单提交）。
- *
- * @param $params <Array>
- * $params['out_trade_no'] 订单唯一编号
- * $params['subject'] 商品标题
- * $params['total_fee'] 支付总费用
- * $params['merchant_url'] 商品链接地址
- * $params['req_id'] 请求唯一 ID
- * $params['it_b_pay'] 超期时间（秒）
- * @return <Array>/<NULL>
- */
- function prepareMobileTradeData($params)
- {
- // 不要用 SimpleXML 来构建 xml 结构，因为有第一行文档申明支付宝验证不通过
- $xml_str = '<direct_trade_create_req>' .
- '<notify_url>' . $this->config['notify_url'] . '</notify_url>' .
- '<call_back_url>' . $this->config['return_url'] . '</call_back_url>' .
- '<seller_account_name>' . $this->config['seller_email'] . '</seller_account_name>' .
- '<out_trade_no>' . $params['out_trade_no'] . '</out_trade_no>' .
- '<subject>' . htmlspecialchars($params['subject'], ENT_XML1, 'UTF-8') . '</subject>' .
- '<total_fee>' . $params['total_fee'] . '</total_fee>' .
- '<merchant_url>' . $params['merchant_url'] . '</merchant_url>' .
- (isset($params['it_b_pay']) ? '<pay_expire>' . $params['it_b_pay'] . '</pay_expire>' : '') .
- '</direct_trade_create_req>';
- $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 = '<auth_and_execute_req>' .
- '<request_token>' . $responseData['request_token'] . '</request_token>' .
- '</auth_and_execute_req>';
- 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 <Boolean>
- */
- 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 <Array>
- */
- 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 <Boolean> 验证结果
- * @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 d414099..0000000
--- a/extend/fast/payment/Wechat.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-
-namespace fast\payment;
-
-use Exception;
-use think\Config;
-
-/**
- * @link https://github.com/zhangv/wechat-pay
- */
-class Wechat
-{
-
- const TRADETYPE_JSAPI = 'JSAPI', TRADETYPE_NATIVE = 'NATIVE', TRADETYPE_APP = 'APP';
- const URL_UNIFIEDORDER = "https://api.mch.weixin.qq.com/pay/unifiedorder";
- const URL_ORDERQUERY = "https://api.mch.weixin.qq.com/pay/orderquery";
- const URL_CLOSEORDER = 'https://api.mch.weixin.qq.com/pay/closeorder';
- const URL_REFUND = 'https://api.mch.weixin.qq.com/secapi/pay/refund';
- const URL_REFUNDQUERY = 'https://api.mch.weixin.qq.com/pay/refundquery';
- const URL_DOWNLOADBILL = 'https://api.mch.weixin.qq.com/pay/downloadbill';
- const URL_REPORT = 'https://api.mch.weixin.qq.com/payitil/report';
- const URL_SHORTURL = 'https://api.mch.weixin.qq.com/tools/shorturl';
- const URL_MICROPAY = 'https://api.mch.weixin.qq.com/pay/micropay';
-
- /**
- * 错误信息
- */
- public $error = null;
-
- /**
- * 错误信息XML
- */
- public $errorXML = null;
-
- /**
- * 微信支付配置数组
- * appid 公众账号appid
- * mch_id 商户号
- * apikey 加密key
- * appsecret 公众号appsecret
- * sslcertPath 证书路径(apiclient_cert.pem)
- * sslkeyPath 密钥路径(apiclient_key.pem)
- */
- private $_config;
-
- /**
- * @param $options 微信支付配置数组
- */
- public function __construct($options = [])
- {
- if ($config = Config::get('payment.wechat'))
- {
- $this->_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 = "<xml>" . PHP_EOL;
- foreach ($array as $k => $v)
- {
- if ($v && trim($v) != '')
- $xml .= "<$k><![CDATA[$v]]></$k>" . PHP_EOL;
- }
- $xml .= "</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 92d87cf..0000000
--- a/extend/fast/service/Alisms.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace fast\service;
-
-use think\Config;
-
-/**
- * 阿里大于SMS短信发送
- */
-class Alisms
-{
-
- private $_params = [];
- public $error = [];
- protected $config = [];
-
- public function __construct($options = [])
- {
- if ($config = Config::get('service.alisms'))
- {
- $this->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 c1a9da5..0000000
--- a/extend/fast/service/Easemob.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-
-namespace fast\service;
-
-use fast\Http;
-use think\Cache;
-use think\Config;
-use think\Log;
-
-/**
- * 环信消息类
- */
-class Easemob
-{
-
- const URL = 'https://a1.easemob.com';
-
- static $_config = null;
-
- /**
- * 创建用户
- *
- * @param string $username 用户名
- * @param string $password 密码
- * @param string $nickname 昵称
- * @param boolean $token 是否认证模式
- * @return array
- */
- public static function register($username, $password, $nickname = '', $token = TRUE)
- {
- $params = ['username' => $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 c240bd5..0000000
--- a/extend/fast/service/Qiniu.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-namespace fast\service;
-
-use think\Config;
-use think\Log;
-
-/**
- * 七牛上传文件管理
- */
-class Qiniu
-{
-
- const QINIU_RS = 'http://rs.qbox.me';
-
- static $_config = null;
-
- /**
- * 获取文件
- *
- * @param string $domain 域名
- * @param string $name 文件名
- * @param string $param 附加参数
- * @return string
- */
- public static function download($domain, $name, $param = [])
- {
- $url = $domain . $name . '?' . http_build_query($param);
- $token = self::sign($url);
- return $url . '&token=' . $token;
- }
-
- /**
- * 重命名【移动】
- *
- * @param string $from 来源位置
- * @param string $to 目标位置
- * return bool
- */
- public static function move($from, $to)
- {
- // $bucket = $this->_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 eaddea0..0000000
--- a/extend/fast/service/Upyun.php
+++ /dev/null
@@ -1,572 +0,0 @@
-<?php
-
-namespace fast\service;
-
-use Exception;
-use think\Config;
-
-/**
- * 又拍云上传管理
- */
-class Upyun
-{
-
- const VERSION = '2.0';
-
- /* {{{ */
- const ED_AUTO = 'v0.api.upyun.com';
- const ED_TELECOM = 'v1.api.upyun.com';
- const ED_CNC = 'v2.api.upyun.com';
- const ED_CTT = 'v3.api.upyun.com';
- const CONTENT_TYPE = 'Content-Type';
- const CONTENT_MD5 = 'Content-MD5';
- const CONTENT_SECRET = 'Content-Secret';
- // 缩略图
- const X_GMKERL_THUMBNAIL = 'x-gmkerl-thumbnail';
- const X_GMKERL_TYPE = 'x-gmkerl-type';
- const X_GMKERL_VALUE = 'x-gmkerl-value';
- const X_GMKERL_QUALITY = 'xgmkerl-quality';
- const X_GMKERL_UNSHARP = 'xgmkerl-unsharp';
-
- private static $_instance;
-
- /* }}} */
-
- /**
- * @deprecated
- */
- private $_content_md5 = NULL;
-
- /**
- * @deprecated
- */
- private $_file_secret = NULL;
-
- /**
- * @deprecated
- */
- private $_file_infos = NULL;
-
- /**
- * @var string: UPYUN 请求唯一id, 出现错误时, 可以将该id报告给 UPYUN,进行调试
- */
- private $x_request_id;
-
- /**
- * 初始化 UpYun 存储接口
- */
- public function __construct($options = [])
- {
- if ($config = Config::get('service.upyun'))
- {
- $this->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 8431293..0000000
--- a/extend/fast/service/Wechat.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-namespace fast\service;
-
-use app\common\model\Page;
-use app\common\model\User;
-use app\common\model\UserSignin;
-use app\common\model\UserThird;
-use app\common\model\WechatConfig;
-use EasyWeChat\Message\News;
-use EasyWeChat\Message\Transfer;
-use fast\Date;
-use think\Config;
-
-/**
- * Wechat服务类
- */
-class Wechat
-{
-
- public function __construct()
- {
-
- }
-
- public static function appConfig()
- {
- return array(
- 'signin' => 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 = '您还没有<a href="' . url('index/user/third', 'action=redirect&platform=wechat', true, true) . '">绑定用户</a>还不能签到!';
- }
- 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 de16a3a..0000000
--- a/extend/fast/third/Application.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace fast\third;
-
-use think\Config;
-
-class Application
-{
-
- /**
- * 配置信息
- * @var array
- */
- private $config = [];
-
- /**
- * 服务提供者
- * @var array
- */
- private $providers = [
- 'qq' => '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 f7a2e65..0000000
--- a/extend/fast/third/Qq.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-namespace fast\third;
-
-use fast\Http;
-use think\Config;
-use think\Session;
-
-/**
- * QQ
- */
-class Qq
-{
-
- const GET_AUTH_CODE_URL = "https://graph.qq.com/oauth2.0/authorize";
- const GET_ACCESS_TOKEN_URL = "https://graph.qq.com/oauth2.0/token";
- const GET_USERINFO_URL = "https://graph.qq.com/user/get_user_info";
- const GET_OPENID_URL = "https://graph.qq.com/oauth2.0/me";
-
- /**
- * 配置信息
- * @var array
- */
- private $config = [];
-
- public function __construct($options = [])
- {
- if ($config = Config::get('third.qq'))
- {
- $this->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 d616ddd..0000000
--- a/extend/fast/third/Wechat.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace fast\third;
-
-use fast\Http;
-use think\Config;
-use think\Session;
-
-/**
- * 微博
- */
-class Wechat
-{
-
- const GET_AUTH_CODE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize";
- const GET_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token";
- const GET_USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo";
-
- /**
- * 配置信息
- * @var array
- */
- private $config = [];
-
- public function __construct($options = [])
- {
- if ($config = Config::get('third.wechat'))
- {
- $this->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 fb1dbab..0000000
--- a/extend/fast/third/Weibo.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace fast\third;
-
-use fast\Http;
-use think\Config;
-use think\Session;
-
-/**
- * 微博
- */
-class Weibo
-{
-
- const GET_AUTH_CODE_URL = "https://api.weibo.com/oauth2/authorize";
- const GET_ACCESS_TOKEN_URL = "https://api.weibo.com/oauth2/access_token";
- const GET_USERINFO_URL = "https://api.weibo.com/2/users/show.json";
-
- /**
- * 配置信息
- * @var array
- */
- private $config = [];
-
- public function __construct($options = [])
- {
- if ($config = Config::get('third.weibo'))
- {
- $this->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 58ed17b..0000000
--- a/extend/fast/ucenter/client/Client.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace fast\ucenter\client;
-
-use Exception;
-use think\Loader;
-
-class Client
-{
-
- public function __construct()
- {
- $this->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 67f361f..0000000
--- a/extend/fast/ucenter/client/uc_client/client.php
+++ /dev/null
@@ -1,840 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: client.php 1179 2014-11-03 07:11:25Z hypowang $
- */
-
-if (!defined('UC_API'))
-{
- exit('Access denied');
-}
-
-error_reporting(0);
-
-define('IN_UC', TRUE);
-define('UC_CLIENT_VERSION', '1.6.0');
-define('UC_CLIENT_RELEASE', '20141101');
-define('UC_ROOT', substr(__FILE__, 0, -10));
-define('UC_DATADIR', UC_ROOT . './data/');
-define('UC_DATAURL', UC_API . '/data');
-define('UC_API_FUNC', UC_CONNECT == 'mysql' ? 'uc_api_mysql' : 'uc_api_post');
-$GLOBALS['uc_controls'] = array();
-
-function uc_addslashes($string, $force = 0, $strip = FALSE)
-{
- !defined('MAGIC_QUOTES_GPC') && define('MAGIC_QUOTES_GPC', get_magic_quotes_gpc());
- if (!MAGIC_QUOTES_GPC || $force)
- {
- if (is_array($string))
- {
- foreach ($string as $key => $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 '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="450" height="253" id="mycamera" align="middle">
- <param name="allowScriptAccess" value="always" />
- <param name="scale" value="exactfit" />
- <param name="wmode" value="transparent" />
- <param name="quality" value="high" />
- <param name="bgcolor" value="#ffffff" />
- <param name="movie" value="' . $uc_avatarflash . '" />
- <param name="menu" value="false" />
- <embed src="' . $uc_avatarflash . '" quality="high" bgcolor="#ffffff" width="450" height="253" name="mycamera" align="middle" allowScriptAccess="always" allowFullScreen="false" scale="exactfit" wmode="transparent" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
- </object>';
- }
- 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 dc66f54..0000000
--- a/extend/fast/ucenter/client/uc_client/control/app.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: app.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class appcontrol extends base
-{
-
- function __construct()
- {
- $this->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 e8a621c..0000000
--- a/extend/fast/ucenter/client/uc_client/control/cache.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: cache.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class cachecontrol extends base
-{
-
- function __construct()
- {
- $this->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 9536bca..0000000
--- a/extend/fast/ucenter/client/uc_client/control/client.php
+++ /dev/null
@@ -1,817 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: client.php 1179 2014-11-03 07:11:25Z hypowang $
- */
-
-if (!defined('UC_API'))
-{
- exit('Access denied');
-}
-
-error_reporting(0);
-
-define('IN_UC', TRUE);
-define('UC_CLIENT_VERSION', '1.6.0');
-define('UC_CLIENT_RELEASE', '20141101');
-define('UC_ROOT', substr(__FILE__, 0, -10));
-define('UC_DATADIR', UC_ROOT . './data/');
-define('UC_DATAURL', UC_API . '/data');
-define('UC_API_FUNC', UC_CONNECT == 'mysql' ? 'uc_api_mysql' : 'uc_api_post');
-$GLOBALS['uc_controls'] = array();
-
-function uc_addslashes($string, $force = 0, $strip = FALSE)
-{
- !defined('MAGIC_QUOTES_GPC') && define('MAGIC_QUOTES_GPC', get_magic_quotes_gpc());
- if (!MAGIC_QUOTES_GPC || $force)
- {
- if (is_array($string))
- {
- foreach ($string as $key => $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 '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="450" height="253" id="mycamera" align="middle">
- <param name="allowScriptAccess" value="always" />
- <param name="scale" value="exactfit" />
- <param name="wmode" value="transparent" />
- <param name="quality" value="high" />
- <param name="bgcolor" value="#ffffff" />
- <param name="movie" value="' . $uc_avatarflash . '" />
- <param name="menu" value="false" />
- <embed src="' . $uc_avatarflash . '" quality="high" bgcolor="#ffffff" width="450" height="253" name="mycamera" align="middle" allowScriptAccess="always" allowFullScreen="false" scale="exactfit" wmode="transparent" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
- </object>';
- }
- 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 a7c76a9..0000000
--- a/extend/fast/ucenter/client/uc_client/control/domain.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: domain.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class domaincontrol extends base
-{
-
- function __construct()
- {
- $this->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 86a58b3..0000000
--- a/extend/fast/ucenter/client/uc_client/control/feed.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: feed.php 1139 2012-05-08 09:02:11Z liulanbo $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class feedcontrol extends base
-{
-
- function __construct()
- {
- $this->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('<br>', '<br />', '<BR>', '<BR />'), "\n", $template);
- $template = str_replace(array('<b>', '<B>'), '[B]', $template);
- $template = str_replace(array('<i>', '<I>'), '[I]', $template);
- $template = str_replace(array('<u>', '<U>'), '[U]', $template);
- $template = str_replace(array('</b>', '</B>'), '[/B]', $template);
- $template = str_replace(array('</i>', '</I>'), '[/I]', $template);
- $template = str_replace(array('</u>', '</U>'), '[/U]', $template);
- $template = dhtmlspecialchars($template);
- $template = nl2br($template);
- $template = str_replace(array('[B]', '[I]', '[U]', '[/B]', '[/I]', '[/U]'), array('<b>', '<i>', '<u>', '</b>', '</i>', '</u>'), $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 01768b5..0000000
--- a/extend/fast/ucenter/client/uc_client/control/friend.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: friend.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class friendcontrol extends base
-{
-
- function __construct()
- {
- $this->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 0519ecb..0000000
--- 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 28bdedd..0000000
--- a/extend/fast/ucenter/client/uc_client/control/mail.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: mail.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class mailcontrol extends base
-{
-
- function __construct()
- {
- $this->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 940d398..0000000
--- a/extend/fast/ucenter/client/uc_client/control/pm.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: pm.php 1067 2011-03-08 10:06:51Z svn_project_zhangjie $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-define('PRIVATEPMTHREADLIMIT_ERROR', -1);
-define('PMFLOODCTRL_ERROR', -2);
-define('PMMSGTONOTFRIEND', -3);
-define('PMSENDREGDAYS', -4);
-define('CHATPMTHREADLIMIT_ERROR', -5);
-define('CHATPMMEMBERLIMIT_ERROR', -7);
-
-class pmcontrol extends base
-{
-
- function __construct()
- {
- $this->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 8fc80aa..0000000
--- a/extend/fast/ucenter/client/uc_client/control/tag.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: tag.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class tagcontrol extends base
-{
-
- function __construct()
- {
- $this->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 42d0b4e..0000000
--- a/extend/fast/ucenter/client/uc_client/control/user.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: user.php 1174 2014-11-03 04:38:12Z hypowang $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-define('UC_USER_CHECK_USERNAME_FAILED', -1);
-define('UC_USER_USERNAME_BADWORD', -2);
-define('UC_USER_USERNAME_EXISTS', -3);
-define('UC_USER_EMAIL_FORMAT_ILLEGAL', -4);
-define('UC_USER_EMAIL_ACCESS_ILLEGAL', -5);
-define('UC_USER_EMAIL_EXISTS', -6);
-define('UC_USER_MOBILE_FORMAT_ILLEGAL', -7);
-define('UC_USER_MOBILE_ACCESS_ILLEGAL', -8);
-define('UC_USER_MOBILE_EXISTS', -9);
-
-class usercontrol extends base
-{
-
- function __construct()
- {
- $this->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 .= '<script type="text/javascript" src="' . $app['url'] . '/api/uc.php?time=' . $this->time . '&code=' . urlencode($this->authcode($params, 'ENCODE', $app['authkey'])) . '"></script>';
- }
- }
- 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 .= '<script type="text/javascript" src="' . $app['url'] . '/api/uc.php?time=' . $this->time . '&code=' . urlencode($this->authcode($params, 'ENCODE', $app['authkey'])) . '"></script>';
- }
- }
- 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 .= '<script type="text/javascript" src="' . $app['url'] . '/api/uc.php?time=' . $this->time . '&code=' . urlencode($this->authcode('action=synlogout&time=' . $this->time, 'ENCODE', $app['authkey'])) . '"></script>';
- }
- }
- 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 b0f1f51..0000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/apps.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$_CACHE['apps'] = array (
- 1 =>
- 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 c3ca52b..0000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/badwords.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$_CACHE['badwords'] = array (
-);
-
-?>
\ 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 e69de29..0000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/index.htm
+++ /dev/null
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 069021e..0000000
--- a/extend/fast/ucenter/client/uc_client/data/cache/settings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$_CACHE['settings'] = array (
- 'accessemail' => '',
- '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 <username@21cn.com>',
- '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 e69de29..0000000
--- a/extend/fast/ucenter/client/uc_client/data/index.htm
+++ /dev/null
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 0519ecb..0000000
--- 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 0c1f20b..0000000
--- a/extend/fast/ucenter/client/uc_client/lib/db.class.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: db.class.php 1171 2014-11-03 03:33:47Z hypowang $
- */
-
-class ucclient_db
-{
-
- var $querynum = 0;
- var $link;
- var $histories;
- var $dbhost;
- var $dbuser;
- var $dbpw;
- var $dbcharset;
- var $pconnect;
- var $tablepre;
- var $time;
- var $goneaway = 5;
-
- function connect($dbhost, $dbuser, $dbpw, $dbname = '', $dbcharset = '', $pconnect = 0, $tablepre = '', $time = 0)
- {
- $this->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 = "<b>UCenter info:</b> $message<br />";
- }
- if ($sql)
- {
- $s .= '<b>SQL:</b>' . htmlspecialchars($sql) . '<br />';
- }
- $s .= '<b>Error:</b>' . $error . '<br />';
- $s .= '<b>Errno:</b>' . $errorno . '<br />';
- $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 2972e92..0000000
--- a/extend/fast/ucenter/client/uc_client/lib/dbi.class.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2009 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: db.class.php 922 2009-02-19 01:30:22Z zhaoxiongfei $
- */
-
-class ucclient_db
-{
-
- var $querynum = 0;
- var $link;
- var $histories;
- var $dbhost;
- var $dbuser;
- var $dbpw;
- var $dbcharset;
- var $pconnect;
- var $tablepre;
- var $time;
- var $goneaway = 5;
-
- function connect($dbhost, $dbuser, $dbpw, $dbname = '', $dbcharset = '', $pconnect = 0, $tablepre = '', $time = 0)
- {
- $this->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 = "<b>UCenter info:</b> $message<br />";
- }
- if ($sql)
- {
- $s .= '<b>SQL:</b>' . htmlspecialchars($sql) . '<br />';
- }
- $s .= '<b>Error:</b>' . $error . '<br />';
- $s .= '<b>Errno:</b>' . $errorno . '<br />';
- $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 0519ecb..0000000
--- 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 dcc165d..0000000
--- a/extend/fast/ucenter/client/uc_client/lib/sendmail.inc.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: sendmail.inc.php 1124 2011-12-06 11:03:23Z svn_project_zhangjie $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-if ($mail_setting['mailsilent'])
-{
- error_reporting(0);
-}
-
-$maildelimiter = $mail_setting['maildelimiter'] == 1 ? "\r\n" : ($mail_setting['maildelimiter'] == 2 ? "\r" : "\n");
-$mailusername = isset($mail_setting['mailusername']) ? $mail_setting['mailusername'] : 1;
-$appname = $this->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 47150b5..0000000
--- a/extend/fast/ucenter/client/uc_client/lib/uccode.class.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: uccode.class.php 1166 2014-11-03 01:49:32Z hypowang $
- */
-
-class uccode
-{
-
- var $uccodes;
-
- function __construct()
- {
- $this->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(
- '</font>', '</font>', '</font>', '</p>', '<strong>', '</strong>', '<i>',
- '</i>', '<u>', '</u>', '<ul>', '<ul type="1">', '<ul type="a">',
- '<ul type="A">', '<li>', '</ul>', '<blockquote>', '</blockquote>', '</span>'
- ), 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(
- "<font color=\"\\1\">",
- "<font size=\"\\1\">",
- "<font style=\"font-size: \\1\">",
- "<font face=\"\\1 \">",
- "<p align=\"\\1\">",
- "<span style=\"float: \\1;\">"
- ), $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', '<img src=\"%s\" border=\"0\" alt=\"\" />')",
- "\$this->bbcodeurl('\\3', '<img width=\"\\1\" height=\"\\2\" src=\"%s\" border=\"0\" alt=\"\" />')"
- ), $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 '<a href="' . (substr(strtolower($url), 0, 4) == 'www.' ? 'http://' . $url : $url) . '" target="_blank">' . $text . '</a>';
- }
- else
- {
- $url = substr($url, 1);
- if (substr(strtolower($url), 0, 4) == 'www.')
- {
- $url = 'http://' . $url;
- }
- return '<a href="' . $url . '" target="_blank">' . $text . '</a>';
- }
- }
-
- 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 '<a href="mailto:' . $email . '">' . $email . '</a>';
- }
- else
- {
- return '<a href="mailto:' . substr($email, 1) . '">' . $text . '</a>';
- }
- }
-
- 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 '<div class="blockcode"><code id="code' . $this->uccodes['codecount'] . '">' . $code . '</code></div>';
- }
-
- function tpl_quote()
- {
- return '<div class="quote"><blockquote>\\1</blockquote></div>';
- }
-
-}
-
-/*
-
-Usage:
-$str = <<<EOF
-1
-2
-3
-EOF;
-require_once 'lib/uccode.class.php';
-$this->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 73c528b..0000000
--- a/extend/fast/ucenter/client/uc_client/lib/xml.class.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: xml.class.php 1059 2011-03-01 07:25:09Z monkey $
- */
-
-function xml_unserialize(&$xml, $isnormal = FALSE)
-{
- $xml_parser = new XML($isnormal);
- $data = $xml_parser->parse($xml);
- $xml_parser->destruct();
- return $data;
-}
-
-function xml_serialize($arr, $htmlon = FALSE, $isnormal = FALSE, $level = 1)
-{
- $s = $level == 1 ? "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\r\n<root>\r\n" : '';
- $space = str_repeat("\t", $level);
- foreach ($arr as $k => $v)
- {
- if (!is_array($v))
- {
- $s .= $space . "<item id=\"$k\">" . ($htmlon ? '<![CDATA[' : '') . $v . ($htmlon ? ']]>' : '') . "</item>\r\n";
- }
- else
- {
- $s .= $space . "<item id=\"$k\">\r\n" . xml_serialize($v, $htmlon, $isnormal, $level + 1) . $space . "</item>\r\n";
- }
- }
- $s = preg_replace("/([\x01-\x08\x0b-\x0c\x0e-\x1f])+/", ' ', $s);
- return $level == 1 ? $s . "</root>" : $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 a3fdac5..0000000
--- a/extend/fast/ucenter/client/uc_client/model/app.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: app.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class appmodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 32dcf16..0000000
--- a/extend/fast/ucenter/client/uc_client/model/base.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: base.php 1167 2014-11-03 03:06:21Z hypowang $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-if (!function_exists('getgpc'))
-{
-
- function getgpc($k, $var = 'G')
- {
- switch ($var)
- {
- case 'G': $var = &$_GET;
- break;
- case 'P': $var = &$_POST;
- break;
- case 'C': $var = &$_COOKIE;
- break;
- case 'R': $var = &$_REQUEST;
- break;
- }
- return isset($var[$k]) ? $var[$k] : NULL;
- }
-
-}
-
-class base
-{
-
- var $sid;
- var $time;
- var $onlineip;
- var $db;
- var $key;
- var $settings = array();
- var $cache = array();
- var $app = array();
- var $user = array();
- var $input = array();
-
- function __construct()
- {
- $this->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 d0851ed..0000000
--- a/extend/fast/ucenter/client/uc_client/model/cache.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: cache.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-if (!function_exists('file_put_contents'))
-{
-
- function file_put_contents($filename, $s)
- {
- $fp = @fopen($filename, 'w');
- @fwrite($fp, $s);
- @fclose($fp);
- }
-
-}
-
-class cachemodel
-{
-
- var $db;
- var $base;
- var $map;
-
- function __construct(&$base)
- {
- $this->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 = "<?php\r\n";
- foreach ((array) $modules as $m)
- {
- $method = "_get_$m";
- $s .= '$_CACHE[\'' . $m . '\'] = ' . var_export($this->$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 = "<?php\r\n";
- foreach ($modules as $m)
- {
- $method = "_get_$m";
- $s .= '$_CACHE[\'' . $m . '\'] = ' . var_export($this->$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 6fc966f..0000000
--- a/extend/fast/ucenter/client/uc_client/model/domain.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: domain.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class domainmodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 58c641a..0000000
--- a/extend/fast/ucenter/client/uc_client/model/friend.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: friend.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class friendmodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 0519ecb..0000000
--- 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 46e9983..0000000
--- a/extend/fast/ucenter/client/uc_client/model/mail.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: mail.php 1139 2012-05-08 09:02:11Z liulanbo $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-define('UC_MAIL_REPEAT', 5);
-
-class mailmodel
-{
-
- var $db;
- var $base;
- var $apps;
-
- function __construct(&$base)
- {
- $this->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 bb83ab5..0000000
--- a/extend/fast/ucenter/client/uc_client/model/misc.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: misc.php 1182 2014-11-17 08:57:52Z andyzheng $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-define('UC_ARRAY_SEP_1', 'UC_ARRAY_SEP_1');
-define('UC_ARRAY_SEP_2', 'UC_ARRAY_SEP_2');
-
-class miscmodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 0ca5141..0000000
--- a/extend/fast/ucenter/client/uc_client/model/note.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: note.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-define('UC_NOTE_REPEAT', 5);
-define('UC_NOTE_TIMEOUT', 15);
-define('UC_NOTE_GC', 10000);
-
-define('API_RETURN_FAILED', '-1');
-
-class notemodel
-{
-
- var $db;
- var $base;
- var $apps;
- var $noteid;
- var $operations = array();
- var $notetype = 'HTTP';
-
- function __construct(&$base)
- {
- $this->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 672ec0f..0000000
--- a/extend/fast/ucenter/client/uc_client/model/pm.php
+++ /dev/null
@@ -1,1261 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: pm.php 1160 2013-10-24 08:04:45Z jeffjzhang $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-define('PMINBALCKLIST_ERROR', -6);
-define('PMSENDSELF_ERROR', -8);
-define('PMSENDNONE_ERROR', -9);
-define('PMSENDCHATNUM_ERROR', -10);
-define('PMTHREADNONE_ERROR', -11);
-define('PMPRIVILEGENONE_ERROR', -12);
-define('PMCHATTYPE_ERROR', -13);
-define('PMUIDTYPE_ERROR', -14);
-define('PMDATA_ERROR', -15);
-
-class pmmodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 4a8261f..0000000
--- a/extend/fast/ucenter/client/uc_client/model/tag.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: tag.php 1059 2011-03-01 07:25:09Z monkey $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class tagmodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 0766227..0000000
--- a/extend/fast/ucenter/client/uc_client/model/user.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: user.php 1179 2014-11-03 07:11:25Z hypowang $
- */
-!defined('IN_UC') && exit('Access Denied');
-
-class usermodel
-{
-
- var $db;
- var $base;
-
- function __construct(&$base)
- {
- $this->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 9f9df9d..0000000
--- a/extend/fast/ucenter/common/Functions.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-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_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 938fbd5..0000000
--- a/extend/fast/ucenter/common/XML.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/*
- [UCenter] (C)2001-2099 Comsenz Inc.
- This is NOT a freeware, use is subject to license terms
-
- $Id: xml.class.php 1059 2011-03-01 07:25:09Z monkey $
- */
-
-function xml_unserialize(&$xml, $isnormal = FALSE)
-{
- $xml_parser = new XML($isnormal);
- $data = $xml_parser->parse($xml);
- $xml_parser->destruct();
- return $data;
-}
-
-function xml_serialize($arr, $htmlon = FALSE, $isnormal = FALSE, $level = 1)
-{
- $s = $level == 1 ? "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\r\n<root>\r\n" : '';
- $space = str_repeat("\t", $level);
- foreach ($arr as $k => $v)
- {
- if (!is_array($v))
- {
- $s .= $space . "<item id=\"$k\">" . ($htmlon ? '<![CDATA[' : '') . $v . ($htmlon ? ']]>' : '') . "</item>\r\n";
- }
- else
- {
- $s .= $space . "<item id=\"$k\">\r\n" . xml_serialize($v, $htmlon, $isnormal, $level + 1) . $space . "</item>\r\n";
- }
- }
- $s = preg_replace("/([\x01-\x08\x0b-\x0c\x0e-\x1f])+/", ' ', $s);
- return $level == 1 ? $s . "</root>" : $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 e68f9d6..849b68f 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 0000000..9e9a992
--- /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 0000000..7775b8f
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 0000000..cfd7911
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 fc17202..0000000
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 0000000..8b942b9
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 34f16dd..0000000
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 e8c852e..0000000
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 17f64d6..0000000
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 0000000..d017888
--- /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 94e1f53..6c169a2 100644
--- a/public/assets/js/adminlte.js
+++ b/public/assets/js/adminlte.js
@@ -7,7 +7,7 @@
* @Author Almsaeed Studio
* @Support <http://www.almsaeedstudio.com>
* @Email <abdullah@almsaeedstudio.com>
- * @version 2.3.7
+ * @version 2.3.8
* @license MIT <http://opensource.org/licenses/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 7067786..cf590d7 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.$("<a />").append('<i class="' + icon + '"></i> <span>' + title + '</span>').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 0000000..188fd89
--- /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分钟后再尝试安装，请不要重复支付，如果仍然无法安装，请加<a href='https://jq.qq.com/?_wv=1027&k=487PNBb' target='_blank'>QQ群：636393962</a>向管理员反馈");
+ }
+ });
+ } 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("确认卸载插件？<p class='text-danger'>卸载将会删除所有插件文件且不可找回!!! 插件如果有创建数据库表请手动删除!!!</p>如有重要数据请备份后再操作！", 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 8fe1eae..64e1183 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 15b546d..88912b2 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 b0fa426..056e2c8 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 a6c3639..0000000
--- 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 = '<a class="btn btn-xs btn-success btn-detail">详情</a> ';
- 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 '<div class="input-group input-group-sm" style="width:250px;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
- },
- ip: function (value, row, index) {
- return '<a class="btn btn-xs btn-ip bg-success"><i class="fa fa-map-marker"></i> ' + value + '</a>';
- },
- browser: function (value, row, index) {
- //这里我们直接使用row的数据
- return '<a class="btn btn-xs btn-browser">' + row.useragent.split(" ")[0] + '</a>';
- },
- custom: function (value, row, index) {
- //添加上btn-change可以自定义请求的URL进行数据处理
- return '<a class="btn btn-xs btn-danger btn-change" data-url="example/bootstraptable/change" data-id="' + row.id + '">' + __('Locked') + '</a>';
- },
- operate: function (value, row, index) {
- //返回字符串加上Table.api.formatter.operate的结果
- //默认需要按需显示排序/编辑/删除按钮,则需要在Table.api.formatter.operate将table传入
- //传入了table以后如果edit_url为空则不显示编辑按钮,如果del_url为空则不显显删除按钮
- return '<a class="btn btn-info btn-xs btn-detail"><i class="fa fa-list"></i> ' + __('Detail') + '</a> '
- + 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("该行数据为: <code>" + JSON.stringify(row) + "</code>");
- }
- },
- 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 323057b..0000000
--- 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 650355c..0000000
--- 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 '<a href="' + url + '" class="label label-success addtabsit" title="' + __("Search %s", value) + '">' + __('Search %s', value) + '</a>';
-
- //方式二,直接调用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 355b77a..0000000
--- 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 e4f5431..0000000
--- 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 8747114..0000000
--- 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 c3378d1..0000000
--- 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 '<div class="input-group input-group-sm" style="width:250px;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
- },
- ip: function (value, row, index) {
- return '<a class="btn btn-xs btn-ip bg-success"><i class="fa fa-map-marker"></i> ' + value + '</a>';
- },
- browser: function (value, row, index) {
- //这里我们直接使用row的数据
- return '<a class="btn btn-xs btn-browser">' + row.useragent.split(" ")[0] + '</a>';
- },
- operate: function (value, row, index) {
- //返回字符串加上Table.api.formatter.operate的结果
- //默认需要按需显示排序/编辑/删除按钮,则需要在Table.api.formatter.operate将table传入
- //传入了table以后如果edit_url为空则不显示编辑按钮,如果del_url为空则不显显删除按钮
- return '<a class="btn btn-info btn-xs btn-detail"><i class="fa fa-list"></i> ' + __('Detail') + '</a> '
- + 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("该行数据为: <code>" + JSON.stringify(row) + "</code>");
- }
- },
- 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 fe88b75..8e0dfd4 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 '<a href="javascript:;" class="btn btn-danger btn-chooseone btn-xs"><i class="fa fa-check"></i> ' + __('Choose') + '</a>';
@@ -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 3bed041..0000000
--- 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("<li class='list-group-item'>" + j + "<span class='badge'>" + (i + 1) + "</span></li>");
- });
- }
- }, '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 4985913..0000000
--- 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 b957a92..6375e48 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 39fc7ae..6bafb08 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 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 = '<li><a href="' + j.html_url + '"><div class="pull-left"><img src="' + author.avatar_url + '" class="img-circle" alt="' + author.login + '"></div><h4>' + author.login + '<small><i class="fa fa-clock-o"></i> ' + dateDiff(new Date(j.commit.committer.date).getTime()) + '</small></h4><p>' + j.commit.message + '</p></a></li>';
- $(item).appendTo($(".github-commits ul.menu"));
- });
- }
+ //版本检测
+ 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: '<h5 style="background-color:#f7f7f7; font-size:14px; padding: 10px;">你的版本是:' + ret.data.version + '，新版本:' + ret.data.newversion + '</h5><span class="label label-danger">更新说明</span><br/>' + 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 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 4b45f7b..0000000
--- 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 156111c..0000000
--- 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 fa85ec3..0000000
--- 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 98aa8dd..0000000
--- 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 88ff6a0..0000000
--- 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('<div class="keytitle">资源名:' + keytitle + '</div>');
- }
- };
- }
- }
-
- };
- 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 7f6e223..0000000
--- 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 + '<a href="' + link + '">' + text + '</a>' + 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);
- $('<dd><input type="text" name="field[' + rel + ']" class="form-control" id="field-' + rel + '" value="" size="10" /> <input type="text" name="value[' + rel + ']" class="form-control" id="value-' + rel + '" value="" size="40" /> <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span> <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span></dd>').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: "<dd></dd>"
- });
- });
- }
- }
- };
- 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 4277912..0000000
--- 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 += '<li id="menu-' + i + '" class="menu-item" data-type="' + type + '" data-action="' + action + '" data-name="' + items[i]['name'] + '"> <a href="javascript:;" class="menu-link"> <i class="icon-menu-dot"></i> <i class="weixin-icon sort-gray"></i> <span class="title">' + items[i]['name'] + '</span> </a>';
- var tem = '';
- if (items[i]['sub_button'] != undefined) {
- var sub_menu = items[i]['sub_button'];
- for (j in sub_menu) {
- type = sub_menu[j]['type'];
- if (sub_menu[j]['url'] != undefined)
- action = "url|" + sub_menu[j]['url'];
- if (sub_menu[j]['key'] != undefined)
- action = "key|" + sub_menu[j]['key'];
- tem += '<li id="sub-menu-' + j + '" class="sub-menu-item" data-type="' + type + '" data-action="' + action + '" data-name="' + sub_menu[j]['name'] + '"> <a href="javascript:;"> <i class="weixin-icon sort-gray"></i><span class="sub-title">' + sub_menu[j]['name'] + '</span></a> </li>';
- }
- }
- str += '<div class="sub-menu-box" style="' + (i != 0 ? 'display:none;' : '') + '"> <ul class="sub-menu-list">' + tem + '<li class=" add-sub-item"><a href="javascript:;" title="添加子菜单"><span class=" "><i class="weixin-icon add-gray"></i></span></a></li> </ul> <i class="arrow arrow-out"></i> <i class="arrow arrow-in"></i></div>';
- str += '</li>';
- }
- $("#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 = '<li class="menu-item" data-type="click" data-action="key|" data-name="添加菜单" > <a href="javascript:;" class="menu-link"> <i class="icon-menu-dot"></i> <i class="weixin-icon sort-gray"></i> <span class="title">添加菜单</span> </a> <div class="sub-menu-box" style=""> <ul class="sub-menu-list"><li class=" add-sub-item"><a href="javascript:;" title="添加子菜单"><span class=" "><i class="weixin-icon add-gray"></i></span></a></li> </ul> <i class="arrow arrow-out"></i> <i class="arrow arrow-in"></i> </div></li>';
- 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('<div class="keytitle">资源名:' + keytitle + '</div>');
- }
- 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 = '<li class="sub-menu-item" data-type="click" data-action="key|" data-name="添加子菜单"><a href="javascript:;"><span class=" "><i class="weixin-icon sort-gray"></i><span class="sub-title">添加子菜单</span></span></a></li>';
- 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('<div class="keytitle">资源名:' + keytitle + '</div>');
- }
- } 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 ab5ed77..0000000
--- 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 '<a href="javascript:;" class="btn btn-danger btn-chooseone btn-xs"><i class="fa fa-check"></i> ' + __('Choose') + '</a>';
- }}
- ]
- ]
- });
-
- // 为表格绑定事件
- 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 += '<div class="form-group"><label for="content" class="control-label col-xs-12 col-sm-2">' + appConfig[i]['caption'] + ':</label><div class="col-xs-12 col-sm-8"><textarea class="form-control" name="row[content][' + appConfig[i]['field'] + ']" ' + pattern_str + ' alt="' + alt + '" data-rule="required"></textarea> </div> </div>';
- } else {
- str += '<div class="form-group"><label for="content" class="control-label col-xs-12 col-sm-2">' + appConfig[i]['caption'] + ':</label><div class="col-xs-12 col-sm-8"><input class="form-control" name="row[content][' + appConfig[i]['field'] + ']" type="text" ' + pattern_str + ' alt="' + alt + '" data-rule="required"> </div> </div>';
- }
- } 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 value="' + item[0] + '">' + item[1] + '</option>';
- }
- option_str = '<select class="form-control" name="row[content][' + appConfig[i]['field'] + ']">' + option_str + '</select>';
- } else if (appConfig[i]['type'] == 'checkbox') {
- for (o in options) {
- var option = options[o];
- var item = option.split(':');
- option_str += '<input type="checkbox" name="row[content][' + appConfig[i]['field'] + '][]" value="' + item[0] + '"> <label>' + item[1] + '</label> ';
- }
-
- } else if (appConfig[i]['type'] == 'radio') {
- for (o in options) {
- var option = options[o];
- var item = option.split(':');
- option_str += '<input type="radio" name="row[content][' + appConfig[i]['field'] + ']" value="' + item[0] + '"> <label>' + item[1] + '</label> ';
- }
- }
- str += '<div class="form-group"><label for="content" class="control-label col-xs-12 col-sm-2">' + appConfig[i]['caption'] + ':</label><div class="col-xs-12 col-sm-8">' + option_str + ' </div> </div>';
- }
-
- }
- 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('<div class="form-group"><label for="content" class="control-label col-xs-12 col-sm-2">文本内容:</label><div class="col-xs-12 col-sm-8"><textarea class="form-control" name="row[content][content]" data-rule="required"></textarea> <a href="javascript:;" class="btn-insertlink">插入链接</a></div></div>');
- $("form.form-ajax").field("row[content][content]", datas.content);
- } else if (type == 'app') {
- $("#expand").html('<div class="form-group"><label for="content" class="control-label col-xs-12 col-sm-2">应用:</label><div class="col-xs-12 col-sm-8"><select class="form-control" name="row[content][app]" id="app">' + $("select[name=applist]").html() + '</select></div></div><div id="appfields"><div>');
- $("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 + '<a href="' + link + '">' + text + '</a>' + 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 4c47661..aa37cc6 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 c3ed5ea..0000000
--- 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!',
- '<div><input class="input-small" value="textbox"/> <a href="http://johnpapa.net" target="_blank">This is a hyperlink</a></div><div><button type="button" id="okBtn" class="btn btn-primary">Close me</button><button type="button" id="surpriseBtn" class="btn" style="margin: 0 8px 0 8px">Surprise me</button></div>',
- '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 f5c7aa2..4011d68 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 e1dabc7..59238f7 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 093a523..543fedd 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,111 +66,150 @@ 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
- });
- });
- }
-
- //绑定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');
- });
- }
- }
- }
- });
+ $('.datetimepicker', form).datetimepicker(options);
});
}
-
+ },
+ 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;
});
+ }
+ },
+ bindevent: function (form) {
- //刷新选择的元素
- 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();
- };
+ }
+ },
+ 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 70c530c..05a2a8a 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 9a2091b..c1ed4c7 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: '<li class="col-xs-3"><a href="<%=fullurl%>" data-url="<%=url%>" target="_blank" class="thumbnail"><img src="<%=fullurl%>" class="img-responsive"></a><a href="javascript:;" class="btn btn-danger btn-xs btn-trash"><i class="fa fa-trash"></i></a></li>',
},
+ 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 += '<div id="' + file.id + '">' + file.name + ' (' + plupload.formatSize(file.size) + ') <b></b></div>';
- });
- $(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 = '<span>' + file.percent + "%</span>";
- $(that).prop("disabled", true).html("<i class='fa fa-upload'></i> " + __('Upload') + file.percent + "%");
+ $(button).prop("disabled", true).html("<i class='fa fa-upload'></i> " + __('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]: ' + '<a href="' + url + '" target="_blank">' + url + '</a>');
- //这里建议不修改
- 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 c861dd8..7b5a375 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;}
--
libgit2 0.24.0