first commit

2022-02-20 19:01:31 +08:00 · 2022-02-20 19:01:31 +08:00 · e3c90643bd
commit e3c90643bd
330 changed files with 151059 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+.DS_Store
+node_modules/
+package-lock.json
+tmp_uploads/
+uploads/
--- a/README.md
+++ b/README.md
@ -0,0 +1,19 @@
+#### 项目整体文件说明
+- `config` 配置文件目录
+  - `default.json` 默认配置文件（其中包含数据库配置，jwt配置）
+- `dao` 数据访问层，存放对数据库的增删改查操作
+  - `DAO.js` 提供的公共访问数据库的方法
+- `models` 存放具体数据库 ORM 模型文件
+- `modules` 当前项目模块
+  - `authorization.js` API权限验证模块
+  - `database.js` 数据库模块（数据库加载基于 nodejs-orm2 库加载）
+  - `passport.js` 基于 passport 模块的登录搭建
+  - `resextra.js` API 统一返回结果接口
+- `node_modules` 项目依赖的第三方模块
+- `routes` 统一路由
+  - `api` 提供 api 接口
+  - `mapp` 提供移动APP界面
+  - `mweb` 提供移动web站点
+- `services` 服务层，业务逻辑代码在这一层编写，通过不同的接口获取的数据转换成统一的前端所需要的数据
+- `app.js` 主项目入口文件
+- `package.json` 项目配置文件
--- a/app.js
+++ b/app.js
@ -0,0 +1,127 @@
+const fs = require('fs')
+var express = require('express')
+var bodyParser = require('body-parser')
+var path = require('path')
+// 路由加载
+var mount = require('mount-routes')
+
+var app = express()
+
+
+/**
+ *
+ * 公共系统初始化
+ *
+ */
+app.use(bodyParser.json())
+app.use(bodyParser.urlencoded({ extended: true }))
+
+// 初始化数据库模块
+var database = require('./modules/database')
+database.initialize(app, function(err) {
+  if (err) {
+    console.error('连接数据库失败失败 %s', err)
+  }
+})
+
+/**
+ *
+ *	后台管理系统初始化
+ *
+ */
+// 获取管理员逻辑模块
+var managerService = require(path.join(process.cwd(), 'services/ManagerService'))
+// 获取角色服务模块
+var roleService = require(path.join(process.cwd(), 'services/RoleService'))
+
+// 设置跨域和相应数据格式
+app.all('/api/*', function(req, res, next) {
+  res.header('Access-Control-Allow-Origin', '*')
+  res.header('Access-Control-Allow-Headers', 'X-Requested-With, mytoken')
+  res.header('Access-Control-Allow-Headers', 'X-Requested-With, Authorization')
+  res.setHeader('Content-Type', 'application/json;charset=utf-8')
+  res.header('Access-Control-Allow-Headers', 'Content-Type,Content-Length, Authorization, Accept,X-Requested-With')
+  res.header('Access-Control-Allow-Methods', 'PUT,POST,GET,DELETE,OPTIONS')
+  res.header('X-Powered-By', ' 3.2.1')
+  if (req.method == 'OPTIONS') res.send(200)
+  /*让options请求快速返回*/ else next()
+})
+
+// 初始化统一响应机制
+var resextra = require('./modules/resextra')
+app.use(resextra)
+
+// 初始化 后台登录 passport 策略
+admin_passport = require('./modules/passport')
+// 设置登录模块的登录函数衔接 passport 策略
+admin_passport.setup(app, managerService.login)
+// 设置 passport 登录入口点
+app.use('/api/private/v1/login', admin_passport.login)
+// 设置 passport 验证路径
+app.use('/api/private/v1/*', admin_passport.tokenAuth)
+
+// 获取验证模块
+var authorization = require(path.join(process.cwd(), '/modules/authorization'))
+
+// 设置全局权限
+authorization.setAuthFn(function(req, res, next, serviceName, actionName, passFn) {
+  if (!req.userInfo || isNaN(parseInt(req.userInfo.rid))) return res.sendResult('无角色ID分配')
+  // 验证权限
+  roleService.authRight(req.userInfo.rid, serviceName, actionName, function(err, pass) {
+    passFn(pass)
+  })
+})
+
+/**
+ *
+ * 初始化路由
+ *
+ */
+// 带路径的用法并且可以打印出路有表
+mount(app, path.join(process.cwd(), '/routes'), true)
+
+app.all('/ueditor/ue', function(req, res, next) {
+  res.header('Access-Control-Allow-Origin', '*')
+  res.header('Access-Control-Allow-Headers', 'X-Requested-With, mytoken')
+  res.header('Access-Control-Allow-Headers', 'X-Requested-With, Authorization')
+  res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With, X_Requested_With')
+  res.header('Access-Control-Allow-Methods', 'PUT,POST,GET,DELETE,OPTIONS')
+  res.header('X-Powered-By', ' 3.2.1')
+  if (req.method == 'OPTIONS') res.send(200)
+  /*让options请求快速返回*/ else next()
+})
+
+// 富文本编辑器上传
+var ueditor = require(path.join(process.cwd(), '/modules/ueditor'))
+// 富文本控件处理qing q
+app.use('/ueditor/ue', ueditor)
+//. 设置富文本空间地址
+app.use('/ueditor', express.static('public/ueditor'))
+
+app.use('/tmp_uploads', express.static('tmp_uploads'))
+app.use('/x/common', express.static('uploads/common'))
+app.use('/uploads/goodspics', express.static('uploads/goodspics'))
+
+var upload_config = require('config').get('upload_config')
+app.use('/' + upload_config.get('upload_ueditor'), express.static(upload_config.get('upload_ueditor')))
+
+const logistics = require('./modules/Logistics.js')
+app.get('/api/private/v1/kuaidi/:orderno', logistics.getLogisticsInfo)
+
+// 定义日志
+// var log4js = require('./modules/logger');
+// log4js.use(app);
+
+/**
+ *
+ * 统一处理无响应
+ *
+ */
+// 如果没有路径处理就返回 Not Found
+app.use(function(req, res, next) {
+  res.sendResult(null, 404, 'Not Found')
+})
+
+app.listen(8888)
+
+module.exports = app
--- a/cheese.log
+++ b/cheese.log
@ -0,0 +1,245 @@
+[2021-11-21T15:09:56.478] [DEBUG] cheese - login => username:zs,password:123456
+[2021-11-21T15:09:56.480] [DEBUG] cheese - zs
+[2021-11-21T15:09:56.486] [DEBUG] cheese - null
+[2021-11-21T15:09:56.486] [DEBUG] cheese - null
+[2021-11-21T15:10:06.637] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T15:10:06.637] [DEBUG] cheese - admin
+[2021-11-21T15:10:06.641] [DEBUG] cheese - null
+[2021-11-21T15:10:06.642] [DEBUG] cheese - null
+[2021-11-21T18:03:44.144] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:03:44.147] [DEBUG] cheese - admin
+[2021-11-21T18:03:44.165] [DEBUG] cheese - null
+[2021-11-21T18:03:44.166] [DEBUG] cheese - null
+[2021-11-21T18:04:10.058] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:04:10.059] [DEBUG] cheese - admin
+[2021-11-21T18:04:10.069] [DEBUG] cheese - null
+[2021-11-21T18:04:10.069] [DEBUG] cheese - null
+[2021-11-21T18:05:14.245] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:05:14.246] [DEBUG] cheese - admin
+[2021-11-21T18:05:14.256] [DEBUG] cheese - null
+[2021-11-21T18:05:14.258] [DEBUG] cheese - null
+[2021-11-21T18:06:37.789] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:06:37.789] [DEBUG] cheese - admin
+[2021-11-21T18:06:37.799] [DEBUG] cheese - null
+[2021-11-21T18:06:37.799] [DEBUG] cheese - null
+[2021-11-21T18:06:43.474] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:06:43.475] [DEBUG] cheese - admin
+[2021-11-21T18:06:43.483] [DEBUG] cheese - null
+[2021-11-21T18:06:43.483] [DEBUG] cheese - null
+[2021-11-21T18:08:10.370] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:08:10.370] [DEBUG] cheese - admin
+[2021-11-21T18:08:10.375] [DEBUG] cheese - null
+[2021-11-21T18:08:10.375] [DEBUG] cheese - null
+[2021-11-21T18:12:54.209] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:12:54.209] [DEBUG] cheese - admin
+[2021-11-21T18:12:54.212] [DEBUG] cheese - null
+[2021-11-21T18:12:54.212] [DEBUG] cheese - null
+[2021-11-21T18:13:52.556] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:13:52.556] [DEBUG] cheese - admin
+[2021-11-21T18:13:52.562] [DEBUG] cheese - null
+[2021-11-21T18:13:52.562] [DEBUG] cheese - null
+[2021-11-21T18:13:55.369] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:13:55.370] [DEBUG] cheese - admin
+[2021-11-21T18:13:55.377] [DEBUG] cheese - null
+[2021-11-21T18:13:55.377] [DEBUG] cheese - null
+[2021-11-21T18:14:00.482] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:14:00.482] [DEBUG] cheese - admin
+[2021-11-21T18:14:00.483] [DEBUG] cheese - null
+[2021-11-21T18:14:00.483] [DEBUG] cheese - null
+[2021-11-21T18:18:06.678] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:18:06.678] [DEBUG] cheese - admin
+[2021-11-21T18:18:06.680] [DEBUG] cheese - null
+[2021-11-21T18:18:06.680] [DEBUG] cheese - null
+[2021-11-21T18:22:06.821] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:22:06.821] [DEBUG] cheese - admin
+[2021-11-21T18:22:06.825] [DEBUG] cheese - null
+[2021-11-21T18:22:06.825] [DEBUG] cheese - null
+[2021-11-21T18:22:10.486] [DEBUG] cheese - login => username:admin122,password:123456
+[2021-11-21T18:22:10.486] [DEBUG] cheese - admin122
+[2021-11-21T18:22:10.490] [DEBUG] cheese - null
+[2021-11-21T18:22:10.491] [DEBUG] cheese - null
+[2021-11-21T18:26:02.917] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:26:02.917] [DEBUG] cheese - admin
+[2021-11-21T18:26:02.921] [DEBUG] cheese - null
+[2021-11-21T18:26:02.921] [DEBUG] cheese - null
+[2021-11-21T18:29:36.875] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:29:36.876] [DEBUG] cheese - admin
+[2021-11-21T18:29:36.881] [DEBUG] cheese - null
+[2021-11-21T18:29:36.881] [DEBUG] cheese - null
+[2021-11-21T18:36:28.015] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T18:36:28.016] [DEBUG] cheese - admin
+[2021-11-21T18:36:28.020] [DEBUG] cheese - null
+[2021-11-21T18:36:28.021] [DEBUG] cheese - null
+[2021-11-21T19:05:47.031] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T19:05:47.031] [DEBUG] cheese - admin
+[2021-11-21T19:05:47.037] [DEBUG] cheese - null
+[2021-11-21T19:05:47.038] [DEBUG] cheese - null
+[2021-11-21T19:40:40.245] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T19:40:40.246] [DEBUG] cheese - admin
+[2021-11-21T19:40:40.250] [DEBUG] cheese - null
+[2021-11-21T19:40:40.250] [DEBUG] cheese - null
+[2021-11-21T19:58:52.075] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T19:58:52.075] [DEBUG] cheese - admin
+[2021-11-21T19:58:52.077] [DEBUG] cheese - null
+[2021-11-21T19:58:52.077] [DEBUG] cheese - null
+[2021-11-21T21:26:49.013] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T21:26:49.013] [DEBUG] cheese - admin
+[2021-11-21T21:26:49.015] [DEBUG] cheese - null
+[2021-11-21T21:26:49.015] [DEBUG] cheese - null
+[2021-11-21T21:45:18.152] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-21T21:45:18.152] [DEBUG] cheese - admin
+[2021-11-21T21:45:18.155] [DEBUG] cheese - null
+[2021-11-21T21:45:18.155] [DEBUG] cheese - null
+[2021-11-22T09:18:17.018] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T09:18:17.019] [DEBUG] cheese - admin
+[2021-11-22T09:18:17.034] [DEBUG] cheese - null
+[2021-11-22T09:18:17.034] [DEBUG] cheese - null
+[2021-11-22T09:20:05.379] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T09:20:05.380] [DEBUG] cheese - admin
+[2021-11-22T09:20:05.387] [DEBUG] cheese - null
+[2021-11-22T09:20:05.387] [DEBUG] cheese - null
+[2021-11-22T09:57:47.789] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T09:57:47.790] [DEBUG] cheese - admin
+[2021-11-22T09:57:47.792] [DEBUG] cheese - null
+[2021-11-22T09:57:47.792] [DEBUG] cheese - null
+[2021-11-22T10:04:23.007] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T10:04:23.007] [DEBUG] cheese - admin
+[2021-11-22T10:04:23.013] [DEBUG] cheese - null
+[2021-11-22T10:04:23.013] [DEBUG] cheese - null
+[2021-11-22T10:35:39.426] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T10:35:39.426] [DEBUG] cheese - admin
+[2021-11-22T10:35:39.430] [DEBUG] cheese - null
+[2021-11-22T10:35:39.430] [DEBUG] cheese - null
+[2021-11-22T10:35:46.825] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T10:35:46.825] [DEBUG] cheese - admin
+[2021-11-22T10:35:46.831] [DEBUG] cheese - null
+[2021-11-22T10:35:46.832] [DEBUG] cheese - null
+[2021-11-22T11:49:26.498] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T11:49:26.499] [DEBUG] cheese - admin
+[2021-11-22T11:49:26.503] [DEBUG] cheese - null
+[2021-11-22T11:49:26.503] [DEBUG] cheese - null
+[2021-11-22T12:52:27.780] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T12:52:27.781] [DEBUG] cheese - admin
+[2021-11-22T12:52:27.783] [DEBUG] cheese - null
+[2021-11-22T12:52:27.783] [DEBUG] cheese - null
+[2021-11-22T13:12:43.560] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T13:12:43.560] [DEBUG] cheese - admin
+[2021-11-22T13:12:43.562] [DEBUG] cheese - null
+[2021-11-22T13:12:43.562] [DEBUG] cheese - null
+[2021-11-22T19:32:21.404] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-22T19:32:21.406] [DEBUG] cheese - admin
+[2021-11-22T19:32:21.420] [DEBUG] cheese - null
+[2021-11-22T19:32:21.420] [DEBUG] cheese - null
+[2021-11-22T21:11:26.756] [DEBUG] cheese - null
+[2021-11-22T21:13:00.622] [DEBUG] cheese - null
+[2021-11-22T21:13:02.691] [DEBUG] cheese - null
+[2021-11-23T08:59:05.929] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-23T08:59:05.930] [DEBUG] cheese - admin
+[2021-11-23T08:59:05.946] [DEBUG] cheese - null
+[2021-11-23T08:59:05.947] [DEBUG] cheese - null
+[2021-11-23T08:59:18.349] [DEBUG] cheese - null
+[2021-11-23T08:59:21.131] [DEBUG] cheese - null
+[2021-11-23T08:59:23.463] [DEBUG] cheese - null
+[2021-11-23T09:04:39.030] [DEBUG] cheese - null
+[2021-11-23T09:04:43.843] [DEBUG] cheese - null
+[2021-11-23T09:04:46.545] [DEBUG] cheese - null
+[2021-11-24T09:00:17.391] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-24T09:00:17.393] [DEBUG] cheese - admin
+[2021-11-24T09:00:17.409] [DEBUG] cheese - null
+[2021-11-24T09:00:17.410] [DEBUG] cheese - null
+[2021-11-24T20:55:34.536] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-24T20:55:34.537] [DEBUG] cheese - admin
+[2021-11-24T20:55:34.553] [DEBUG] cheese - null
+[2021-11-24T20:55:34.554] [DEBUG] cheese - null
+[2021-11-25T21:57:05.508] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-25T21:57:05.510] [DEBUG] cheese - admin
+[2021-11-25T21:57:05.526] [DEBUG] cheese - null
+[2021-11-25T21:57:05.526] [DEBUG] cheese - null
+[2021-11-26T23:03:21.416] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-26T23:03:21.418] [DEBUG] cheese - admin
+[2021-11-26T23:03:21.434] [DEBUG] cheese - null
+[2021-11-26T23:03:21.434] [DEBUG] cheese - null
+[2021-11-27T21:12:10.793] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-27T21:12:10.795] [DEBUG] cheese - admin
+[2021-11-27T21:12:10.814] [DEBUG] cheese - null
+[2021-11-27T21:12:10.815] [DEBUG] cheese - null
+[2021-11-28T15:46:41.893] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-28T15:46:41.894] [DEBUG] cheese - admin
+[2021-11-28T15:46:41.909] [DEBUG] cheese - null
+[2021-11-28T15:46:41.909] [DEBUG] cheese - null
+[2021-11-29T21:58:44.393] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-29T21:58:44.394] [DEBUG] cheese - admin
+[2021-11-29T21:58:44.411] [DEBUG] cheese - null
+[2021-11-29T21:58:44.411] [DEBUG] cheese - null
+[2021-11-29T22:24:12.754] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-29T22:24:12.757] [DEBUG] cheese - admin
+[2021-11-29T22:24:12.759] [DEBUG] cheese - null
+[2021-11-29T22:24:12.760] [DEBUG] cheese - null
+[2021-11-30T21:26:11.870] [DEBUG] cheese - login => username:admin,password:123456
+[2021-11-30T21:26:11.872] [DEBUG] cheese - admin
+[2021-11-30T21:26:11.888] [DEBUG] cheese - null
+[2021-11-30T21:26:11.888] [DEBUG] cheese - null
+[2021-12-04T11:00:42.253] [DEBUG] cheese - login => username:admin,password:123456
+[2021-12-04T11:00:42.255] [DEBUG] cheese - admin
+[2021-12-04T11:00:42.272] [DEBUG] cheese - null
+[2021-12-04T11:00:42.272] [DEBUG] cheese - null
+[2021-12-04T15:37:22.973] [DEBUG] cheese - null
+[2021-12-04T15:42:50.492] [DEBUG] cheese - null
+[2021-12-06T17:58:59.227] [DEBUG] cheese - login => username:admin,password:123456
+[2021-12-06T17:58:59.228] [DEBUG] cheese - admin
+[2021-12-06T17:58:59.244] [DEBUG] cheese - null
+[2021-12-06T17:58:59.244] [DEBUG] cheese - null
+[2022-02-11T13:00:53.718] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-11T13:00:53.720] [DEBUG] cheese - admin
+[2022-02-11T13:00:53.734] [DEBUG] cheese - null
+[2022-02-11T13:00:53.734] [DEBUG] cheese - null
+[2022-02-11T13:07:42.700] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-11T13:07:42.701] [DEBUG] cheese - admin
+[2022-02-11T13:07:42.703] [DEBUG] cheese - null
+[2022-02-11T13:07:42.704] [DEBUG] cheese - null
+[2022-02-11T14:02:35.425] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-11T14:02:35.431] [DEBUG] cheese - admin
+[2022-02-11T14:02:35.457] [DEBUG] cheese - null
+[2022-02-11T14:02:35.458] [DEBUG] cheese - null
+[2022-02-11T18:05:10.459] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-11T18:05:10.460] [DEBUG] cheese - admin
+[2022-02-11T18:05:10.462] [DEBUG] cheese - null
+[2022-02-11T18:05:10.463] [DEBUG] cheese - null
+[2022-02-11T18:09:09.435] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-11T18:09:09.435] [DEBUG] cheese - admin
+[2022-02-11T18:09:09.437] [DEBUG] cheese - null
+[2022-02-11T18:09:09.438] [DEBUG] cheese - null
+[2022-02-17T13:08:42.111] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-17T13:08:42.116] [DEBUG] cheese - admin
+[2022-02-17T13:08:42.144] [DEBUG] cheese - null
+[2022-02-17T13:08:42.145] [DEBUG] cheese - null
+[2022-02-17T13:40:13.254] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-17T13:40:13.256] [DEBUG] cheese - admin
+[2022-02-17T13:40:13.260] [DEBUG] cheese - null
+[2022-02-17T13:40:13.261] [DEBUG] cheese - null
+[2022-02-20T16:38:00.813] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-20T16:38:00.815] [DEBUG] cheese - admin
+[2022-02-20T16:38:00.830] [DEBUG] cheese - null
+[2022-02-20T16:38:00.830] [DEBUG] cheese - null
+[2022-02-20T16:39:22.231] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-20T16:39:22.231] [DEBUG] cheese - admin
+[2022-02-20T16:39:22.233] [DEBUG] cheese - null
+[2022-02-20T16:39:22.233] [DEBUG] cheese - null
+[2022-02-20T16:47:56.190] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-20T16:47:56.190] [DEBUG] cheese - admin
+[2022-02-20T16:47:56.192] [DEBUG] cheese - null
+[2022-02-20T16:47:56.192] [DEBUG] cheese - null
+[2022-02-20T16:48:40.666] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-20T16:48:40.666] [DEBUG] cheese - admin
+[2022-02-20T16:48:40.669] [DEBUG] cheese - null
+[2022-02-20T16:48:40.669] [DEBUG] cheese - null
+[2022-02-20T16:52:15.037] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-20T16:52:15.037] [DEBUG] cheese - admin
+[2022-02-20T16:52:15.039] [DEBUG] cheese - null
+[2022-02-20T16:52:15.040] [DEBUG] cheese - null
+[2022-02-20T16:54:14.763] [DEBUG] cheese - login => username:admin,password:123456
+[2022-02-20T16:54:14.765] [DEBUG] cheese - admin
+[2022-02-20T16:54:14.769] [DEBUG] cheese - null
+[2022-02-20T16:54:14.770] [DEBUG] cheese - null
+[2022-02-20T18:32:57.250] [DEBUG] cheese - null
+[2022-02-20T18:52:57.460] [DEBUG] cheese - null
--- a/config/default.json
+++ b/config/default.json
@ -0,0 +1,20 @@
+{
+	"config_name" : "develop",
+	"jwt_config" : {
+		"secretKey":"itcast",
+		"expiresIn":86400
+	},
+	"upload_config":{
+		"baseURL":"http://127.0.0.1:8888",
+		"upload_ueditor":"uploads/ueditor",
+		"simple_upload_redirect":"http://127.0.0.1/reload"
+	},
+	"db_config" : {
+		"protocol" : "mysql",
+		"host" : "127.0.0.1",
+		"database" : "mydb",
+		"user" : "root",
+		"password" : "123456",
+		"port" : 3306
+	}
+}
--- a/config/ueditor.config.js
+++ b/config/ueditor.config.js
@ -0,0 +1,94 @@
+/* 前后端通信相关的配置,注释只允许使用多行方式 */
+module.exports = {
+    /* 上传图片配置项 */
+    "imageActionName": "uploadimage", /* 执行上传图片的action名称 */
+    "imageFieldName": "upfile", /* 提交的图片表单名称 */
+    "imageMaxSize": 2048000, /* 上传大小限制，单位B */
+    "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
+    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
+    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
+    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
+    "imageUrlPrefix": "", /* 图片访问路径前缀 */
+    "imagePathFormat": "/ueditor/ue/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
+                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
+                                /* {time} 会替换成时间戳 */
+                                /* {yyyy} 会替换成四位年份 */
+                                /* {yy} 会替换成两位年份 */
+                                /* {mm} 会替换成两位月份 */
+                                /* {dd} 会替换成两位日期 */
+                                /* {hh} 会替换成两位小时 */
+                                /* {ii} 会替换成两位分钟 */
+                                /* {ss} 会替换成两位秒 */
+                                /* 非法字符 \ : * ? " < > | */
+                                /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
+
+    /* 涂鸦图片上传配置项 */
+    "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
+    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
+    "scrawlPathFormat": "/ueditor/ue/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
+    "scrawlUrlPrefix": "", /* 图片访问路径前缀 */
+    "scrawlInsertAlign": "none",
+
+    /* 截图工具上传 */
+    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
+    "snapscreenPathFormat": "/ueditor/ue/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "snapscreenUrlPrefix": "", /* 图片访问路径前缀 */
+    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
+
+    /* 抓取远程图片配置 */
+    "catcherLocalDomain": ["www.escook.cn"],
+    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
+    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
+    "catcherPathFormat": "/ueditor/ue/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "catcherUrlPrefix": "", /* 图片访问路径前缀 */
+    "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
+    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
+
+    /* 上传视频配置 */
+    "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
+    "videoFieldName": "upfile", /* 提交的视频表单名称 */
+    "videoPathFormat": "/ueditor/ue/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "videoUrlPrefix": "", /* 视频访问路径前缀 */
+    "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
+    "videoAllowFiles": [
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
+
+    /* 上传文件配置 */
+    "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
+    "fileFieldName": "upfile", /* 提交的文件表单名称 */
+    "filePathFormat": "/ueditor/ue/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "fileUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
+    "fileAllowFiles": [
+        ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+    ], /* 上传文件格式显示 */
+
+    /* 列出指定目录下的图片 */
+    "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
+    "imageManagerListPath": "/ueditor/ue/", /* 指定要列出图片的目录 */
+    "imageManagerListSize": 20, /* 每次列出文件数量 */
+    "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
+    "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
+    "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
+
+    /* 列出指定目录下的文件 */
+    "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
+    "fileManagerListPath": "/ueditor/ue/", /* 指定要列出文件的目录 */
+    "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileManagerListSize": 20, /* 每次列出文件数量 */
+    "fileManagerAllowFiles": [
+        ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+    ] /* 列出的文件类型 */
+
+}
--- a/dao/AttributeDAO.js
+++ b/dao/AttributeDAO.js
@ -0,0 +1,21 @@
+var path = require("path");
+daoModule = require("./DAO");
+databaseModule = require(path.join(process.cwd(),"modules/database"));
+
+/**
+ * 获取参数列表数据
+ * 
+ * @param  {[type]}   cat_id 分类ID
+ * @param  {[type]}   sel    类型
+ * @param  {Function} cb     回调函数
+ */
+module.exports.list = function(cat_id,sel,cb) {
+	db = databaseModule.getDatabase();
+	sql = "SELECT * FROM sp_attribute WHERE cat_id = ? AND attr_sel = ? AND delete_time is NULL";
+	database.driver.execQuery(
+			sql
+		,[cat_id,sel],function(err,attributes){
+			if(err) return cb("查询执行出错");
+			cb(null,attributes);
+		});
+}
--- a/dao/DAO.js
+++ b/dao/DAO.js
@ -0,0 +1,224 @@
+var path = require("path");
+
+// 获取数据库模型
+databaseModule = require(path.join(process.cwd(),"modules/database")); 
+var logger = require('../modules/logger').logger();
+
+/**
+ * 创建对象数据
+ * 
+ * @param  {[type]}   modelName 模型名称
+ * @param  {[type]}   obj       模型对象
+ * @param  {Function} cb        回调函数
+ */
+module.exports.create = function(modelName,obj,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models[modelName];
+	Model.create(obj,cb);
+}
+
+/**
+ * 获取所有数据
+ * 
+ * @param  {[type]}   conditions 查询条件
+ * 查询条件统一规范
+ * conditions
+	{
+		"columns" : {
+			字段条件
+			"字段名" : "条件值"
+		},
+		"offset" : "偏移",
+		"omit" : ["字段"],
+		"only" : ["需要字段"],
+		"limit" : "",
+		"order" :[ 
+			"字段" , A | Z,
+			...
+		]
+	}
+ * @param  {Function} cb         回调函数
+ */
+module.exports.list = function(modelName,conditions,cb) {
+	var db = databaseModule.getDatabase();
+
+	var model = db.models[modelName];
+
+	if(!model) return cb("模型不存在",null);
+
+
+
+	if(conditions) {
+		if(conditions["columns"]) {
+			model = model.find(conditions["columns"]);
+		} else {
+			model = model.find();
+		}
+
+		if(conditions["offset"]) {
+			model = model.offset(parseInt(conditions["offset"]));
+		}
+
+		if(conditions["limit"]) {
+			model = model.limit(parseInt(conditions["limit"]));
+		}
+
+		if(conditions["only"]) {
+			model = model.only(conditions["only"]);
+		}
+
+		if(conditions["omit"]) {
+			model = model.omit(conditions["omit"]);
+		}
+
+		if(conditions["order"]) {
+			model = model.order(conditions["order"]);
+		}
+
+	} else {
+		model = model.find();
+	}
+
+	model.run(function(err,models) {
+		
+		if(err) {
+			console.log(err);
+			return cb("查询失败",null);
+		}
+		cb(null,models);
+	});
+};
+
+module.exports.countByConditions = function(modelName,conditions,cb) {
+	var db = databaseModule.getDatabase();
+
+	var model = db.models[modelName];
+
+	if(!model) return cb("模型不存在",null);
+
+	var resultCB = function(err,count){
+		if(err) {
+			return cb("查询失败",null);
+		}
+		cb(null,count);
+	}
+
+	if(conditions) {
+		if(conditions["columns"]) {
+			model = model.count(conditions["columns"],resultCB);
+		} else {
+			model = model.count(resultCB);
+		}
+
+	} else {
+		model = model.count(resultCB);
+	}
+
+};
+
+/**
+ * 获取一条数据
+ * @param  {[type]}   modelName  模型名称
+ * @param  {[数组]}   conditions  条件集合
+ * @param  {Function} cb         回调函数
+ */
+module.exports.findOne = function(modelName,conditions,cb) {
+	var db = databaseModule.getDatabase();
+
+	var Model = db.models[modelName];
+
+	if(!Model) return cb("模型不存在",null);
+
+	if(!conditions) return  cb("条件为空",null);
+
+	Model.one(conditions,function(err,obj){
+		logger.debug(err);
+		if(err) {
+			return cb("查询失败",null);
+		}
+		return cb(null,obj);
+	});
+}
+
+/**
+ * 更新对象数据
+ * 
+ * @param  {[type]}   modelName 模型名称
+ * @param  {[type]}   id        数据关键ID
+ * @param  {[type]}   updateObj 更新对象数据
+ * @param  {Function} cb        回调函数
+ */
+module.exports.update = function(modelName,id,updateObj,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models[modelName];
+	Model.get(id,function(err,obj){
+		if(err) return cb("更新失败",null);
+		obj.save(updateObj,cb);
+	});
+}
+
+/**
+ * 通过主键ID获取对象
+ * @param  {[type]}   modelName 模型名称
+ * @param  {[type]}   id        主键ID
+ * @param  {Function} cb        回调函数
+ */
+module.exports.show = function(modelName,id,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models[modelName];
+	Model.get(id,function(err,obj){
+		cb(err,obj);
+	});
+}
+
+/**
+ * 通过主键ID删除对象
+ * 
+ * @param  {[type]}   modelName 模型名称
+ * @param  {[type]}   id        主键ID
+ * @param  {Function} cb        回调函数
+ */
+module.exports.destroy = function(modelName,id,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models[modelName];
+	Model.get(id,function(err,obj){
+		if(err) return cb("无模型ID");
+		obj.remove(function(err) {
+			if(err) return cb("删除失败");
+			return cb(null);
+		});
+	});
+}
+
+/**
+ * 通过模型名称获取数据库数量
+ * 
+ * @param  {[type]}   modelName 模型名称
+ * @param  {Function} cb        回调函数
+ */
+module.exports.count = function(modelName,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models[modelName];
+	Model.count(cb);
+}
+
+/**
+ * 通过条件判断数据是否存在
+ * 
+ * @param  {[type]}   modelName  模块名
+ * @param  {[type]}   conditions 条件
+ * @param  {Function} cb         回调函数
+ */
+module.exports.exists = function(modelName,conditions,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models[modelName];
+	Model.exists(conditions,function(err,isExists){
+		if(err) return cb("查询失败");
+		 cb(null,isExists);
+	});
+}
+
+module.exports.getModel = function(modelName) {
+	var db = databaseModule.getDatabase();
+	return db.models[modelName];
+}
--- a/dao/GoodAttributeDAO.js
+++ b/dao/GoodAttributeDAO.js
@ -0,0 +1,26 @@
+var path = require("path");
+daoModule = require("./DAO");
+databaseModule = require(path.join(process.cwd(),"modules/database"));
+
+
+module.exports.clearGoodAttributes = function(goods_id,cb) {
+	db = databaseModule.getDatabase();
+	sql = "DELETE FROM sp_goods_attr WHERE goods_id = ?";
+	database.driver.execQuery(
+			sql
+		,[goods_id],function(err){
+			if(err) return cb("删除出错");
+			cb(null);
+		});
+}
+
+module.exports.list = function(goods_id,cb) {
+	db = databaseModule.getDatabase();
+	sql = "SELECT good_attr.goods_id,good_attr.attr_id,good_attr.attr_value,good_attr.add_price,attr.attr_name,attr.attr_sel,attr.attr_write,attr.attr_vals FROM sp_goods_attr as good_attr LEFT JOIN sp_attribute as attr ON attr.attr_id = good_attr.attr_id WHERE good_attr.goods_id = ?";
+	database.driver.execQuery(
+			sql
+		,[goods_id],function(err,attrs){
+			if(err) return cb("删除出错");
+			cb(null,attrs);
+		});
+}
--- a/dao/ManagerDAO.js
+++ b/dao/ManagerDAO.js
@ -0,0 +1,165 @@
+var path = require("path");
+daoModule = require("./DAO");
+databaseModule = require(path.join(process.cwd(),"modules/database"));
+
+/**
+ * 创建管理员
+ * 
+ * @param  {[type]}   obj 管理员信息
+ * @param  {Function} cb  回调函数
+ */
+module.exports.create = function(obj,cb) {
+	daoModule.create("ManagerModel",obj,cb);
+}
+
+/**
+ * 获取管理员列表
+ * 
+ * @param  {[type]}   conditions 查询条件
+ * @param  {Function} cb         回调函数
+ */
+module.exports.list = function(conditions,cb) {
+	daoModule.list("ManagerModel",conditions,function(err,models) {
+		if(err) return cb(err,null);
+		cb(null,models);
+	});
+}
+
+/**
+ * 通过查询条件获取管理员对象
+ * 
+ * @param  {[type]}   conditions 条件
+ * @param  {Function} cb         回调函数
+ */
+module.exports.findOne = function(conditions,cb) {
+	daoModule.findOne("ManagerModel",conditions,cb);
+}
+
+/**
+ * 通过关键词查询用户
+ * 
+ * @param  {[type]}   key    关键词
+ * @param  {[type]}   offset 
+ * @param  {[type]}   limit  
+ * @param  {Function} cb     回调函数
+ */
+module.exports.findByKey = function(key,offset,limit,cb) {
+	db = databaseModule.getDatabase();
+	sql = "SELECT * FROM sp_manager as mgr LEFT JOIN sp_role as role ON mgr.role_id = role.role_id";
+
+	if(key) {
+		sql += " WHERE mg_name LIKE ? LIMIT ?,?";
+		database.driver.execQuery(
+			sql
+		,["%" + key + "%",offset,limit],function(err,managers){
+			if(err) return cb("查询执行出错");
+			cb(null,managers);
+		});
+	} else {
+		sql += " LIMIT ?,? ";
+		database.driver.execQuery(sql,[offset,limit],function(err,managers){
+			if(err) return cb("查询执行出错");
+			cb(null,managers);
+		});
+	}
+}
+
+/**
+ * 判断是否存在管理员
+ * 
+ * @param  {[type]}   username 用户名
+ * @param  {Function} cb       回调函数
+ * 
+ */
+module.exports.exists = function(username,cb) {
+	var db = databaseModule.getDatabase();
+	var Model = db.models.ManagerModel;
+	Model.exists({"mg_name":username},function(err,isExists){
+		if(err) return cb("查询失败");
+		 cb(null,isExists);
+	});
+}
+
+/**
+ * 模糊查询用户数量
+ * 
+ * @param  {[type]}   key 关键词
+ * @param  {Function} cb  回调函数
+ */
+module.exports.countByKey = function(key,cb) {
+	db = databaseModule.getDatabase();
+	sql = "SELECT count(*) as count FROM sp_manager";
+	if(key) {
+		sql += " WHERE mg_name LIKE ?";
+		database.driver.execQuery(
+			sql
+		,["%" + key + "%"],function(err,result){
+			if(err) return cb("查询执行出错");
+			cb(null,result[0]["count"]);
+		});
+	} else {
+		database.driver.execQuery(sql,function(err,result){
+			if(err) return cb("查询执行出错");
+			cb(null,result[0]["count"]);
+		});
+	}
+	
+}
+
+/**
+ * 通过ID获取管理员对象数据
+ * 
+ * @param  {[type]}   id 管理员主键ID
+ * @param  {Function} cb 回调函数
+ */
+module.exports.show = function(id,cb) {
+	daoModule.show("ManagerModel",id,cb);
+}
+
+/**
+ * 更新管理员信息
+ * 
+ * @param  {[type]}   obj 管理员对象
+ * @param  {Function} cb  回调函数
+ */
+module.exports.update = function(obj,cb) {
+	daoModule.update("ManagerModel",obj.mg_id,obj,cb);
+}
+
+/**
+ * 删除管理员对象数据
+ * 
+ * @param  {[type]}   id 主键ID
+ * @param  {Function} cb 回调函数
+ */
+module.exports.destroy = function(id,cb) {
+	daoModule.destroy("ManagerModel",id,function(err){
+		if(err) return cb(err);
+		return cb(null);
+	});
+}
+
+/**
+ * 保存管理员信息
+ * 
+ * @param  {[type]}   obj 管理员对象
+ * @param  {Function} cb  回调函数
+ */
+module.exports.save = function(obj,cb) {
+	daoModule.show(obj.mg_id,function(err,oldObj){
+		if(err) {
+			daoModule.create("ManagerModel",obj,cb);
+		} else {
+			daoModule.update("ManagerModel",obj.mg_id,obj,cb);
+		}
+	})
+}
+
+/**
+ * 获取管理员数量
+ * 
+ * @param  {Function} cb 回调函数
+ */
+module.exports.count = function(cb) {
+	daoModule("ManagerModel",cb);
+}
--- a/dao/PermissionAPIDAO.js
+++ b/dao/PermissionAPIDAO.js
@ -0,0 +1,50 @@
+var path = require("path");
+daoModule = require("./DAO");
+databaseModule = require(path.join(process.cwd(),"modules/database"));
+
+/**
+ * 获取权限列表
+ * 
+ * @param  {Function} cb 回调函数
+ */
+module.exports.list = function(cb) {
+	db = databaseModule.getDatabase();
+	sql = "SELECT * FROM sp_permission_api as api LEFT JOIN sp_permission as main ON main.ps_id = api.ps_id WHERE main.ps_id is not null";
+	database.driver.execQuery(sql,function(err,result){
+		if(err) return cb("获取权限列表失败",null);
+		cb(null,result);
+	});
+}
+
+/**
+ * 权限验证
+ * 
+ * @param  {[type]}   rid         角色ID
+ * @param  {[type]}   serviceName 服务名
+ * @param  {[type]}   actionName  动作名
+ * @param  {Function} cb          回调函数
+ */
+module.exports.authRight = function(rid,serviceName,actionName,cb) {
+	
+	// 超级管理员
+	if(rid == 0) return cb(null,true);
+
+	// 权限验证
+	daoModule.findOne("PermissionAPIModel",{"ps_api_service":serviceName,"ps_api_action":actionName},function(err,permissionAPI){
+		console.log("rid => %s,serviceName => %s,actionName => %s",rid,serviceName,actionName);
+		if(err || !permissionAPI) return cb("无权限访问",false);
+		
+		daoModule.findOne("RoleModel",{"role_id":rid},function(err,role){
+			console.log(role);
+			if(err || !role) return cb("获取角色信息失败",false);
+			ps_ids = role.ps_ids.split(",");
+			for(idx in ps_ids) {
+				ps_id = ps_ids[idx];
+				if(parseInt(permissionAPI.ps_id) == parseInt(ps_id)) {
+					return cb(null,true);
+				}
+			}
+			return cb("无权限访问",false);
+		});
+	});
+}
--- a/db/mydb.sql
+++ b/db/mydb.sql
--- a/models/AttributeModel.js
+++ b/models/AttributeModel.js
@ -0,0 +1,15 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("AttributeModel",{
+		attr_id : {type: 'serial', key: true},
+		attr_name : String,
+		cat_id : Number,
+		attr_sel : ["only", "many"],	// only:输入框(唯一)  many:后台下拉列表/前台单选框
+		attr_write: ["manual","list"],	// manual:手工录入  list:从列表选择
+		attr_vals: String,
+		delete_time : Number
+	},{
+		table : "sp_attribute"
+	});
+	return callback();
+}
--- a/models/CategoryModel.js
+++ b/models/CategoryModel.js
@ -0,0 +1,13 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("CategoryModel",{
+		cat_id : {type: 'serial', key: true},
+		cat_name : String,
+		cat_pid : Number,
+		cat_level : Number,
+		cat_deleted: Boolean
+	},{
+		table : "sp_category"
+	});
+	return callback();
+}
--- a/models/GoodAttributeModel.js
+++ b/models/GoodAttributeModel.js
@ -0,0 +1,13 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("GoodAttributeModel",{
+		id : {type: 'serial', key: true},
+		goods_id : Number,
+		attr_id : Number,
+		attr_value : String,
+		add_price : Number
+	},{
+		table : "sp_goods_attr"
+	});
+	return callback();
+}
--- a/models/GoodModel.js
+++ b/models/GoodModel.js
@ -0,0 +1,33 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("GoodModel",{
+		goods_id : {type: 'serial', key: true},
+		cat_id : Number,
+		goods_name : String,
+		goods_price : Number,
+		goods_number : Number,
+		goods_weight : Number,
+		goods_introduce : String,
+		goods_big_logo : String,
+		goods_small_logo : String,
+		goods_state : Number,	// 0：未审核 1: 审核中 2: 已审核
+		is_del : ['0','1'],	// 0: 正常 , 1: 删除
+		add_time : Number,
+		upd_time : Number,
+		delete_time : Number,
+		hot_mumber : Number,
+		is_promote : Boolean,
+		cat_one_id : Number,
+		cat_two_id : Number,
+		cat_three_id : Number
+
+	},{
+		table : "sp_goods",
+		methods: {
+		getGoodsCat: function () {
+			return this.cat_one_id + ',' + this.cat_two_id + ',' + this.cat_three_id;
+		}
+	}
+	});
+	return callback();
+}
--- a/models/GoodPicModel.js
+++ b/models/GoodPicModel.js
@ -0,0 +1,13 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("GoodPicModel",{
+		pics_id : {type: 'serial', key: true},
+		goods_id : Number,
+		pics_big : String,
+		pics_mid : String,
+		pics_sma : String
+	},{
+		table : "sp_goods_pics"
+	});
+	return callback();
+}
--- a/models/ManagerModel.js
+++ b/models/ManagerModel.js
@ -0,0 +1,16 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("ManagerModel",{
+		mg_id : {type: 'serial', key: true},
+		mg_name : String,
+		mg_pwd : String,
+		mg_time : Number,
+		role_id : Number,
+		mg_mobile : String,
+		mg_email : String,
+		mg_state : Number
+	},{
+		table : "sp_manager"
+	});
+	return callback();
+}
--- a/models/OrderGoodModel.js
+++ b/models/OrderGoodModel.js
@ -0,0 +1,14 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("OrderGoodModel",{
+		id : {type: 'serial', key: true},
+		order_id : Number,
+		goods_id : Number,
+		goods_price : Number,
+		goods_number : Number,
+		goods_total_price : Number
+	},{
+		table : "sp_order_goods"
+	});
+	return callback();
+}
--- a/models/OrderModel.js
+++ b/models/OrderModel.js
@ -0,0 +1,22 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("OrderModel",{
+		order_id : {type: 'serial', key: true},
+		user_id : Number,
+		order_number : String,
+		order_price : Number,
+		order_pay : [1,2,3],
+		is_send : ["是","否"],
+		trade_no : String,
+		order_fapiao_title : ["个人","公司"],
+		order_fapiao_company : String,
+		order_fapiao_content : String,
+		consignee_addr : String,
+		pay_status : ['0','1'],
+		create_time : Number,
+		update_time : Number
+	},{
+		table : "sp_order"
+	});
+	return callback();
+}
--- a/models/PermissionAPIModel.js
+++ b/models/PermissionAPIModel.js
@ -0,0 +1,14 @@
+module.exports = function(db,callback) {
+	// 用户模型
+	db.define("PermissionAPIModel",{
+		id : {type: 'serial', key: true},
+		ps_id : Number,
+		ps_api_service : String,
+		ps_api_action : String,
+		ps_api_order : Number
+
+	},{
+		table : "sp_permission_api"
+	});
+	return callback();
+}
--- a/models/PermissionModel.js
+++ b/models/PermissionModel.js
@ -0,0 +1,14 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("PermissionModel",{
+		ps_id : {type: 'serial', key: true},
+		ps_name : String,
+		ps_pid : Number,
+		ps_c : String,
+		ps_a : String,
+		ps_level : String
+	},{
+		table : "sp_permission"
+	});
+	return callback();
+}
--- a/models/ReportOneModel.js
+++ b/models/ReportOneModel.js
@ -0,0 +1,12 @@
+module.exports = function(db,callback){
+	// 报表模型1
+	db.define("ReportOneModel",{
+		id : {type: 'serial', key: true},
+		rp1_user_count : Number,
+		rp1_area : Number,
+		rp1_date : { type: "date", time: false }
+	},{
+		table : "sp_report_1"
+	});
+	return callback();
+}
--- a/models/ReportTwoModel.js
+++ b/models/ReportTwoModel.js
@ -0,0 +1,12 @@
+module.exports = function(db,callback){
+	// 报表模型1
+	db.define("ReportTwoModel",{
+		id : {type: 'serial', key: true},
+		rp2_page : String,
+		rp2_count : Number,
+		rp2_date : { type: "date", time: false }
+	},{
+		table : "sp_report_2"
+	});
+	return callback();
+}
--- a/models/RoleModel.js
+++ b/models/RoleModel.js
@ -0,0 +1,13 @@
+module.exports = function(db,callback){
+	// 用户模型
+	db.define("RoleModel",{
+		role_id : {type: 'serial', key: true},
+		role_name : String,
+		ps_ids : String,
+		ps_ca : String,
+		role_desc : String
+	},{
+		table : "sp_role"
+	});
+	return callback();
+}
--- a/modules/Logistics.js
+++ b/modules/Logistics.js
@ -0,0 +1,61 @@
+/*
+ * @Description: 
+ * @Version: 1.0
+ * @Autor: zhuyijun
+ * @Date: 2021-11-21 14:58:31
+ * @LastEditTime: 2022-02-11 14:32:42
+ */
+// 导入 request 模块
+const request = require('request')
+
+// 自动匹配运单号所属的物流公司
+function autoComNumber (orderno) {
+    const url = `https://www.kuaidi100.com/autonumber/autoComNum?resultv2=1&text=${orderno}`
+    return new Promise(function (resolve, reject) {
+        request(url, (err, response, body) => {
+            if (err) return reject({ status: 500, msg: err.message })
+            // resolve(body)
+            // console.log(body.num)
+            body = JSON.parse(body)
+            if (!body.auto || body.auto.length <= 0) return reject({ status: 501, msg: '无对应的物流公司' })
+            resolve({ status: 200, msg: body.auto[0], comCode: body.auto[0].comCode })
+        })
+    })
+}
+
+async function getLogisticsInfo (req, res) {
+    // const result = await autoComNumber(req.params.orderno)
+
+    // if (result.status !== 200) {
+    //     return {
+    //         meta: {
+    //             status: 500,
+    //             message: '获取物流信息失败！'
+    //         }
+    //     }
+    // }
+    const dataUrl = `https://www.kuaidi100.com/query?type=jd&postid=JD0062748025909`
+    // const dataUrl = `https://www.kuaidi100.com/query?type=${result.comCode}&postid=${req.params.orderno}`
+    request(dataUrl, (err, response, body) => {
+        if (err) {
+            return res.send({
+                meta: {
+                    status: 501,
+                    message: '获取物流信息失败！'
+                }
+            })
+        }
+        // 获取物流信息成功
+        return res.send({
+            meta: {
+                status: 200,
+                message: '获取物流信息成功！'
+            },
+            data: (JSON.parse(body)).data
+        })
+    })
+}
+
+module.exports = {
+    getLogisticsInfo
+}
--- a/modules/authorization.js
+++ b/modules/authorization.js
@ -0,0 +1,74 @@
+var path = require('path');
+// var roles_controller = require("../controllers/roles");
+
+var path = require("path");
+
+global.service_caches = {};
+
+// 存储全局验证函数
+global.service_auth_fn = null;
+
+/**
+ * 构造回调对象格式
+ * 
+ * @param {[type]} serviceName   服务名称
+ * @param {[type]} actionName    动作名称（方法名）
+ * @param {[type]} serviceModule 服务模块
+ * @param {[type]} origFunc      原始方法
+ */
+function Invocation(serviceName,actionName,serviceModule,origFunc) {
+	return function() {
+		var origArguments = arguments;
+		return function(req,res,next) {
+			if(global.service_auth_fn) {
+				global.service_auth_fn(req,res,next,serviceName,actionName,function(pass) {
+					if(pass) {
+						origFunc.apply(serviceModule,origArguments);
+					} else {
+						res.sendResult(null,401,"权限验证失败");
+					}
+				});
+			} else {
+				res.sendResult(null,401,"权限验证失败");
+			}
+		}
+	}
+}
+
+// 获取服务对象
+module.exports.getService = function(serviceName) {
+
+	if(global.service_caches[serviceName]) {
+		return global.service_caches[serviceName];
+	}
+
+	var servicePath = path.join(process.cwd(),"services",serviceName);
+	
+	var serviceModule = require(servicePath);
+	if(!serviceModule) {
+		console.log("模块没有被发现");
+		return null;
+	}
+	global.service_caches[serviceName] = {};
+
+	console.log("*****************************************");
+	console.log("拦截服务 => %s",serviceName);
+	console.log("*****************************************");
+	for(actionName in serviceModule) {
+
+		if(serviceModule && serviceModule[actionName] && typeof(serviceModule[actionName]) == "function") {
+			var origFunc = serviceModule[actionName];
+			global.service_caches[serviceName][actionName] = Invocation(serviceName,actionName,serviceModule,origFunc);
+			console.log("action => %s",actionName);
+		}
+	}
+	// console.log(global.service_caches);
+	console.log("*****************************************\n");
+	return global.service_caches[serviceName];
+}
+
+// 设置全局验证函数
+module.exports.setAuthFn = function(authFn) {
+	global.service_auth_fn = authFn;
+}
+
--- a/modules/database.js
+++ b/modules/database.js
@ -0,0 +1,77 @@
+require('mysql');
+var fs = require("fs");
+var orm = require("orm");
+var Promise = require("bluebird");
+var path = require("path");
+
+/*
+	app: 应用程序环境
+	config: 数据库配置
+	callback: 回调
+*/
+function initialize(app,callback) {
+
+	// 加载配置文件
+	var config = require('config').get("db_config");
+	
+	// 从配置中获取数据库配置
+	var opts = {
+		protocol : config.get("protocol"),
+		host : config.get("host"),
+		database : config.get("database"),
+		port : config.get("port"),
+		user : config.get("user"),
+		password : config.get("password"),
+		query : {pool: true,debug: true}
+	};
+
+	
+	console.log("数据库连接参数 %s",JSON.stringify(opts));
+
+	// 初始化ORM模型
+	app.use(orm.express(opts, {
+		define: function (db, models, next) {
+
+			app.db = db;
+			global.database = db;
+
+			// 获取映射文件路径
+			var modelsPath = path.join(process.cwd(),"/models");
+			
+			// 读取所有模型文件
+			fs.readdir(modelsPath,function(err, files) {
+				// 存放所有的加载模型函数
+				var loadModelAsynFns = new Array();
+				// console.log("开始加载 ORM 模型层文件 ");
+				for (var i = 0; i < files.length; i++) {
+					var modelPath = modelsPath + "/" +files[i];
+					// console.log("加载模型 %s",modelPath);
+					loadModelAsynFns[i] = db.loadAsync(modelPath);
+				}
+				
+				Promise.all(loadModelAsynFns)
+				.then(function(){
+					// console.log("ORM 模型加载完成");
+					// 挂载模型集合
+
+					for(var modelName in db.models){
+						models[modelName] = db.models[modelName];
+					}
+					app.models = models;
+					callback(null);
+					next();
+				})
+				.catch(function(error){
+					console.error('加载模块出错 error: ' + err);
+					callback(error);
+					next();
+				});
+			});
+		}
+	}));	
+}
+
+module.exports.initialize = initialize;
+module.exports.getDatabase = function() {
+	return  global.database;
+}
--- a/modules/logger.js
+++ b/modules/logger.js
@ -0,0 +1,20 @@
+var log4js = require('log4js');
+
+log4js.configure({
+  appenders: { cheese: { type: 'file', filename: 'cheese.log' } },
+  categories: { default: { appenders: ['cheese'], level: 'error' } }
+});
+
+exports.logger = function (level) {
+    var logger = log4js.getLogger("cheese");
+    logger.level = 'debug';
+    return logger;
+};
+
+// 配合 express 使用的方法
+// exports.use = function (app, level) {
+//     app.use(log4js.connectLogger(log4js.getLogger('logInfo'), {
+//         level: levels[level] || levels['debug'],
+//         format: ':method :url :status'
+//     }));
+// };
--- a/modules/passport.js
+++ b/modules/passport.js
@ -0,0 +1,86 @@
+const passport = require('passport');
+const LocalStrategy = require('passport-local').Strategy;
+const Strategy = require('passport-http-bearer').Strategy;
+
+var jwt = require("jsonwebtoken");
+
+var _ = require('lodash');
+
+var jwt_config = require("config").get("jwt_config");
+
+// 通过登录函数初始化
+/**
+ * 初始化 passport 框架
+ * 
+ * @param  {[type]}   app       全局应用程序
+ * @param  {[type]}   loginFunc 登录函数
+ * @param  {Function} callback  回调函数
+ */
+module.exports.setup = function(app,loginFunc,callback) {
+	// 用户名密码 登录策略
+	passport.use(new LocalStrategy(
+		function(username, password, done) {
+			if(!loginFunc) return done("登录验证函数未设置");
+
+			loginFunc(username,password,function(err,user) {
+				if(err) return done(err);
+				return done(null, user);
+			});
+		})
+	);
+
+	// token 验证策略
+	passport.use(new Strategy(
+		function(token, done) {
+			jwt.verify(token, jwt_config.get("secretKey"), function (err, decode) {
+				if (err) { return done("验证错误"); }
+				return done(null, decode);
+			});
+		}
+ 	));
+
+	// 初始化passport模块
+	app.use(passport.initialize());
+
+	if(callback) callback();
+};
+
+/**
+ * 登录验证逻辑
+ * 
+ * @param  {[type]}   req  请求
+ * @param  {[type]}   res  响应
+ * @param  {Function} next [description]
+ */
+module.exports.login = function(req,res,next) {
+
+	passport.authenticate('local', function(err, user, info) {
+		
+		if(err) return res.sendResult(null,400,err);
+		if(!user) return res.sendResult(null,400,"参数错误");
+
+		// 获取角色信息
+		var token = jwt.sign({"uid":user.id,"rid":user.rid}, jwt_config.get("secretKey"), {"expiresIn": jwt_config.get("expiresIn")});
+		user.token = "Bearer " + token;
+		return res.sendResult(user,200,'登录成功');
+	})(req, res, next);
+	
+}
+
+/**
+ * token验证函数
+ * 
+ * @param  {[type]}   req  请求对象
+ * @param  {[type]}   res  响应对象
+ * @param  {Function} next 传递事件函数
+ */
+module.exports.tokenAuth = function(req,res,next) {
+	passport.authenticate('bearer', { session: false },function(err,tokenData) {
+		if(err) return res.sendResult(null,400,'无效token');
+		if(!tokenData) return res.sendResult(null,400,'无效token');
+		req.userInfo = {};
+		req.userInfo.uid = tokenData["uid"];
+		req.userInfo.rid = tokenData["rid"];
+		next();
+	})(req, res, next);
+}
--- a/modules/resextra.js
+++ b/modules/resextra.js
@ -0,0 +1,17 @@
+// 添加统一的返回结果方法
+module.exports = function(req, res, next){
+	res.sendResult = function(data,code,message) {
+		var fmt = req.query.fmt ? req.query.fmt : "rest";
+		if(fmt == "rest") {
+			res.json(
+			{
+				"data" : data, 
+				"meta" : {
+					"msg" 		: message,
+					"status" 	: code
+				}
+			});
+		}
+	};
+	next();
+}
--- a/modules/ueditor.js
+++ b/modules/ueditor.js
@ -0,0 +1,67 @@
+var _ = require('lodash');
+var path = require("path");
+var Busboy = require('busboy');
+var fs = require("fs");
+var uniqid = require('uniqid');
+var ueditor_config = require(path.join(process.cwd(),"/config/ueditor.config.js"));
+var upload_config = require('config').get("upload_config");
+
+var filetype = 'jpg,png,gif,ico,bmp';
+module.exports = function(req,res,next) {
+
+	if(req.query.action == "config") {
+		// 吐给客户端配置信息 
+		res.jsonp(ueditor_config);
+	} else if (req.query.action === 'uploadimage' || req.query.action === 'uploadfile' || req.query.action === 'uploadvideo') {
+		var busboy = new Busboy({ headers: req.headers });
+		busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
+			var fileExtArray = filename.split(".");
+			var ext = fileExtArray[fileExtArray.length - 1];
+			var save_filename = uniqid() + "." + ext;
+			var savePath = path.join(process.cwd(),upload_config.get("upload_ueditor"),save_filename);
+			file.on('end', function () {
+				var result = {
+				'url': upload_config.get("baseURL")+"/" + upload_config.get("upload_ueditor") + "/" + save_filename,
+				'title': req.body && req.body.pictitle || filename,
+				'original': filename,
+				'state': 'SUCCESS'
+				};
+				if(req.query.encode) {
+					res.jsonp(result);
+				} else {
+
+					res.redirect(upload_config.get("simple_upload_redirect") + "?result=" + JSON.stringify(result));
+					// res.redirect(result.url);
+				}
+				
+			});
+
+			file.pipe(fs.createWriteStream(savePath));
+		});
+		req.pipe(busboy);
+	} else if(req.query.action === 'listimage') {
+		fs.readdir(path.join(process.cwd(),upload_config.get("upload_ueditor")),function(err, files){
+			if(err) return res.end();
+			var total = files.length;
+
+			var filelist = [];
+			var total = 0;
+			_(files).forEach(function(file){
+				var fileExtArray = file.split(".");
+				var ext = fileExtArray[fileExtArray.length - 1];
+				if (filetype.indexOf(ext.toLowerCase()) >= 0) {
+					var result_file = {};
+					result_file.url = upload_config.get("baseURL")+"/" + upload_config.get("upload_ueditor") + "/" + file;
+					filelist.push(result_file);
+					total ++;
+				}
+			});
+			res.jsonp({
+				"state": "SUCCESS",
+				"list": filelist,
+				"start": 1,
+				"total": total
+              });
+		})
+	}
+}
--- a/package.json
+++ b/package.json
@ -0,0 +1,41 @@
+{
+  "name": "shop",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start": "node ./bin/www"
+  },
+  "dependencies": {
+    "bluebird": "^3.5.1",
+    "body-parser": "~1.18.2",
+    "busboy": "^0.2.14",
+    "config": "^1.28.0",
+    "debug": "~2.6.9",
+    "express": "^4.16.2",
+    "gm": "^1.23.0",
+    "je": "^1.0.2",
+    "jsonwebtoken": "^7.1.9",
+    "lodash": "^4.17.4",
+    "log4js": "^2.4.1",
+    "morgan": "~1.9.0",
+    "mount-routes": "^1.0.8",
+    "multer": "^1.3.0",
+    "mysql": "^2.15.0",
+    "node-orm": "^2.1.15",
+    "node-php-password": "^0.1.2",
+    "orm": "^4.0.1",
+    "passport": "^0.4.0",
+    "passport-http-bearer": "^1.0.1",
+    "passport-local": "^1.0.0",
+    "serve-favicon": "~2.4.5",
+    "underscore": "^1.8.3",
+    "uniqid": "^4.1.1"
+  },
+  "devDependencies": {
+    "chai": "^4.1.2",
+    "chai-http": "^3.0.0",
+    "gulp": "^3.9.1",
+    "mocha": "^4.0.1",
+    "request": "^2.83.0"
+  }
+}
--- a/public/ueditor/dialogs/anchor/anchor.html
+++ b/public/ueditor/dialogs/anchor/anchor.html
@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title></title>
+        <style type="text/css">
+            *{color: #838383;margin: 0;padding: 0}
+            html,body {font-size: 12px;overflow: hidden; }
+            .content{padding:5px 0 0 15px;}
+            input{width:210px;height:21px;line-height:21px;margin-left: 4px;}
+        </style>
+    </head>
+    <body>
+        <div class="content">
+            <span><var id="lang_input_anchorName"></var></span><input id="anchorName"  value="" />
+        </div>
+        <script type="text/javascript" src="../internal.js"></script>
+        <script type="text/javascript">
+            var anchorInput = $G('anchorName'),
+                node = editor.selection.getRange().getClosedNode();
+            if(node && node.tagName == 'IMG' && (node = node.getAttribute('anchorname'))){
+                anchorInput.value = node;
+            }
+            anchorInput.onkeydown = function(evt){
+                evt = evt || window.event;
+                if(evt.keyCode == 13){
+                    editor.execCommand('anchor', anchorInput.value);
+                    dialog.close();
+                    domUtils.preventDefault(evt)
+                }
+            };
+            dialog.onok = function (){
+                editor.execCommand('anchor', anchorInput.value);
+                dialog.close();
+            };
+            $focus(anchorInput);
+        </script>
+    </body>
+</html>
--- a/public/ueditor/dialogs/attachment/attachment.css
+++ b/public/ueditor/dialogs/attachment/attachment.css
@ -0,0 +1,681 @@
+@charset "utf-8";
+/* dialog样式 */
+.wrapper {
+    zoom: 1;
+    width: 630px;
+    *width: 626px;
+    height: 380px;
+    margin: 0 auto;
+    padding: 10px;
+    position: relative;
+    font-family: sans-serif;
+}
+
+/*tab样式框大小*/
+.tabhead {
+    float:left;
+}
+.tabbody {
+    width: 100%;
+    height: 346px;
+    position: relative;
+    clear: both;
+}
+
+.tabbody .panel {
+    position: absolute;
+    width: 0;
+    height: 0;
+    background: #fff;
+    overflow: hidden;
+    display: none;
+}
+
+.tabbody .panel.focus {
+    width: 100%;
+    height: 346px;
+    display: block;
+}
+
+/* 上传附件 */
+.tabbody #upload.panel {
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+    background: #fff;
+    display: block;
+}
+
+.tabbody #upload.panel.focus {
+    width: 100%;
+    height: 346px;
+    display: block;
+    clip: auto;
+}
+
+#upload .queueList {
+    margin: 0;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    overflow: hidden;
+}
+
+#upload p {
+    margin: 0;
+}
+
+.element-invisible {
+    width: 0 !important;
+    height: 0 !important;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    overflow: hidden;
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+}
+
+#upload .placeholder {
+    margin: 10px;
+    border: 2px dashed #e6e6e6;
+    *border: 0px dashed #e6e6e6;
+    height: 172px;
+    padding-top: 150px;
+    text-align: center;
+    background: url(./images/image.png) center 70px no-repeat;
+    color: #cccccc;
+    font-size: 18px;
+    position: relative;
+    top:0;
+    *top: 10px;
+}
+
+#upload .placeholder .webuploader-pick {
+    font-size: 18px;
+    background: #00b7ee;
+    border-radius: 3px;
+    line-height: 44px;
+    padding: 0 30px;
+    *width: 120px;
+    color: #fff;
+    display: inline-block;
+    margin: 0 auto 20px auto;
+    cursor: pointer;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+#upload .placeholder .webuploader-pick-hover {
+    background: #00a2d4;
+}
+
+
+#filePickerContainer {
+    text-align: center;
+}
+
+#upload .placeholder .flashTip {
+    color: #666666;
+    font-size: 12px;
+    position: absolute;
+    width: 100%;
+    text-align: center;
+    bottom: 20px;
+}
+
+#upload .placeholder .flashTip a {
+    color: #0785d1;
+    text-decoration: none;
+}
+
+#upload .placeholder .flashTip a:hover {
+    text-decoration: underline;
+}
+
+#upload .placeholder.webuploader-dnd-over {
+    border-color: #999999;
+}
+
+#upload .filelist {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+    position: relative;
+    height: 300px;
+}
+
+#upload .filelist:after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    clear: both;
+}
+
+#upload .filelist li {
+    width: 113px;
+    height: 113px;
+    background: url(./images/bg.png);
+    text-align: center;
+    margin: 9px 0 0 9px;
+    *margin: 6px 0 0 6px;
+    position: relative;
+    display: block;
+    float: left;
+    overflow: hidden;
+    font-size: 12px;
+}
+
+#upload .filelist li p.log {
+    position: relative;
+    top: -45px;
+}
+
+#upload .filelist li p.title {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    top: 5px;
+    text-indent: 5px;
+    text-align: left;
+}
+
+#upload .filelist li p.progress {
+    position: absolute;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    height: 8px;
+    overflow: hidden;
+    z-index: 50;
+    margin: 0;
+    border-radius: 0;
+    background: none;
+    -webkit-box-shadow: 0 0 0;
+}
+
+#upload .filelist li p.progress span {
+    display: none;
+    overflow: hidden;
+    width: 0;
+    height: 100%;
+    background: #1483d8 url(./images/progress.png) repeat-x;
+
+    -webit-transition: width 200ms linear;
+    -moz-transition: width 200ms linear;
+    -o-transition: width 200ms linear;
+    -ms-transition: width 200ms linear;
+    transition: width 200ms linear;
+
+    -webkit-animation: progressmove 2s linear infinite;
+    -moz-animation: progressmove 2s linear infinite;
+    -o-animation: progressmove 2s linear infinite;
+    -ms-animation: progressmove 2s linear infinite;
+    animation: progressmove 2s linear infinite;
+
+    -webkit-transform: translateZ(0);
+}
+
+@-webkit-keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+@-moz-keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+@keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+#upload .filelist li p.imgWrap {
+    position: relative;
+    z-index: 2;
+    line-height: 113px;
+    vertical-align: middle;
+    overflow: hidden;
+    width: 113px;
+    height: 113px;
+
+    -webkit-transform-origin: 50% 50%;
+    -moz-transform-origin: 50% 50%;
+    -o-transform-origin: 50% 50%;
+    -ms-transform-origin: 50% 50%;
+    transform-origin: 50% 50%;
+
+    -webit-transition: 200ms ease-out;
+    -moz-transition: 200ms ease-out;
+    -o-transition: 200ms ease-out;
+    -ms-transition: 200ms ease-out;
+    transition: 200ms ease-out;
+}
+#upload .filelist li p.imgWrap.notimage {
+    margin-top: 0;
+    width: 111px;
+    height: 111px;
+    border: 1px #eeeeee solid;
+}
+#upload .filelist li p.imgWrap.notimage i.file-preview {
+    margin-top: 15px;
+}
+
+#upload .filelist li img {
+    width: 100%;
+}
+
+#upload .filelist li p.error {
+    background: #f43838;
+    color: #fff;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 28px;
+    line-height: 28px;
+    width: 100%;
+    z-index: 100;
+    display:none;
+}
+
+#upload .filelist li .success {
+    display: block;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    height: 40px;
+    width: 100%;
+    z-index: 200;
+    background: url(./images/success.png) no-repeat right bottom;
+    background-image: url(./images/success.gif) \9;
+}
+
+#upload .filelist li.filePickerBlock {
+    width: 113px;
+    height: 113px;
+    background: url(./images/image.png) no-repeat center 12px;
+    border: 1px solid #eeeeee;
+    border-radius: 0;
+}
+#upload .filelist li.filePickerBlock div.webuploader-pick  {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    opacity: 0;
+    background: none;
+    font-size: 0;
+}
+
+#upload .filelist div.file-panel {
+    position: absolute;
+    height: 0;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#80000000', endColorstr='#80000000') \0;
+    background: rgba(0, 0, 0, 0.5);
+    width: 100%;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    z-index: 300;
+}
+
+#upload .filelist div.file-panel span {
+    width: 24px;
+    height: 24px;
+    display: inline;
+    float: right;
+    text-indent: -9999px;
+    overflow: hidden;
+    background: url(./images/icons.png) no-repeat;
+    background: url(./images/icons.gif) no-repeat \9;
+    margin: 5px 1px 1px;
+    cursor: pointer;
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+#upload .filelist div.file-panel span.rotateLeft {
+    display:none;
+    background-position: 0 -24px;
+}
+
+#upload .filelist div.file-panel span.rotateLeft:hover {
+    background-position: 0 0;
+}
+
+#upload .filelist div.file-panel span.rotateRight {
+    display:none;
+    background-position: -24px -24px;
+}
+
+#upload .filelist div.file-panel span.rotateRight:hover {
+    background-position: -24px 0;
+}
+
+#upload .filelist div.file-panel span.cancel {
+    background-position: -48px -24px;
+}
+
+#upload .filelist div.file-panel span.cancel:hover {
+    background-position: -48px 0;
+}
+
+#upload .statusBar {
+    height: 45px;
+    border-bottom: 1px solid #dadada;
+    margin: 0 10px;
+    padding: 0;
+    line-height: 45px;
+    vertical-align: middle;
+    position: relative;
+}
+
+#upload .statusBar .progress {
+    border: 1px solid #1483d8;
+    width: 198px;
+    background: #fff;
+    height: 18px;
+    position: absolute;
+    top: 12px;
+    display: none;
+    text-align: center;
+    line-height: 18px;
+    color: #6dbfff;
+    margin: 0 10px 0 0;
+}
+#upload .statusBar .progress span.percentage {
+    width: 0;
+    height: 100%;
+    left: 0;
+    top: 0;
+    background: #1483d8;
+    position: absolute;
+}
+#upload .statusBar .progress span.text {
+    position: relative;
+    z-index: 10;
+}
+
+#upload .statusBar .info {
+    display: inline-block;
+    font-size: 14px;
+    color: #666666;
+}
+
+#upload .statusBar .btns {
+    position: absolute;
+    top: 7px;
+    right: 0;
+    line-height: 30px;
+}
+
+#filePickerBtn {
+    display: inline-block;
+    float: left;
+}
+#upload .statusBar .btns .webuploader-pick,
+#upload .statusBar .btns .uploadBtn,
+#upload .statusBar .btns .uploadBtn.state-uploading,
+#upload .statusBar .btns .uploadBtn.state-paused {
+    background: #ffffff;
+    border: 1px solid #cfcfcf;
+    color: #565656;
+    padding: 0 18px;
+    display: inline-block;
+    border-radius: 3px;
+    margin-left: 10px;
+    cursor: pointer;
+    font-size: 14px;
+    float: left;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+#upload .statusBar .btns .webuploader-pick-hover,
+#upload .statusBar .btns .uploadBtn:hover,
+#upload .statusBar .btns .uploadBtn.state-uploading:hover,
+#upload .statusBar .btns .uploadBtn.state-paused:hover {
+    background: #f0f0f0;
+}
+
+#upload .statusBar .btns .uploadBtn,
+#upload .statusBar .btns .uploadBtn.state-paused{
+    background: #00b7ee;
+    color: #fff;
+    border-color: transparent;
+}
+#upload .statusBar .btns .uploadBtn:hover,
+#upload .statusBar .btns .uploadBtn.state-paused:hover{
+    background: #00a2d4;
+}
+
+#upload .statusBar .btns .uploadBtn.disabled {
+    pointer-events: none;
+    filter:alpha(opacity=60);
+    -moz-opacity:0.6;
+    -khtml-opacity: 0.6;
+    opacity: 0.6;
+}
+
+
+
+/* 图片管理样式 */
+#online {
+    width: 100%;
+    height: 336px;
+    padding: 10px 0 0 0;
+}
+#online #fileList{
+    width: 100%;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    position: relative;
+}
+#online ul {
+    display: block;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#online li {
+    float: left;
+    display: block;
+    list-style: none;
+    padding: 0;
+    width: 113px;
+    height: 113px;
+    margin: 0 0 9px 9px;
+    *margin: 0 0 6px 6px;
+    background-color: #eee;
+    overflow: hidden;
+    cursor: pointer;
+    position: relative;
+}
+#online li.clearFloat {
+    float: none;
+    clear: both;
+    display: block;
+    width:0;
+    height:0;
+    margin: 0;
+    padding: 0;
+}
+#online li img {
+    cursor: pointer;
+}
+#online li div.file-wrapper {
+    cursor: pointer;
+    position: absolute;
+    display: block;
+    width: 111px;
+    height: 111px;
+    border: 1px solid #eee;
+    background: url("./images/bg.png") repeat;
+}
+#online li div span.file-title{
+    display: block;
+    padding: 0 3px;
+    margin: 3px 0 0 0;
+    font-size: 12px;
+    height: 15px;
+    color: #555555;
+    text-align: center;
+    width: 107px;
+    white-space: nowrap;
+    word-break: break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+#online li .icon {
+    cursor: pointer;
+    width: 113px;
+    height: 113px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    border: 0;
+    background-repeat: no-repeat;
+}
+#online li .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+}
+#online li.selected .icon {
+    background-image: url(images/success.png);
+    background-image: url(images/success.gif) \9;
+    background-position: 75px 75px;
+}
+#online li.selected .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+    background-position: 72px 72px;
+}
+
+
+/* 在线文件的文件预览图标 */
+i.file-preview {
+    display: block;
+    margin: 10px auto;
+    width: 70px;
+    height: 70px;
+    background-image: url("./images/file-icons.png");
+    background-image: url("./images/file-icons.gif") \9;
+    background-position: -140px center;
+    background-repeat: no-repeat;
+}
+i.file-preview.file-type-dir{
+    background-position: 0 center;
+}
+i.file-preview.file-type-file{
+    background-position: -140px center;
+}
+i.file-preview.file-type-filelist{
+    background-position: -210px center;
+}
+i.file-preview.file-type-zip,
+i.file-preview.file-type-rar,
+i.file-preview.file-type-7z,
+i.file-preview.file-type-tar,
+i.file-preview.file-type-gz,
+i.file-preview.file-type-bz2{
+    background-position: -280px center;
+}
+i.file-preview.file-type-xls,
+i.file-preview.file-type-xlsx{
+    background-position: -350px center;
+}
+i.file-preview.file-type-doc,
+i.file-preview.file-type-docx{
+    background-position: -420px center;
+}
+i.file-preview.file-type-ppt,
+i.file-preview.file-type-pptx{
+    background-position: -490px center;
+}
+i.file-preview.file-type-vsd{
+    background-position: -560px center;
+}
+i.file-preview.file-type-pdf{
+    background-position: -630px center;
+}
+i.file-preview.file-type-txt,
+i.file-preview.file-type-md,
+i.file-preview.file-type-json,
+i.file-preview.file-type-htm,
+i.file-preview.file-type-xml,
+i.file-preview.file-type-html,
+i.file-preview.file-type-js,
+i.file-preview.file-type-css,
+i.file-preview.file-type-php,
+i.file-preview.file-type-jsp,
+i.file-preview.file-type-asp{
+    background-position: -700px center;
+}
+i.file-preview.file-type-apk{
+    background-position: -770px center;
+}
+i.file-preview.file-type-exe{
+    background-position: -840px center;
+}
+i.file-preview.file-type-ipa{
+    background-position: -910px center;
+}
+i.file-preview.file-type-mp4,
+i.file-preview.file-type-swf,
+i.file-preview.file-type-mkv,
+i.file-preview.file-type-avi,
+i.file-preview.file-type-flv,
+i.file-preview.file-type-mov,
+i.file-preview.file-type-mpg,
+i.file-preview.file-type-mpeg,
+i.file-preview.file-type-ogv,
+i.file-preview.file-type-webm,
+i.file-preview.file-type-rm,
+i.file-preview.file-type-rmvb{
+    background-position: -980px center;
+}
+i.file-preview.file-type-ogg,
+i.file-preview.file-type-wav,
+i.file-preview.file-type-wmv,
+i.file-preview.file-type-mid,
+i.file-preview.file-type-mp3{
+    background-position: -1050px center;
+}
+i.file-preview.file-type-jpg,
+i.file-preview.file-type-jpeg,
+i.file-preview.file-type-gif,
+i.file-preview.file-type-bmp,
+i.file-preview.file-type-png,
+i.file-preview.file-type-psd{
+    background-position: -140px center;
+}
--- a/public/ueditor/dialogs/attachment/attachment.html
+++ b/public/ueditor/dialogs/attachment/attachment.html
@ -0,0 +1,60 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>ueditor图片对话框</title>
+    <script type="text/javascript" src="../internal.js"></script>
+
+    <!-- jquery -->
+    <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
+
+    <!-- webuploader -->
+    <script src="../../third-party/webuploader/webuploader.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css">
+
+    <!-- attachment dialog -->
+    <link rel="stylesheet" href="attachment.css" type="text/css" />
+</head>
+<body>
+
+    <div class="wrapper">
+        <div id="tabhead" class="tabhead">
+            <span class="tab focus" data-content-id="upload"><var id="lang_tab_upload"></var></span>
+            <span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>
+        </div>
+        <div id="tabbody" class="tabbody">
+            <!-- 上传图片 -->
+            <div id="upload" class="panel focus">
+                <div id="queueList" class="queueList">
+                    <div class="statusBar element-invisible">
+                        <div class="progress">
+                            <span class="text">0%</span>
+                            <span class="percentage"></span>
+                        </div><div class="info"></div>
+                        <div class="btns">
+                            <div id="filePickerBtn"></div>
+                            <div class="uploadBtn"><var id="lang_start_upload"></var></div>
+                        </div>
+                    </div>
+                    <div id="dndArea" class="placeholder">
+                        <div class="filePickerContainer">
+                            <div id="filePickerReady"></div>
+                        </div>
+                    </div>
+                    <ul class="filelist element-invisible">
+                        <li id="filePickerBlock" class="filePickerBlock"></li>
+                    </ul>
+                </div>
+            </div>
+
+            <!-- 在线图片 -->
+            <div id="online" class="panel">
+                <div id="fileList"><var id="lang_imgLoading"></var></div>
+            </div>
+
+        </div>
+    </div>
+    <script type="text/javascript" src="attachment.js"></script>
+
+</body>
+</html>
--- a/public/ueditor/dialogs/attachment/attachment.js
+++ b/public/ueditor/dialogs/attachment/attachment.js
@ -0,0 +1,760 @@
+/**
+ * User: Jinqn
+ * Date: 14-04-08
+ * Time: 下午16:34
+ * 上传图片对话框逻辑代码,包括tab: 远程图片/上传图片/在线图片/搜索图片
+ */
+
+(function () {
+
+    var uploadFile,
+        onlineFile;
+
+    window.onload = function () {
+        initTabs();
+        initButtons();
+    };
+
+    /* 初始化tab标签 */
+    function initTabs() {
+        var tabs = $G('tabhead').children;
+        for (var i = 0; i < tabs.length; i++) {
+            domUtils.on(tabs[i], "click", function (e) {
+                var target = e.target || e.srcElement;
+                setTabFocus(target.getAttribute('data-content-id'));
+            });
+        }
+
+        setTabFocus('upload');
+    }
+
+    /* 初始化tabbody */
+    function setTabFocus(id) {
+        if(!id) return;
+        var i, bodyId, tabs = $G('tabhead').children;
+        for (i = 0; i < tabs.length; i++) {
+            bodyId = tabs[i].getAttribute('data-content-id')
+            if (bodyId == id) {
+                domUtils.addClass(tabs[i], 'focus');
+                domUtils.addClass($G(bodyId), 'focus');
+            } else {
+                domUtils.removeClasses(tabs[i], 'focus');
+                domUtils.removeClasses($G(bodyId), 'focus');
+            }
+        }
+        switch (id) {
+            case 'upload':
+                uploadFile = uploadFile || new UploadFile('queueList');
+                break;
+            case 'online':
+                onlineFile = onlineFile || new OnlineFile('fileList');
+                break;
+        }
+    }
+
+    /* 初始化onok事件 */
+    function initButtons() {
+
+        dialog.onok = function () {
+            var list = [], id, tabs = $G('tabhead').children;
+            for (var i = 0; i < tabs.length; i++) {
+                if (domUtils.hasClass(tabs[i], 'focus')) {
+                    id = tabs[i].getAttribute('data-content-id');
+                    break;
+                }
+            }
+
+            switch (id) {
+                case 'upload':
+                    list = uploadFile.getInsertList();
+                    var count = uploadFile.getQueueCount();
+                    if (count) {
+                        $('.info', '#queueList').html('<span style="color:red;">' + '还有2个未上传文件'.replace(/[\d]/, count) + '</span>');
+                        return false;
+                    }
+                    break;
+                case 'online':
+                    list = onlineFile.getInsertList();
+                    break;
+            }
+
+            editor.execCommand('insertfile', list);
+        };
+    }
+
+
+    /* 上传附件 */
+    function UploadFile(target) {
+        this.$wrap = target.constructor == String ? $('#' + target) : $(target);
+        this.init();
+    }
+    UploadFile.prototype = {
+        init: function () {
+            this.fileList = [];
+            this.initContainer();
+            this.initUploader();
+        },
+        initContainer: function () {
+            this.$queue = this.$wrap.find('.filelist');
+        },
+        /* 初始化容器 */
+        initUploader: function () {
+            var _this = this,
+                $ = jQuery,    // just in case. Make sure it's not an other libaray.
+                $wrap = _this.$wrap,
+            // 图片容器
+                $queue = $wrap.find('.filelist'),
+            // 状态栏，包括进度和控制按钮
+                $statusBar = $wrap.find('.statusBar'),
+            // 文件总体选择信息。
+                $info = $statusBar.find('.info'),
+            // 上传按钮
+                $upload = $wrap.find('.uploadBtn'),
+            // 上传按钮
+                $filePickerBtn = $wrap.find('.filePickerBtn'),
+            // 上传按钮
+                $filePickerBlock = $wrap.find('.filePickerBlock'),
+            // 没选择文件之前的内容。
+                $placeHolder = $wrap.find('.placeholder'),
+            // 总体进度条
+                $progress = $statusBar.find('.progress').hide(),
+            // 添加的文件数量
+                fileCount = 0,
+            // 添加的文件总大小
+                fileSize = 0,
+            // 优化retina, 在retina下这个值是2
+                ratio = window.devicePixelRatio || 1,
+            // 缩略图大小
+                thumbnailWidth = 113 * ratio,
+                thumbnailHeight = 113 * ratio,
+            // 可能有pedding, ready, uploading, confirm, done.
+                state = '',
+            // 所有文件的进度信息，key为file id
+                percentages = {},
+                supportTransition = (function () {
+                    var s = document.createElement('p').style,
+                        r = 'transition' in s ||
+                            'WebkitTransition' in s ||
+                            'MozTransition' in s ||
+                            'msTransition' in s ||
+                            'OTransition' in s;
+                    s = null;
+                    return r;
+                })(),
+            // WebUploader实例
+                uploader,
+                actionUrl = editor.getActionUrl(editor.getOpt('fileActionName')),
+                fileMaxSize = editor.getOpt('fileMaxSize'),
+                acceptExtensions = (editor.getOpt('fileAllowFiles') || []).join('').replace(/\./g, ',').replace(/^[,]/, '');;
+
+            if (!WebUploader.Uploader.support()) {
+                $('#filePickerReady').after($('<div>').html(lang.errorNotSupport)).hide();
+                return;
+            } else if (!editor.getOpt('fileActionName')) {
+                $('#filePickerReady').after($('<div>').html(lang.errorLoadConfig)).hide();
+                return;
+            }
+
+            uploader = _this.uploader = WebUploader.create({
+                pick: {
+                    id: '#filePickerReady',
+                    label: lang.uploadSelectFile
+                },
+                swf: '../../third-party/webuploader/Uploader.swf',
+                server: actionUrl,
+                fileVal: editor.getOpt('fileFieldName'),
+                duplicate: true,
+                fileSingleSizeLimit: fileMaxSize,
+                compress: false
+            });
+            uploader.addButton({
+                id: '#filePickerBlock'
+            });
+            uploader.addButton({
+                id: '#filePickerBtn',
+                label: lang.uploadAddFile
+            });
+
+            setState('pedding');
+
+            // 当有文件添加进来时执行，负责view的创建
+            function addFile(file) {
+                var $li = $('<li id="' + file.id + '">' +
+                        '<p class="title">' + file.name + '</p>' +
+                        '<p class="imgWrap"></p>' +
+                        '<p class="progress"><span></span></p>' +
+                        '</li>'),
+
+                    $btns = $('<div class="file-panel">' +
+                        '<span class="cancel">' + lang.uploadDelete + '</span>' +
+                        '<span class="rotateRight">' + lang.uploadTurnRight + '</span>' +
+                        '<span class="rotateLeft">' + lang.uploadTurnLeft + '</span></div>').appendTo($li),
+                    $prgress = $li.find('p.progress span'),
+                    $wrap = $li.find('p.imgWrap'),
+                    $info = $('<p class="error"></p>').hide().appendTo($li),
+
+                    showError = function (code) {
+                        switch (code) {
+                            case 'exceed_size':
+                                text = lang.errorExceedSize;
+                                break;
+                            case 'interrupt':
+                                text = lang.errorInterrupt;
+                                break;
+                            case 'http':
+                                text = lang.errorHttp;
+                                break;
+                            case 'not_allow_type':
+                                text = lang.errorFileType;
+                                break;
+                            default:
+                                text = lang.errorUploadRetry;
+                                break;
+                        }
+                        $info.text(text).show();
+                    };
+
+                if (file.getStatus() === 'invalid') {
+                    showError(file.statusText);
+                } else {
+                    $wrap.text(lang.uploadPreview);
+                    if ('|png|jpg|jpeg|bmp|gif|'.indexOf('|'+file.ext.toLowerCase()+'|') == -1) {
+                        $wrap.empty().addClass('notimage').append('<i class="file-preview file-type-' + file.ext.toLowerCase() + '"></i>' +
+                        '<span class="file-title" title="' + file.name + '">' + file.name + '</span>');
+                    } else {
+                        if (browser.ie && browser.version <= 7) {
+                            $wrap.text(lang.uploadNoPreview);
+                        } else {
+                            uploader.makeThumb(file, function (error, src) {
+                                if (error || !src) {
+                                    $wrap.text(lang.uploadNoPreview);
+                                } else {
+                                    var $img = $('<img src="' + src + '">');
+                                    $wrap.empty().append($img);
+                                    $img.on('error', function () {
+                                        $wrap.text(lang.uploadNoPreview);
+                                    });
+                                }
+                            }, thumbnailWidth, thumbnailHeight);
+                        }
+                    }
+                    percentages[ file.id ] = [ file.size, 0 ];
+                    file.rotation = 0;
+
+                    /* 检查文件格式 */
+                    if (!file.ext || acceptExtensions.indexOf(file.ext.toLowerCase()) == -1) {
+                        showError('not_allow_type');
+                        uploader.removeFile(file);
+                    }
+                }
+
+                file.on('statuschange', function (cur, prev) {
+                    if (prev === 'progress') {
+                        $prgress.hide().width(0);
+                    } else if (prev === 'queued') {
+                        $li.off('mouseenter mouseleave');
+                        $btns.remove();
+                    }
+                    // 成功
+                    if (cur === 'error' || cur === 'invalid') {
+                        showError(file.statusText);
+                        percentages[ file.id ][ 1 ] = 1;
+                    } else if (cur === 'interrupt') {
+                        showError('interrupt');
+                    } else if (cur === 'queued') {
+                        percentages[ file.id ][ 1 ] = 0;
+                    } else if (cur === 'progress') {
+                        $info.hide();
+                        $prgress.css('display', 'block');
+                    } else if (cur === 'complete') {
+                    }
+
+                    $li.removeClass('state-' + prev).addClass('state-' + cur);
+                });
+
+                $li.on('mouseenter', function () {
+                    $btns.stop().animate({height: 30});
+                });
+                $li.on('mouseleave', function () {
+                    $btns.stop().animate({height: 0});
+                });
+
+                $btns.on('click', 'span', function () {
+                    var index = $(this).index(),
+                        deg;
+
+                    switch (index) {
+                        case 0:
+                            uploader.removeFile(file);
+                            return;
+                        case 1:
+                            file.rotation += 90;
+                            break;
+                        case 2:
+                            file.rotation -= 90;
+                            break;
+                    }
+
+                    if (supportTransition) {
+                        deg = 'rotate(' + file.rotation + 'deg)';
+                        $wrap.css({
+                            '-webkit-transform': deg,
+                            '-mos-transform': deg,
+                            '-o-transform': deg,
+                            'transform': deg
+                        });
+                    } else {
+                        $wrap.css('filter', 'progid:DXImageTransform.Microsoft.BasicImage(rotation=' + (~~((file.rotation / 90) % 4 + 4) % 4) + ')');
+                    }
+
+                });
+
+                $li.insertBefore($filePickerBlock);
+            }
+
+            // 负责view的销毁
+            function removeFile(file) {
+                var $li = $('#' + file.id);
+                delete percentages[ file.id ];
+                updateTotalProgress();
+                $li.off().find('.file-panel').off().end().remove();
+            }
+
+            function updateTotalProgress() {
+                var loaded = 0,
+                    total = 0,
+                    spans = $progress.children(),
+                    percent;
+
+                $.each(percentages, function (k, v) {
+                    total += v[ 0 ];
+                    loaded += v[ 0 ] * v[ 1 ];
+                });
+
+                percent = total ? loaded / total : 0;
+
+                spans.eq(0).text(Math.round(percent * 100) + '%');
+                spans.eq(1).css('width', Math.round(percent * 100) + '%');
+                updateStatus();
+            }
+
+            function setState(val, files) {
+
+                if (val != state) {
+
+                    var stats = uploader.getStats();
+
+                    $upload.removeClass('state-' + state);
+                    $upload.addClass('state-' + val);
+
+                    switch (val) {
+
+                        /* 未选择文件 */
+                        case 'pedding':
+                            $queue.addClass('element-invisible');
+                            $statusBar.addClass('element-invisible');
+                            $placeHolder.removeClass('element-invisible');
+                            $progress.hide(); $info.hide();
+                            uploader.refresh();
+                            break;
+
+                        /* 可以开始上传 */
+                        case 'ready':
+                            $placeHolder.addClass('element-invisible');
+                            $queue.removeClass('element-invisible');
+                            $statusBar.removeClass('element-invisible');
+                            $progress.hide(); $info.show();
+                            $upload.text(lang.uploadStart);
+                            uploader.refresh();
+                            break;
+
+                        /* 上传中 */
+                        case 'uploading':
+                            $progress.show(); $info.hide();
+                            $upload.text(lang.uploadPause);
+                            break;
+
+                        /* 暂停上传 */
+                        case 'paused':
+                            $progress.show(); $info.hide();
+                            $upload.text(lang.uploadContinue);
+                            break;
+
+                        case 'confirm':
+                            $progress.show(); $info.hide();
+                            $upload.text(lang.uploadStart);
+
+                            stats = uploader.getStats();
+                            if (stats.successNum && !stats.uploadFailNum) {
+                                setState('finish');
+                                return;
+                            }
+                            break;
+
+                        case 'finish':
+                            $progress.hide(); $info.show();
+                            if (stats.uploadFailNum) {
+                                $upload.text(lang.uploadRetry);
+                            } else {
+                                $upload.text(lang.uploadStart);
+                            }
+                            break;
+                    }
+
+                    state = val;
+                    updateStatus();
+
+                }
+
+                if (!_this.getQueueCount()) {
+                    $upload.addClass('disabled')
+                } else {
+                    $upload.removeClass('disabled')
+                }
+
+            }
+
+            function updateStatus() {
+                var text = '', stats;
+
+                if (state === 'ready') {
+                    text = lang.updateStatusReady.replace('_', fileCount).replace('_KB', WebUploader.formatSize(fileSize));
+                } else if (state === 'confirm') {
+                    stats = uploader.getStats();
+                    if (stats.uploadFailNum) {
+                        text = lang.updateStatusConfirm.replace('_', stats.successNum).replace('_', stats.successNum);
+                    }
+                } else {
+                    stats = uploader.getStats();
+                    text = lang.updateStatusFinish.replace('_', fileCount).
+                        replace('_KB', WebUploader.formatSize(fileSize)).
+                        replace('_', stats.successNum);
+
+                    if (stats.uploadFailNum) {
+                        text += lang.updateStatusError.replace('_', stats.uploadFailNum);
+                    }
+                }
+
+                $info.html(text);
+            }
+
+            uploader.on('fileQueued', function (file) {
+                if (file.ext && acceptExtensions.indexOf(file.ext.toLowerCase()) != -1 && file.size <= fileMaxSize) {
+                    fileCount++;
+                    fileSize += file.size;
+                }
+
+                if (fileCount === 1) {
+                    $placeHolder.addClass('element-invisible');
+                    $statusBar.show();
+                }
+
+                addFile(file);
+            });
+
+            uploader.on('fileDequeued', function (file) {
+                if (file.ext && acceptExtensions.indexOf(file.ext.toLowerCase()) != -1 && file.size <= fileMaxSize) {
+                    fileCount--;
+                    fileSize -= file.size;
+                }
+
+                removeFile(file);
+                updateTotalProgress();
+            });
+
+            uploader.on('filesQueued', function (file) {
+                if (!uploader.isInProgress() && (state == 'pedding' || state == 'finish' || state == 'confirm' || state == 'ready')) {
+                    setState('ready');
+                }
+                updateTotalProgress();
+            });
+
+            uploader.on('all', function (type, files) {
+                switch (type) {
+                    case 'uploadFinished':
+                        setState('confirm', files);
+                        break;
+                    case 'startUpload':
+                        /* 添加额外的GET参数 */
+                        var params = utils.serializeParam(editor.queryCommandValue('serverparam')) || '',
+                            url = utils.formatUrl(actionUrl + (actionUrl.indexOf('?') == -1 ? '?':'&') + 'encode=utf-8&' + params);
+                        uploader.option('server', url);
+                        setState('uploading', files);
+                        break;
+                    case 'stopUpload':
+                        setState('paused', files);
+                        break;
+                }
+            });
+
+            uploader.on('uploadBeforeSend', function (file, data, header) {
+                //这里可以通过data对象添加POST参数
+                if (actionUrl.toLowerCase().indexOf('jsp') != -1) {
+                    header['X_Requested_With'] = 'XMLHttpRequest';
+                }
+            });
+
+            uploader.on('uploadProgress', function (file, percentage) {
+                var $li = $('#' + file.id),
+                    $percent = $li.find('.progress span');
+
+                $percent.css('width', percentage * 100 + '%');
+                percentages[ file.id ][ 1 ] = percentage;
+                updateTotalProgress();
+            });
+
+            uploader.on('uploadSuccess', function (file, ret) {
+                var $file = $('#' + file.id);
+                try {
+                    var responseText = (ret._raw || ret),
+                        json = utils.str2json(responseText);
+                    if (json.state == 'SUCCESS') {
+                        _this.fileList.push(json);
+                        $file.append('<span class="success"></span>');
+                    } else {
+                        $file.find('.error').text(json.state).show();
+                    }
+                } catch (e) {
+                    $file.find('.error').text(lang.errorServerUpload).show();
+                }
+            });
+
+            uploader.on('uploadError', function (file, code) {
+            });
+            uploader.on('error', function (code, file) {
+                if (code == 'Q_TYPE_DENIED' || code == 'F_EXCEED_SIZE') {
+                    addFile(file);
+                }
+            });
+            uploader.on('uploadComplete', function (file, ret) {
+            });
+
+            $upload.on('click', function () {
+                if ($(this).hasClass('disabled')) {
+                    return false;
+                }
+
+                if (state === 'ready') {
+                    uploader.upload();
+                } else if (state === 'paused') {
+                    uploader.upload();
+                } else if (state === 'uploading') {
+                    uploader.stop();
+                }
+            });
+
+            $upload.addClass('state-' + state);
+            updateTotalProgress();
+        },
+        getQueueCount: function () {
+            var file, i, status, readyFile = 0, files = this.uploader.getFiles();
+            for (i = 0; file = files[i++]; ) {
+                status = file.getStatus();
+                if (status == 'queued' || status == 'uploading' || status == 'progress') readyFile++;
+            }
+            return readyFile;
+        },
+        getInsertList: function () {
+            var i, link, data, list = [],
+                prefix = editor.getOpt('fileUrlPrefix');
+            for (i = 0; i < this.fileList.length; i++) {
+                data = this.fileList[i];
+                link = data.url;
+                list.push({
+                    title: data.original || link.substr(link.lastIndexOf('/') + 1),
+                    url: prefix + link
+                });
+            }
+            return list;
+        }
+    };
+
+
+    /* 在线附件 */
+    function OnlineFile(target) {
+        this.container = utils.isString(target) ? document.getElementById(target) : target;
+        this.init();
+    }
+    OnlineFile.prototype = {
+        init: function () {
+            this.initContainer();
+            this.initEvents();
+            this.initData();
+        },
+        /* 初始化容器 */
+        initContainer: function () {
+            this.container.innerHTML = '';
+            this.list = document.createElement('ul');
+            this.clearFloat = document.createElement('li');
+
+            domUtils.addClass(this.list, 'list');
+            domUtils.addClass(this.clearFloat, 'clearFloat');
+
+            this.list.appendChild(this.clearFloat);
+            this.container.appendChild(this.list);
+        },
+        /* 初始化滚动事件,滚动到地步自动拉取数据 */
+        initEvents: function () {
+            var _this = this;
+
+            /* 滚动拉取图片 */
+            domUtils.on($G('fileList'), 'scroll', function(e){
+                var panel = this;
+                if (panel.scrollHeight - (panel.offsetHeight + panel.scrollTop) < 10) {
+                    _this.getFileData();
+                }
+            });
+            /* 选中图片 */
+            domUtils.on(this.list, 'click', function (e) {
+                var target = e.target || e.srcElement,
+                    li = target.parentNode;
+
+                if (li.tagName.toLowerCase() == 'li') {
+                    if (domUtils.hasClass(li, 'selected')) {
+                        domUtils.removeClasses(li, 'selected');
+                    } else {
+                        domUtils.addClass(li, 'selected');
+                    }
+                }
+            });
+        },
+        /* 初始化第一次的数据 */
+        initData: function () {
+
+            /* 拉取数据需要使用的值 */
+            this.state = 0;
+            this.listSize = editor.getOpt('fileManagerListSize');
+            this.listIndex = 0;
+            this.listEnd = false;
+
+            /* 第一次拉取数据 */
+            this.getFileData();
+        },
+        /* 向后台拉取图片列表数据 */
+        getFileData: function () {
+            var _this = this;
+
+            if(!_this.listEnd && !this.isLoadingData) {
+                this.isLoadingData = true;
+                ajax.request(editor.getActionUrl(editor.getOpt('fileManagerActionName')), {
+                    timeout: 100000,
+                    data: utils.extend({
+                            start: this.listIndex,
+                            size: this.listSize
+                        }, editor.queryCommandValue('serverparam')),
+                    method: 'get',
+                    onsuccess: function (r) {
+                        try {
+                            var json = eval('(' + r.responseText + ')');
+                            if (json.state == 'SUCCESS') {
+                                _this.pushData(json.list);
+                                _this.listIndex = parseInt(json.start) + parseInt(json.list.length);
+                                if(_this.listIndex >= json.total) {
+                                    _this.listEnd = true;
+                                }
+                                _this.isLoadingData = false;
+                            }
+                        } catch (e) {
+                            if(r.responseText.indexOf('ue_separate_ue') != -1) {
+                                var list = r.responseText.split(r.responseText);
+                                _this.pushData(list);
+                                _this.listIndex = parseInt(list.length);
+                                _this.listEnd = true;
+                                _this.isLoadingData = false;
+                            }
+                        }
+                    },
+                    onerror: function () {
+                        _this.isLoadingData = false;
+                    }
+                });
+            }
+        },
+        /* 添加图片到列表界面上 */
+        pushData: function (list) {
+            var i, item, img, filetype, preview, icon, _this = this,
+                urlPrefix = editor.getOpt('fileManagerUrlPrefix');
+            for (i = 0; i < list.length; i++) {
+                if(list[i] && list[i].url) {
+                    item = document.createElement('li');
+                    icon = document.createElement('span');
+                    filetype = list[i].url.substr(list[i].url.lastIndexOf('.') + 1);
+
+                    if ( "png|jpg|jpeg|gif|bmp".indexOf(filetype) != -1 ) {
+                        preview = document.createElement('img');
+                        domUtils.on(preview, 'load', (function(image){
+                            return function(){
+                                _this.scale(image, image.parentNode.offsetWidth, image.parentNode.offsetHeight);
+                            };
+                        })(preview));
+                        preview.width = 113;
+                        preview.setAttribute('src', urlPrefix + list[i].url + (list[i].url.indexOf('?') == -1 ? '?noCache=':'&noCache=') + (+new Date()).toString(36) );
+                    } else {
+                        var ic = document.createElement('i'),
+                            textSpan = document.createElement('span');
+                        textSpan.innerHTML = list[i].url.substr(list[i].url.lastIndexOf('/') + 1);
+                        preview = document.createElement('div');
+                        preview.appendChild(ic);
+                        preview.appendChild(textSpan);
+                        domUtils.addClass(preview, 'file-wrapper');
+                        domUtils.addClass(textSpan, 'file-title');
+                        domUtils.addClass(ic, 'file-type-' + filetype);
+                        domUtils.addClass(ic, 'file-preview');
+                    }
+                    domUtils.addClass(icon, 'icon');
+                    item.setAttribute('data-url', urlPrefix + list[i].url);
+                    if (list[i].original) {
+                        item.setAttribute('data-title', list[i].original);
+                    }
+
+                    item.appendChild(preview);
+                    item.appendChild(icon);
+                    this.list.insertBefore(item, this.clearFloat);
+                }
+            }
+        },
+        /* 改变图片大小 */
+        scale: function (img, w, h, type) {
+            var ow = img.width,
+                oh = img.height;
+
+            if (type == 'justify') {
+                if (ow >= oh) {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            } else {
+                if (ow >= oh) {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            }
+        },
+        getInsertList: function () {
+            var i, lis = this.list.children, list = [];
+            for (i = 0; i < lis.length; i++) {
+                if (domUtils.hasClass(lis[i], 'selected')) {
+                    var url = lis[i].getAttribute('data-url');
+                    var title = lis[i].getAttribute('data-title') || url.substr(url.lastIndexOf('/') + 1);
+                    list.push({
+                        title: title,
+                        url: url
+                    });
+                }
+            }
+            return list;
+        }
+    };
+
+
+})();
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_chm.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_chm.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_default.png
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_default.png
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_doc.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_doc.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_exe.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_exe.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_jpg.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_jpg.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_mp3.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_mp3.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_mv.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_mv.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_pdf.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_pdf.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_ppt.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_ppt.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_psd.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_psd.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_rar.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_rar.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_txt.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_txt.gif
--- a/public/ueditor/dialogs/attachment/fileTypeImages/icon_xls.gif
+++ b/public/ueditor/dialogs/attachment/fileTypeImages/icon_xls.gif
--- a/public/ueditor/dialogs/attachment/images/alignicon.gif
+++ b/public/ueditor/dialogs/attachment/images/alignicon.gif
--- a/public/ueditor/dialogs/attachment/images/alignicon.png
+++ b/public/ueditor/dialogs/attachment/images/alignicon.png
--- a/public/ueditor/dialogs/attachment/images/bg.png
+++ b/public/ueditor/dialogs/attachment/images/bg.png
--- a/public/ueditor/dialogs/attachment/images/file-icons.gif
+++ b/public/ueditor/dialogs/attachment/images/file-icons.gif
--- a/public/ueditor/dialogs/attachment/images/file-icons.png
+++ b/public/ueditor/dialogs/attachment/images/file-icons.png
--- a/public/ueditor/dialogs/attachment/images/icons.gif
+++ b/public/ueditor/dialogs/attachment/images/icons.gif
--- a/public/ueditor/dialogs/attachment/images/icons.png
+++ b/public/ueditor/dialogs/attachment/images/icons.png
--- a/public/ueditor/dialogs/attachment/images/image.png
+++ b/public/ueditor/dialogs/attachment/images/image.png
--- a/public/ueditor/dialogs/attachment/images/progress.png
+++ b/public/ueditor/dialogs/attachment/images/progress.png
--- a/public/ueditor/dialogs/attachment/images/success.gif
+++ b/public/ueditor/dialogs/attachment/images/success.gif
--- a/public/ueditor/dialogs/attachment/images/success.png
+++ b/public/ueditor/dialogs/attachment/images/success.png
--- a/public/ueditor/dialogs/background/background.css
+++ b/public/ueditor/dialogs/background/background.css
@ -0,0 +1,94 @@
+.wrapper{ width: 424px;margin: 10px auto; zoom:1;position: relative}
+.tabbody{height:225px;}
+.tabbody .panel { position: absolute;width:100%; height:100%;background: #fff; display: none;}
+.tabbody .focus { display: block;}
+
+body{font-size: 12px;color: #888;overflow: hidden;}
+input,label{vertical-align:middle}
+.clear{clear: both;}
+.pl{padding-left: 18px;padding-left: 23px\9;}
+
+#imageList {width: 420px;height: 215px;margin-top: 10px;overflow: hidden;overflow-y: auto;}
+#imageList div {float: left;width: 100px;height: 95px;margin: 5px 10px;}
+#imageList img {cursor: pointer;border: 2px solid white;}
+
+.bgarea{margin: 10px;padding: 5px;height: 84%;border: 1px solid #A8A297;}
+.content div{margin: 10px 0 10px 5px;}
+.content .iptradio{margin: 0px 5px 5px 0px;}
+.txt{width:280px;}
+
+.wrapcolor{height: 19px;}
+div.color{float: left;margin: 0;}
+#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;border-radius: 3px;box-shadow: 2px 2px 5px #D3D6DA;margin: 0;float: left;}
+div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;}
+#custom input{height: 15px;min-height: 15px;width:20px;}
+#repeatType{width:100px;}
+
+
+/* 图片管理样式 */
+#imgManager {
+    width: 100%;
+    height: 225px;
+}
+#imgManager #imageList{
+    width: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+#imgManager ul {
+    display: block;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#imgManager li {
+    float: left;
+    display: block;
+    list-style: none;
+    padding: 0;
+    width: 113px;
+    height: 113px;
+    margin: 9px 0 0 19px;
+    background-color: #eee;
+    overflow: hidden;
+    cursor: pointer;
+    position: relative;
+}
+#imgManager li.clearFloat {
+    float: none;
+    clear: both;
+    display: block;
+    width:0;
+    height:0;
+    margin: 0;
+    padding: 0;
+}
+#imgManager li img {
+    cursor: pointer;
+}
+#imgManager li .icon {
+    cursor: pointer;
+    width: 113px;
+    height: 113px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    border: 0;
+    background-repeat: no-repeat;
+}
+#imgManager li .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+}
+#imgManager li.selected .icon {
+    background-image: url(images/success.png);
+    background-position: 75px 75px;
+}
+#imgManager li.selected .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+    background-position: 72px 72px;
+}
--- a/public/ueditor/dialogs/background/background.html
+++ b/public/ueditor/dialogs/background/background.html
@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js"></script>
+    <link rel="stylesheet" type="text/css" href="background.css">
+</head>
+<body>
+    <div id="bg_container" class="wrapper">
+        <div id="tabHeads" class="tabhead">
+            <span class="focus" data-content-id="normal"><var id="lang_background_normal"></var></span>
+            <span class="" data-content-id="imgManager"><var id="lang_background_local"></var></span>
+        </div>
+        <div id="tabBodys" class="tabbody">
+            <div id="normal" class="panel focus">
+                <fieldset class="bgarea">
+                    <legend><var id="lang_background_set"></var></legend>
+                    <div class="content">
+                        <div>
+                            <label><input id="nocolorRadio" class="iptradio" type="radio" name="t" value="none" checked="checked"><var id="lang_background_none"></var></label>
+                            <label><input id="coloredRadio" class="iptradio" type="radio" name="t" value="color"><var id="lang_background_colored"></var></label>
+                        </div>
+                        <div class="wrapcolor pl">
+                            <div class="color">
+                                <var id="lang_background_color"></var>:
+                            </div>
+                            <div id="colorPicker"></div>
+                            <div class="clear"></div>
+                        </div>
+                        <div class="wrapcolor pl">
+                            <label><var id="lang_background_netimg"></var>:</label><input class="txt" type="text" id="url">
+                        </div>
+                        <div id="alignment" class="alignment">
+                            <var id="lang_background_align"></var>:<select id="repeatType">
+                                <option value="center"></option>
+                                <option value="repeat-x"></option>
+                                <option value="repeat-y"></option>
+                                <option value="repeat"></option>
+                                <option value="self"></option>
+                            </select>
+                        </div>
+                        <div id="custom" >
+                            <var id="lang_background_position"></var>:x:<input type="text" size="1" id="x" maxlength="4" value="0">px&nbsp;&nbsp;y:<input type="text" size="1" id="y" maxlength="4" value="0">px
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div id="imgManager" class="panel">
+                <div id="imageList" style=""></div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript" src="background.js"></script>
+</body>
+</html>
--- a/public/ueditor/dialogs/background/background.js
+++ b/public/ueditor/dialogs/background/background.js
@ -0,0 +1,376 @@
+(function () {
+
+    var onlineImage,
+        backupStyle = editor.queryCommandValue('background');
+
+    window.onload = function () {
+        initTabs();
+        initColorSelector();
+    };
+
+    /* 初始化tab标签 */
+    function initTabs(){
+        var tabs = $G('tabHeads').children;
+        for (var i = 0; i < tabs.length; i++) {
+            domUtils.on(tabs[i], "click", function (e) {
+                var target = e.target || e.srcElement;
+                for (var j = 0; j < tabs.length; j++) {
+                    if(tabs[j] == target){
+                        tabs[j].className = "focus";
+                        var contentId = tabs[j].getAttribute('data-content-id');
+                        $G(contentId).style.display = "block";
+                        if(contentId == 'imgManager') {
+                            initImagePanel();
+                        }
+                    }else {
+                        tabs[j].className = "";
+                        $G(tabs[j].getAttribute('data-content-id')).style.display = "none";
+                    }
+                }
+            });
+        }
+    }
+
+    /* 初始化颜色设置 */
+    function initColorSelector () {
+        var obj = editor.queryCommandValue('background');
+        if (obj) {
+            var color = obj['background-color'],
+                repeat = obj['background-repeat'] || 'repeat',
+                image = obj['background-image'] || '',
+                position = obj['background-position'] || 'center center',
+                pos = position.split(' '),
+                x = parseInt(pos[0]) || 0,
+                y = parseInt(pos[1]) || 0;
+
+            if(repeat == 'no-repeat' && (x || y)) repeat = 'self';
+
+            image = image.match(/url[\s]*\(([^\)]*)\)/);
+            image = image ? image[1]:'';
+            updateFormState('colored', color, image, repeat, x, y);
+        } else {
+            updateFormState();
+        }
+
+        var updateHandler = function () {
+            updateFormState();
+            updateBackground();
+        }
+        domUtils.on($G('nocolorRadio'), 'click', updateBackground);
+        domUtils.on($G('coloredRadio'), 'click', updateHandler);
+        domUtils.on($G('url'), 'keyup', function(){
+            if($G('url').value && $G('alignment').style.display == "none") {
+                utils.each($G('repeatType').children, function(item){
+                    item.selected = ('repeat' == item.getAttribute('value') ? 'selected':false);
+                });
+            }
+            updateHandler();
+        });
+        domUtils.on($G('repeatType'), 'change', updateHandler);
+        domUtils.on($G('x'), 'keyup', updateBackground);
+        domUtils.on($G('y'), 'keyup', updateBackground);
+
+        initColorPicker();
+    }
+
+    /* 初始化颜色选择器 */
+    function initColorPicker() {
+        var me = editor,
+            cp = $G("colorPicker");
+
+        /* 生成颜色选择器ui对象 */
+        var popup = new UE.ui.Popup({
+            content: new UE.ui.ColorPicker({
+                noColorText: me.getLang("clearColor"),
+                editor: me,
+                onpickcolor: function (t, color) {
+                    updateFormState('colored', color);
+                    updateBackground();
+                    UE.ui.Popup.postHide();
+                },
+                onpicknocolor: function (t, color) {
+                    updateFormState('colored', 'transparent');
+                    updateBackground();
+                    UE.ui.Popup.postHide();
+                }
+            }),
+            editor: me,
+            onhide: function () {
+            }
+        });
+
+        /* 设置颜色选择器 */
+        domUtils.on(cp, "click", function () {
+            popup.showAnchor(this);
+        });
+        domUtils.on(document, 'mousedown', function (evt) {
+            var el = evt.target || evt.srcElement;
+            UE.ui.Popup.postHide(el);
+        });
+        domUtils.on(window, 'scroll', function () {
+            UE.ui.Popup.postHide();
+        });
+    }
+
+    /* 初始化在线图片列表 */
+    function initImagePanel() {
+        onlineImage = onlineImage || new OnlineImage('imageList');
+    }
+
+    /* 更新背景色设置面板 */
+    function updateFormState (radio, color, url, align, x, y) {
+        var nocolorRadio = $G('nocolorRadio'),
+            coloredRadio = $G('coloredRadio');
+
+        if(radio) {
+            nocolorRadio.checked = (radio == 'colored' ? false:'checked');
+            coloredRadio.checked = (radio == 'colored' ? 'checked':false);
+        }
+        if(color) {
+            domUtils.setStyle($G("colorPicker"), "background-color", color);
+        }
+
+        if(url && /^\//.test(url)) {
+            var a = document.createElement('a');
+            a.href = url;
+            browser.ie && (a.href = a.href);
+            url = browser.ie ? a.href:(a.protocol + '//' + a.host + a.pathname + a.search + a.hash);
+        }
+
+        if(url || url === '') {
+            $G('url').value = url;
+        }
+        if(align) {
+            utils.each($G('repeatType').children, function(item){
+                item.selected = (align == item.getAttribute('value') ? 'selected':false);
+            });
+        }
+        if(x || y) {
+            $G('x').value = parseInt(x) || 0;
+            $G('y').value = parseInt(y) || 0;
+        }
+
+        $G('alignment').style.display = coloredRadio.checked && $G('url').value ? '':'none';
+        $G('custom').style.display = coloredRadio.checked && $G('url').value && $G('repeatType').value == 'self' ? '':'none';
+    }
+
+    /* 更新背景颜色 */
+    function updateBackground () {
+        if ($G('coloredRadio').checked) {
+            var color = domUtils.getStyle($G("colorPicker"), "background-color"),
+                bgimg = $G("url").value,
+                align = $G("repeatType").value,
+                backgroundObj = {
+                    "background-repeat": "no-repeat",
+                    "background-position": "center center"
+                };
+
+            if (color) backgroundObj["background-color"] = color;
+            if (bgimg) backgroundObj["background-image"] = 'url(' + bgimg + ')';
+            if (align == 'self') {
+                backgroundObj["background-position"] = $G("x").value + "px " + $G("y").value + "px";
+            } else if (align == 'repeat-x' || align == 'repeat-y' || align == 'repeat') {
+                backgroundObj["background-repeat"] = align;
+            }
+
+            editor.execCommand('background', backgroundObj);
+        } else {
+            editor.execCommand('background', null);
+        }
+    }
+
+
+    /* 在线图片 */
+    function OnlineImage(target) {
+        this.container = utils.isString(target) ? document.getElementById(target) : target;
+        this.init();
+    }
+    OnlineImage.prototype = {
+        init: function () {
+            this.reset();
+            this.initEvents();
+        },
+        /* 初始化容器 */
+        initContainer: function () {
+            this.container.innerHTML = '';
+            this.list = document.createElement('ul');
+            this.clearFloat = document.createElement('li');
+
+            domUtils.addClass(this.list, 'list');
+            domUtils.addClass(this.clearFloat, 'clearFloat');
+
+            this.list.id = 'imageListUl';
+            this.list.appendChild(this.clearFloat);
+            this.container.appendChild(this.list);
+        },
+        /* 初始化滚动事件,滚动到地步自动拉取数据 */
+        initEvents: function () {
+            var _this = this;
+
+            /* 滚动拉取图片 */
+            domUtils.on($G('imageList'), 'scroll', function(e){
+                var panel = this;
+                if (panel.scrollHeight - (panel.offsetHeight + panel.scrollTop) < 10) {
+                    _this.getImageData();
+                }
+            });
+            /* 选中图片 */
+            domUtils.on(this.container, 'click', function (e) {
+                var target = e.target || e.srcElement,
+                    li = target.parentNode,
+                    nodes = $G('imageListUl').childNodes;
+
+                if (li.tagName.toLowerCase() == 'li') {
+                    updateFormState('nocolor', null, '');
+                    for (var i = 0, node; node = nodes[i++];) {
+                        if (node == li && !domUtils.hasClass(node, 'selected')) {
+                            domUtils.addClass(node, 'selected');
+                            updateFormState('colored', null, li.firstChild.getAttribute("_src"), 'repeat');
+                        } else {
+                            domUtils.removeClasses(node, 'selected');
+                        }
+                    }
+                    updateBackground();
+                }
+            });
+        },
+        /* 初始化第一次的数据 */
+        initData: function () {
+
+            /* 拉取数据需要使用的值 */
+            this.state = 0;
+            this.listSize = editor.getOpt('imageManagerListSize');
+            this.listIndex = 0;
+            this.listEnd = false;
+
+            /* 第一次拉取数据 */
+            this.getImageData();
+        },
+        /* 重置界面 */
+        reset: function() {
+            this.initContainer();
+            this.initData();
+        },
+        /* 向后台拉取图片列表数据 */
+        getImageData: function () {
+            var _this = this;
+
+            if(!_this.listEnd && !this.isLoadingData) {
+                this.isLoadingData = true;
+                var url = editor.getActionUrl(editor.getOpt('imageManagerActionName')),
+                    isJsonp = utils.isCrossDomainUrl(url);
+                ajax.request(url, {
+                    'timeout': 100000,
+                    'dataType': isJsonp ? 'jsonp':'',
+                    'data': utils.extend({
+                            start: this.listIndex,
+                            size: this.listSize
+                        }, editor.queryCommandValue('serverparam')),
+                    'method': 'get',
+                    'onsuccess': function (r) {
+                        try {
+                            var json = isJsonp ? r:eval('(' + r.responseText + ')');
+                            if (json.state == 'SUCCESS') {
+                                _this.pushData(json.list);
+                                _this.listIndex = parseInt(json.start) + parseInt(json.list.length);
+                                if(_this.listIndex >= json.total) {
+                                    _this.listEnd = true;
+                                }
+                                _this.isLoadingData = false;
+                            }
+                        } catch (e) {
+                            if(r.responseText.indexOf('ue_separate_ue') != -1) {
+                                var list = r.responseText.split(r.responseText);
+                                _this.pushData(list);
+                                _this.listIndex = parseInt(list.length);
+                                _this.listEnd = true;
+                                _this.isLoadingData = false;
+                            }
+                        }
+                    },
+                    'onerror': function () {
+                        _this.isLoadingData = false;
+                    }
+                });
+            }
+        },
+        /* 添加图片到列表界面上 */
+        pushData: function (list) {
+            var i, item, img, icon, _this = this,
+                urlPrefix = editor.getOpt('imageManagerUrlPrefix');
+            for (i = 0; i < list.length; i++) {
+                if(list[i] && list[i].url) {
+                    item = document.createElement('li');
+                    img = document.createElement('img');
+                    icon = document.createElement('span');
+
+                    domUtils.on(img, 'load', (function(image){
+                        return function(){
+                            _this.scale(image, image.parentNode.offsetWidth, image.parentNode.offsetHeight);
+                        }
+                    })(img));
+                    img.width = 113;
+                    img.setAttribute('src', urlPrefix + list[i].url + (list[i].url.indexOf('?') == -1 ? '?noCache=':'&noCache=') + (+new Date()).toString(36) );
+                    img.setAttribute('_src', urlPrefix + list[i].url);
+                    domUtils.addClass(icon, 'icon');
+
+                    item.appendChild(img);
+                    item.appendChild(icon);
+                    this.list.insertBefore(item, this.clearFloat);
+                }
+            }
+        },
+        /* 改变图片大小 */
+        scale: function (img, w, h, type) {
+            var ow = img.width,
+                oh = img.height;
+
+            if (type == 'justify') {
+                if (ow >= oh) {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            } else {
+                if (ow >= oh) {
+                    img.width = w * ow / oh;
+                    img.height = h;
+                    img.style.marginLeft = '-' + parseInt((img.width - w) / 2) + 'px';
+                } else {
+                    img.width = w;
+                    img.height = h * oh / ow;
+                    img.style.marginTop = '-' + parseInt((img.height - h) / 2) + 'px';
+                }
+            }
+        },
+        getInsertList: function () {
+            var i, lis = this.list.children, list = [], align = getAlign();
+            for (i = 0; i < lis.length; i++) {
+                if (domUtils.hasClass(lis[i], 'selected')) {
+                    var img = lis[i].firstChild,
+                        src = img.getAttribute('_src');
+                    list.push({
+                        src: src,
+                        _src: src,
+                        floatStyle: align
+                    });
+                }
+
+            }
+            return list;
+        }
+    };
+
+    dialog.onok = function () {
+        updateBackground();
+        editor.fireEvent('saveScene');
+    };
+    dialog.oncancel = function () {
+        editor.execCommand('background', backupStyle);
+    };
+
+})();
--- a/public/ueditor/dialogs/background/images/bg.png
+++ b/public/ueditor/dialogs/background/images/bg.png
--- a/public/ueditor/dialogs/background/images/success.png
+++ b/public/ueditor/dialogs/background/images/success.png
--- a/public/ueditor/dialogs/charts/chart.config.js
+++ b/public/ueditor/dialogs/charts/chart.config.js
@ -0,0 +1,65 @@
+/*
+ * 图表配置文件
+ * */
+
+
+//不同类型的配置
+var typeConfig = [
+    {
+        chart: {
+            type: 'line'
+        },
+        plotOptions: {
+            line: {
+                dataLabels: {
+                    enabled: false
+                },
+                enableMouseTracking: true
+            }
+        }
+    }, {
+        chart: {
+            type: 'line'
+        },
+        plotOptions: {
+            line: {
+                dataLabels: {
+                    enabled: true
+                },
+                enableMouseTracking: false
+            }
+        }
+    }, {
+        chart: {
+            type: 'area'
+        }
+    }, {
+        chart: {
+            type: 'bar'
+        }
+    }, {
+        chart: {
+            type: 'column'
+        }
+    }, {
+        chart: {
+            plotBackgroundColor: null,
+            plotBorderWidth: null,
+            plotShadow: false
+        },
+        plotOptions: {
+            pie: {
+                allowPointSelect: true,
+                cursor: 'pointer',
+                dataLabels: {
+                    enabled: true,
+                    color: '#000000',
+                    connectorColor: '#000000',
+                    formatter: function() {
+                        return '<b>'+ this.point.name +'</b>: '+ ( Math.round( this.point.percentage*100 ) / 100 ) +' %';
+                    }
+                }
+            }
+        }
+    }
+];
--- a/public/ueditor/dialogs/charts/charts.css
+++ b/public/ueditor/dialogs/charts/charts.css
@ -0,0 +1,165 @@
+html, body {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    overflow-x: hidden;
+}
+
+.main {
+    width: 100%;
+    overflow: hidden;
+}
+
+.table-view {
+    height: 100%;
+    float: left;
+    margin: 20px;
+    width: 40%;
+}
+
+.table-view .table-container {
+    width: 100%;
+    margin-bottom: 50px;
+    overflow: scroll;
+}
+
+.table-view th {
+    padding: 5px 10px;
+    background-color: #F7F7F7;
+}
+
+.table-view td {
+    width: 50px;
+    text-align: center;
+    padding:0;
+}
+
+.table-container input {
+    width: 40px;
+    padding: 5px;
+    border: none;
+    outline: none;
+}
+
+.table-view caption {
+    font-size: 18px;
+    text-align: left;
+}
+
+.charts-view {
+    /*margin-left: 49%!important;*/
+    width: 50%;
+    margin-left: 49%;
+    height: 400px;
+}
+
+.charts-container {
+    border-left: 1px solid #c3c3c3;
+}
+
+.charts-format fieldset {
+    padding-left: 20px;
+    margin-bottom: 50px;
+}
+
+.charts-format legend {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+.format-item-container {
+    padding: 20px;
+}
+
+.format-item-container label {
+    display: block;
+    margin: 10px 0;
+}
+
+.charts-format .data-item {
+    border: 1px solid black;
+    outline: none;
+    padding: 2px 3px;
+}
+
+/* 图表类型 */
+
+.charts-type {
+    margin-top: 50px;
+    height: 300px;
+}
+
+.scroll-view {
+    border: 1px solid #c3c3c3;
+    border-left: none;
+    border-right: none;
+    overflow: hidden;
+}
+
+.scroll-container {
+    margin: 20px;
+    width: 100%;
+    overflow: hidden;
+}
+
+.scroll-bed {
+    width: 10000px;
+    _margin-top: 20px;
+    -webkit-transition: margin-left .5s ease;
+    -moz-transition: margin-left .5s ease;
+    transition: margin-left .5s ease;
+}
+
+.view-box {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+    margin-right: 20px;
+    border: 2px solid white;
+    line-height: 0;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.view-box img {
+    border: 1px solid #cecece;
+}
+
+.view-box.selected {
+    border-color: #7274A7;
+}
+
+.button-container {
+    margin-bottom: 20px;
+    text-align: center;
+}
+
+.button-container a {
+    display: inline-block;
+    width: 100px;
+    height: 25px;
+    line-height: 25px;
+    border: 1px solid #c2ccd1;
+    margin-right: 30px;
+    text-decoration: none;
+    color: black;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+}
+
+.button-container a:HOVER {
+    background: #fcfcfc;
+}
+
+.button-container a:ACTIVE {
+    border-top-color: #c2ccd1;
+    box-shadow:inset 0 5px 4px -4px rgba(49, 49, 64, 0.1);
+}
+
+.edui-charts-not-data {
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+}
--- a/public/ueditor/dialogs/charts/charts.html
+++ b/public/ueditor/dialogs/charts/charts.html
@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>chart</title>
+        <meta chartset="utf-8">
+        <link rel="stylesheet" type="text/css" href="charts.css">
+        <script type="text/javascript" src="../internal.js"></script>
+    </head>
+    <body>
+        <div class="main">
+            <div class="table-view">
+                <h3><var id="lang_data_source"></var></h3>
+                <div id="tableContainer" class="table-container"></div>
+                <h3><var id="lang_chart_format"></var></h3>
+                <form name="data-form">
+                    <div class="charts-format">
+                        <fieldset>
+                            <legend><var id="lang_data_align"></var></legend>
+                            <div class="format-item-container">
+                                <label>
+                                    <input type="radio" class="format-ctrl not-pie-item" name="charts-format" value="1" checked="checked">
+                                    <var id="lang_chart_align_same"></var>
+                                </label>
+                                <label>
+                                    <input type="radio" class="format-ctrl not-pie-item" name="charts-format" value="-1">
+                                    <var id="lang_chart_align_reverse"></var>
+                                </label>
+                                <br>
+                            </div>
+                        </fieldset>
+                        <fieldset>
+                            <legend><var id="lang_chart_title"></var></legend>
+                            <div class="format-item-container">
+                                <label>
+                                    <var id="lang_chart_main_title"></var><input type="text" name="title" class="data-item">
+                                </label>
+                                <label>
+                                    <var id="lang_chart_sub_title"></var><input type="text" name="sub-title" class="data-item not-pie-item">
+                                </label>
+                                <label>
+                                    <var id="lang_chart_x_title"></var><input type="text" name="x-title" class="data-item not-pie-item">
+                                </label>
+                                <label>
+                                    <var id="lang_chart_y_title"></var><input type="text" name="y-title" class="data-item not-pie-item">
+                                </label>
+                            </div>
+                        </fieldset>
+                        <fieldset>
+                            <legend><var id="lang_chart_tip"></var></legend>
+                            <div class="format-item-container">
+                                <label>
+                                    <var id="lang_cahrt_tip_prefix"></var>
+                                    <input type="text" id="tipInput" name="tip" class="data-item" disabled="disabled">
+                                </label>
+                                <p><var id="lang_cahrt_tip_description"></var></p>
+                            </div>
+                        </fieldset>
+                        <fieldset>
+                            <legend><var id="lang_chart_data_unit"></var></legend>
+                            <div class="format-item-container">
+                                <label><var id="lang_chart_data_unit_title"></var><input type="text" name="unit" class="data-item"></label>
+                                <p><var id="lang_chart_data_unit_description"></var></p>
+                            </div>
+                        </fieldset>
+                    </div>
+                </form>
+            </div>
+            <div class="charts-view">
+                <div id="chartsContainer" class="charts-container"></div>
+                <div id="chartsType" class="charts-type">
+                    <h3><var id="lang_chart_type"></var></h3>
+                    <div class="scroll-view">
+                        <div class="scroll-container">
+                            <div id="scrollBed" class="scroll-bed"></div>
+                        </div>
+                        <div id="buttonContainer" class="button-container">
+                            <a href="#" data-title="prev"><var id="lang_prev_btn"></var></a>
+                            <a href="#" data-title="next"><var id="lang_next_btn"></var></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script src="../../third-party/jquery-1.10.2.min.js"></script>
+        <script src="../../third-party/highcharts/highcharts.js"></script>
+        <script src="chart.config.js"></script>
+        <script src="charts.js"></script>
+    </body>
+</html>
--- a/public/ueditor/dialogs/charts/charts.js
+++ b/public/ueditor/dialogs/charts/charts.js
@ -0,0 +1,519 @@
+/*
+ * 图片转换对话框脚本
+ **/
+
+var tableData = [],
+    //编辑器页面table
+    editorTable = null,
+    chartsConfig = window.typeConfig,
+    resizeTimer = null,
+    //初始默认图表类型
+    currentChartType = 0;
+
+window.onload = function () {
+
+    editorTable = domUtils.findParentByTagName( editor.selection.getRange().startContainer, 'table', true);
+
+    //未找到表格， 显示错误页面
+    if ( !editorTable ) {
+        document.body.innerHTML = "<div class='edui-charts-not-data'>未找到数据</div>";
+        return;
+    }
+
+    //初始化图表类型选择
+    initChartsTypeView();
+    renderTable( editorTable );
+    initEvent();
+    initUserConfig( editorTable.getAttribute( "data-chart" ) );
+    $( "#scrollBed .view-box:eq("+ currentChartType +")" ).trigger( "click" );
+    updateViewType( currentChartType );
+
+    dialog.addListener( "resize", function () {
+
+        if ( resizeTimer != null ) {
+            window.clearTimeout( resizeTimer );
+        }
+
+        resizeTimer = window.setTimeout( function () {
+
+            resizeTimer = null;
+
+            renderCharts();
+
+        }, 500 );
+
+    } );
+
+};
+
+function initChartsTypeView () {
+
+    var contents = [];
+
+    for ( var i = 0, len = chartsConfig.length; i<len; i++ ) {
+
+        contents.push( '<div class="view-box" data-chart-type="'+ i +'"><img width="300" src="images/charts'+ i +'.png"></div>' );
+
+    }
+
+    $( "#scrollBed" ).html( contents.join( "" ) );
+
+}
+
+//渲染table， 以便用户修改数据
+function renderTable ( table ) {
+
+    var tableHtml = [];
+
+    //构造数据
+    for ( var i = 0, row; row = table.rows[ i ]; i++ ) {
+
+        tableData[ i ] = [];
+        tableHtml[ i ] = [];
+
+        for ( var j = 0, cell; cell = row.cells[ j ]; j++ ) {
+
+            var value = getCellValue( cell );
+
+            if ( i > 0 && j > 0 ) {
+                value = +value;
+            }
+
+            if ( i === 0 || j === 0 ) {
+                tableHtml[ i ].push( '<th>'+ value +'</th>' );
+            } else {
+                tableHtml[ i ].push( '<td><input type="text" class="data-item" value="'+ value +'"></td>' );
+            }
+
+            tableData[ i ][ j ] = value;
+
+        }
+
+        tableHtml[ i ] = tableHtml[ i ].join( "" );
+
+    }
+
+    //draw 表格
+    $( "#tableContainer" ).html( '<table id="showTable" border="1"><tbody><tr>'+ tableHtml.join( "</tr><tr>" ) +'</tr></tbody></table>' );
+
+}
+
+/*
+ * 根据表格已有的图表属性初始化当前图表属性
+ */
+function initUserConfig ( config ) {
+
+    var parsedConfig = {};
+
+    if ( !config ) {
+        return;
+    }
+
+    config = config.split( ";" );
+
+    $.each( config, function ( index, item ) {
+
+        item = item.split( ":" );
+        parsedConfig[ item[ 0 ] ] = item[ 1 ];
+
+    } );
+
+    setUserConfig( parsedConfig );
+
+}
+
+function initEvent () {
+
+    var cacheValue = null,
+        //图表类型数
+        typeViewCount = chartsConfig.length- 1,
+        $chartsTypeViewBox = $( '#scrollBed .view-box' );
+
+    $( ".charts-format" ).delegate( ".format-ctrl", "change", function () {
+
+        renderCharts();
+
+    } )
+
+    $( ".table-view" ).delegate( ".data-item", "focus", function () {
+
+        cacheValue = this.value;
+
+    } ).delegate( ".data-item", "blur", function () {
+
+        if ( this.value !== cacheValue ) {
+            renderCharts();
+        }
+
+        cacheValue = null;
+
+    } );
+
+    $( "#buttonContainer" ).delegate( "a", "click", function (e) {
+
+        e.preventDefault();
+
+        if ( this.getAttribute( "data-title" ) === 'prev' ) {
+
+            if ( currentChartType > 0 ) {
+                currentChartType--;
+                updateViewType( currentChartType );
+            }
+
+        } else {
+
+            if ( currentChartType < typeViewCount ) {
+                currentChartType++;
+                updateViewType( currentChartType );
+            }
+
+        }
+
+    } );
+
+    //图表类型变化
+    $( '#scrollBed' ).delegate( ".view-box", "click", function (e) {
+
+        var index = $( this ).attr( "data-chart-type" );
+        $chartsTypeViewBox.removeClass( "selected" );
+        $( $chartsTypeViewBox[ index ] ).addClass( "selected" );
+
+        currentChartType = index | 0;
+
+        //饼图， 禁用部分配置
+        if ( currentChartType === chartsConfig.length - 1 ) {
+
+            disableNotPieConfig();
+
+        //启用完整配置
+        } else {
+
+            enableNotPieConfig();
+
+        }
+
+        renderCharts();
+
+    } );
+
+}
+
+function renderCharts () {
+
+    var data = collectData();
+
+    $('#chartsContainer').highcharts( $.extend( {}, chartsConfig[ currentChartType ], {
+
+        credits: {
+            enabled: false
+        },
+        exporting: {
+            enabled: false
+        },
+        title: {
+            text: data.title,
+            x: -20 //center
+        },
+        subtitle: {
+            text: data.subTitle,
+            x: -20
+        },
+        xAxis: {
+            title: {
+                text: data.xTitle
+            },
+            categories: data.categories
+        },
+        yAxis: {
+            title: {
+                text: data.yTitle
+            },
+            plotLines: [{
+                value: 0,
+                width: 1,
+                color: '#808080'
+            }]
+        },
+        tooltip: {
+            enabled: true,
+            valueSuffix: data.suffix
+        },
+        legend: {
+            layout: 'vertical',
+            align: 'right',
+            verticalAlign: 'middle',
+            borderWidth: 1
+        },
+        series: data.series
+
+    } ));
+
+}
+
+function updateViewType ( index ) {
+
+    $( "#scrollBed" ).css( 'marginLeft', -index*324+'px' );
+
+}
+
+function collectData () {
+
+    var form = document.forms[ 'data-form' ],
+        data = null;
+
+    if ( currentChartType !== chartsConfig.length - 1 ) {
+
+        data = getSeriesAndCategories();
+        $.extend( data, getUserConfig() );
+
+    //饼图数据格式
+    } else {
+        data = getSeriesForPieChart();
+        data.title = form[ 'title' ].value;
+        data.suffix = form[ 'unit' ].value;
+    }
+
+    return data;
+
+}
+
+/**
+ * 获取用户配置信息
+ */
+function getUserConfig () {
+
+    var form = document.forms[ 'data-form' ],
+        info = {
+            title: form[ 'title' ].value,
+            subTitle: form[ 'sub-title' ].value,
+            xTitle: form[ 'x-title' ].value,
+            yTitle: form[ 'y-title' ].value,
+            suffix: form[ 'unit' ].value,
+            //数据对齐方式
+            tableDataFormat: getTableDataFormat (),
+            //饼图提示文字
+            tip: $( "#tipInput" ).val()
+        };
+
+    return info;
+
+}
+
+function setUserConfig ( config ) {
+
+    var form = document.forms[ 'data-form' ];
+
+    config.title && ( form[ 'title' ].value = config.title );
+    config.subTitle && ( form[ 'sub-title' ].value = config.subTitle );
+    config.xTitle && ( form[ 'x-title' ].value = config.xTitle );
+    config.yTitle && ( form[ 'y-title' ].value = config.yTitle );
+    config.suffix && ( form[ 'unit' ].value = config.suffix );
+    config.dataFormat == "-1" && ( form[ 'charts-format' ][ 1 ].checked = true );
+    config.tip && ( form[ 'tip' ].value = config.tip );
+    currentChartType = config.chartType || 0;
+
+}
+
+function getSeriesAndCategories () {
+
+    var form = document.forms[ 'data-form' ],
+        series = [],
+        categories = [],
+        tmp = [],
+        tableData = getTableData();
+
+    //反转数据
+    if ( getTableDataFormat() === "-1" ) {
+
+        for ( var i = 0, len = tableData.length; i < len; i++ ) {
+
+            for ( var j = 0, jlen = tableData[ i ].length; j < jlen; j++ ) {
+
+                if ( !tmp[ j ] ) {
+                    tmp[ j ] = [];
+                }
+
+                tmp[ j ][ i ] = tableData[ i ][ j ];
+
+            }
+
+        }
+
+        tableData = tmp;
+
+    }
+
+    categories = tableData[0].slice( 1 );
+
+    for ( var i = 1, data; data = tableData[ i ]; i++ ) {
+
+        series.push( {
+            name: data[ 0 ],
+            data: data.slice( 1 )
+        } );
+
+    }
+
+    return {
+        series: series,
+        categories: categories
+    };
+
+}
+
+/*
+ * 获取数据源数据对齐方式
+ */
+function getTableDataFormat () {
+
+    var form = document.forms[ 'data-form' ],
+        items = form['charts-format'];
+
+    return items[ 0 ].checked ? items[ 0 ].value : items[ 1 ].value;
+
+}
+
+/*
+ * 禁用非饼图类型的配置项
+ */
+function disableNotPieConfig() {
+
+    updateConfigItem( 'disable' );
+
+}
+
+/*
+ * 启用非饼图类型的配置项
+ */
+function enableNotPieConfig() {
+
+    updateConfigItem( 'enable' );
+
+}
+
+function updateConfigItem ( value ) {
+
+    var table = $( "#showTable" )[ 0 ],
+        isDisable = value === 'disable' ? true : false;
+
+    //table中的input处理
+    for ( var i = 2 , row; row = table.rows[ i ]; i++ ) {
+
+        for ( var j = 1, cell; cell = row.cells[ j ]; j++ ) {
+
+            $( "input", cell ).attr( "disabled", isDisable );
+
+        }
+
+    }
+
+    //其他项处理
+    $( "input.not-pie-item" ).attr( "disabled", isDisable );
+    $( "#tipInput" ).attr( "disabled", !isDisable )
+
+}
+
+/*
+ * 获取饼图数据
+ * 饼图的数据只取第一行的
+ **/
+function getSeriesForPieChart () {
+
+    var series = {
+            type: 'pie',
+            name: $("#tipInput").val(),
+            data: []
+        },
+        tableData = getTableData();
+
+
+    for ( var j = 1, jlen = tableData[ 0 ].length; j < jlen; j++ ) {
+
+        var title = tableData[ 0 ][ j ],
+            val = tableData[ 1 ][ j ];
+
+        series.data.push( [ title, val ] );
+
+    }
+
+    return {
+        series: [ series ]
+    };
+
+}
+
+function getTableData () {
+
+    var table = document.getElementById( "showTable" ),
+        xCount = table.rows[0].cells.length - 1,
+        values = getTableInputValue();
+
+    for ( var i = 0, value; value = values[ i ]; i++ ) {
+
+        tableData[ Math.floor( i / xCount ) + 1 ][ i % xCount + 1 ] = values[ i ];
+
+    }
+
+    return tableData;
+
+}
+
+function getTableInputValue () {
+
+    var table = document.getElementById( "showTable" ),
+        inputs = table.getElementsByTagName( "input" ),
+        values = [];
+
+    for ( var i = 0, input; input = inputs[ i ]; i++ ) {
+        values.push( input.value | 0 );
+    }
+
+    return values;
+
+}
+
+function getCellValue ( cell ) {
+
+    var value = utils.trim( ( cell.innerText || cell.textContent || '' ) );
+
+    return value.replace( new RegExp( UE.dom.domUtils.fillChar, 'g' ), '' ).replace( /^\s+|\s+$/g, '' );
+
+}
+
+
+//dialog确认事件
+dialog.onok = function () {
+
+    //收集信息
+    var form = document.forms[ 'data-form' ],
+        info = getUserConfig();
+
+    //添加图表类型
+    info.chartType = currentChartType;
+
+    //同步表格数据到编辑器
+    syncTableData();
+
+    //执行图表命令
+    editor.execCommand( 'charts', info );
+
+};
+
+/*
+ * 同步图表编辑视图的表格数据到编辑器里的原始表格
+ */
+function syncTableData () {
+
+    var tableData = getTableData();
+
+    for ( var i = 1, row; row = editorTable.rows[ i ]; i++ ) {
+
+        for ( var j = 1, cell; cell = row.cells[ j ]; j++ ) {
+
+            cell.innerHTML = tableData[ i ] [ j ];
+
+        }
+
+    }
+
+}
--- a/public/ueditor/dialogs/charts/images/charts0.png
+++ b/public/ueditor/dialogs/charts/images/charts0.png
--- a/public/ueditor/dialogs/charts/images/charts1.png
+++ b/public/ueditor/dialogs/charts/images/charts1.png
--- a/public/ueditor/dialogs/charts/images/charts2.png
+++ b/public/ueditor/dialogs/charts/images/charts2.png
--- a/public/ueditor/dialogs/charts/images/charts3.png
+++ b/public/ueditor/dialogs/charts/images/charts3.png
--- a/public/ueditor/dialogs/charts/images/charts4.png
+++ b/public/ueditor/dialogs/charts/images/charts4.png
--- a/public/ueditor/dialogs/charts/images/charts5.png
+++ b/public/ueditor/dialogs/charts/images/charts5.png
--- a/public/ueditor/dialogs/emotion/emotion.css
+++ b/public/ueditor/dialogs/emotion/emotion.css
@ -0,0 +1,43 @@
+.jd img{
+    background:transparent url(images/jxface2.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+.pp img{
+    background:transparent url(images/fface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:25px;height:25px;display:block;
+}
+.ldw img{
+    background:transparent url(images/wface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+.tsj img{
+    background:transparent url(images/tface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+.cat img{
+    background:transparent url(images/cface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+.bb img{
+    background:transparent url(images/bface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+.youa img{
+    background:transparent url(images/yface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.smileytable td {height: 37px;}
+#tabPanel{margin-left:5px;overflow: hidden;}
+#tabContent {float:left;background:#FFFFFF;}
+#tabContent div{display: none;width:480px;overflow:hidden;}
+#tabIconReview.show{left:17px;display:block;}
+.menuFocus{background:#ACCD3C;}
+.menuDefault{background:#FFFFFF;}
+#tabIconReview{position:absolute;left:406px;left:398px \9;top:41px;z-index:65533;width:90px;height:76px;}
+img.review{width:90px;height:76px;border:2px solid #9cb945;background:#FFFFFF;background-position:center;background-repeat:no-repeat;}
+
+.wrapper .tabbody{position:relative;float:left;clear:both;padding:10px;width: 95%;}
+.tabbody table{width: 100%;}
+.tabbody td{border:1px solid #BAC498;}
+.tabbody td span{display: block;zoom:1;padding:0 4px;}
--- a/public/ueditor/dialogs/emotion/emotion.html
+++ b/public/ueditor/dialogs/emotion/emotion.html
@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="robots" content="noindex, nofollow"/>
+    <script type="text/javascript" src="../internal.js"></script>
+    <link rel="stylesheet" type="text/css" href="emotion.css">
+</head>
+<body>
+<div id="tabPanel" class="wrapper">
+    <div id="tabHeads" class="tabhead">
+        <span><var id="lang_input_choice"></var></span>
+        <span><var id="lang_input_Tuzki"></var></span>
+        <span><var id="lang_input_lvdouwa"></var></span>
+        <span><var id="lang_input_BOBO"></var></span>
+        <span><var id="lang_input_babyCat"></var></span>
+        <span><var id="lang_input_bubble"></var></span>
+        <span><var id="lang_input_youa"></var></span>
+    </div>
+    <div id="tabBodys" class="tabbody">
+        <div id="tab0"></div>
+        <div id="tab1"></div>
+        <div id="tab2"></div>
+        <div id="tab3"></div>
+        <div id="tab4"></div>
+        <div id="tab5"></div>
+        <div id="tab6"></div>
+    </div>
+</div>
+<div id="tabIconReview">
+    <img id='faceReview' class='review' src="../../themes/default/images/spacer.gif"/>
+</div>
+<script type="text/javascript" src="emotion.js"></script>
+<script type="text/javascript">
+    var emotion = {
+        tabNum:7, //切换面板数量
+        SmilmgName:{ tab0:['j_00', 84], tab1:['t_00', 40], tab2:['w_00', 52], tab3:['B_00', 63], tab4:['C_00', 20], tab5:['i_f', 50], tab6:['y_00', 40] }, //图片前缀名
+        imageFolders:{ tab0:'jx2/', tab1:'tsj/', tab2:'ldw/', tab3:'bobo/', tab4:'babycat/', tab5:'face/', tab6:'youa/'}, //图片对应文件夹路径
+        imageCss:{tab0:'jd', tab1:'tsj', tab2:'ldw', tab3:'bb', tab4:'cat', tab5:'pp', tab6:'youa'}, //图片css类名
+        imageCssOffset:{tab0:35, tab1:35, tab2:35, tab3:35, tab4:35, tab5:25, tab6:35}, //图片偏移
+        SmileyInfor:{
+            tab0:['Kiss', 'Love', 'Yeah', '啊！', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '打酱油', '俯卧撑', '气愤', '?', '吻', '怒', '胜利', 'HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '微笑', '亲吻', '调皮', '惊恐', '耍酷', '发火', '害羞', '汗水', '大哭', '', '加油', '困', '你NB', '晕倒', '开心', '偷笑', '大哭', '滴汗', '叹气', '超赞', '??', '飞吻', '天使', '撒花', '生气', '被砸', '吓傻', '随意吐'],
+            tab1:['Kiss', 'Love', 'Yeah', '啊！', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '摊手', '睡觉', '瘫坐', '无聊', '星星闪', '旋转', '也不行', '郁闷', '正Music', '抓墙', '撞墙至死', '歪头', '戳眼', '飘过', '互相拍砖', '砍死你', '扔桌子', '少林寺', '什么？', '转头', '我爱牛奶', '我踢', '摇晃', '晕厥', '在笼子里', '震荡'],
+            tab2:['大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '我错了', 'money', '气愤', '挑逗', '吻', '怒', '胜利', '委屈', '受伤', '说啥呢？', '闭嘴', '不', '逗你玩儿', '飞吻', '眩晕', '魔法', '我来了', '睡了', '我打', '闭嘴', '打', '打晕了', '刷牙', '爆揍', '炸弹', '倒立', '刮胡子', '邪恶的笑', '不要不要', '爱恋中', '放大仔细看', '偷窥', '超高兴', '晕', '松口气', '我跑', '享受', '修养', '哭', '汗', '啊~', '热烈欢迎', '打酱油', '俯卧撑', '?'],
+            tab3:['HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '泪眼', '流泪', '生气', '吐舌', '喜欢', '旋转', '再见', '抓狂', '汗', '鄙视', '拜', '吐血', '嘘', '打人', '蹦跳', '变脸', '扯肉', '吃To', '吃花', '吹泡泡糖', '大变身', '飞天舞', '回眸', '可怜', '猛抽', '泡泡', '苹果', '亲', '', '骚舞', '烧香', '睡', '套娃娃', '捅捅', '舞倒', '西红柿', '爱慕', '摇', '摇摆', '杂耍', '招财', '被殴', '被球闷', '大惊', '理想', '欧打', '呕吐', '碎', '吐痰'],
+            tab4:['发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '顶', '幸运', '爱心', '躲', '送花', '选择'],
+            tab5:['微笑', '亲吻', '调皮', '惊讶', '耍酷', '发火', '害羞', '汗水', '大哭', '得意', '鄙视', '困', '夸奖', '晕倒', '疑问', '媒婆', '狂吐', '青蛙', '发愁', '亲吻', '', '爱心', '心碎', '玫瑰', '礼物', '哭', '奸笑', '可爱', '得意', '呲牙', '暴汗', '楚楚可怜', '困', '哭', '生气', '惊讶', '口水', '彩虹', '夜空', '太阳', '钱钱', '灯泡', '咖啡', '蛋糕', '音乐', '爱', '胜利', '赞', '鄙视', 'OK'],
+            tab6:['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '天使', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
+        }
+    };
+</script>
+</body>
+</html>
--- a/public/ueditor/dialogs/emotion/emotion.js
+++ b/public/ueditor/dialogs/emotion/emotion.js
@ -0,0 +1,186 @@
+window.onload = function () {
+    editor.setOpt({
+        emotionLocalization:false
+    });
+
+    emotion.SmileyPath = editor.options.emotionLocalization === true ? 'images/' : "http://img.baidu.com/hi/";
+    emotion.SmileyBox = createTabList( emotion.tabNum );
+    emotion.tabExist = createArr( emotion.tabNum );
+
+    initImgName();
+    initEvtHandler( "tabHeads" );
+};
+
+function initImgName() {
+    for ( var pro in emotion.SmilmgName ) {
+        var tempName = emotion.SmilmgName[pro],
+                tempBox = emotion.SmileyBox[pro],
+                tempStr = "";
+
+        if ( tempBox.length ) return;
+        for ( var i = 1; i <= tempName[1]; i++ ) {
+            tempStr = tempName[0];
+            if ( i < 10 ) tempStr = tempStr + '0';
+            tempStr = tempStr + i + '.gif';
+            tempBox.push( tempStr );
+        }
+    }
+}
+
+function initEvtHandler( conId ) {
+    var tabHeads = $G( conId );
+    for ( var i = 0, j = 0; i < tabHeads.childNodes.length; i++ ) {
+        var tabObj = tabHeads.childNodes[i];
+        if ( tabObj.nodeType == 1 ) {
+            domUtils.on( tabObj, "click", (function ( index ) {
+                return function () {
+                    switchTab( index );
+                };
+            })( j ) );
+            j++;
+        }
+    }
+    switchTab( 0 );
+    $G( "tabIconReview" ).style.display = 'none';
+}
+
+function InsertSmiley( url, evt ) {
+    var obj = {
+        src:editor.options.emotionLocalization ? editor.options.UEDITOR_HOME_URL + "dialogs/emotion/" + url : url
+    };
+    obj._src = obj.src;
+    editor.execCommand( 'insertimage', obj );
+    if ( !evt.ctrlKey ) {
+        dialog.popup.hide();
+    }
+}
+
+function switchTab( index ) {
+
+    autoHeight( index );
+    if ( emotion.tabExist[index] == 0 ) {
+        emotion.tabExist[index] = 1;
+        createTab( 'tab' + index );
+    }
+    //获取呈现元素句柄数组
+    var tabHeads = $G( "tabHeads" ).getElementsByTagName( "span" ),
+            tabBodys = $G( "tabBodys" ).getElementsByTagName( "div" ),
+            i = 0, L = tabHeads.length;
+    //隐藏所有呈现元素
+    for ( ; i < L; i++ ) {
+        tabHeads[i].className = "";
+        tabBodys[i].style.display = "none";
+    }
+    //显示对应呈现元素
+    tabHeads[index].className = "focus";
+    tabBodys[index].style.display = "block";
+}
+
+function autoHeight( index ) {
+    var iframe = dialog.getDom( "iframe" ),
+            parent = iframe.parentNode.parentNode;
+    switch ( index ) {
+        case 0:
+            iframe.style.height = "380px";
+            parent.style.height = "392px";
+            break;
+        case 1:
+            iframe.style.height = "220px";
+            parent.style.height = "232px";
+            break;
+        case 2:
+            iframe.style.height = "260px";
+            parent.style.height = "272px";
+            break;
+        case 3:
+            iframe.style.height = "300px";
+            parent.style.height = "312px";
+            break;
+        case 4:
+            iframe.style.height = "140px";
+            parent.style.height = "152px";
+            break;
+        case 5:
+            iframe.style.height = "260px";
+            parent.style.height = "272px";
+            break;
+        case 6:
+            iframe.style.height = "230px";
+            parent.style.height = "242px";
+            break;
+        default:
+
+    }
+}
+
+
+function createTab( tabName ) {
+    var faceVersion = "?v=1.1", //版本号
+            tab = $G( tabName ), //获取将要生成的Div句柄
+            imagePath = emotion.SmileyPath + emotion.imageFolders[tabName], //获取显示表情和预览表情的路径
+            positionLine = 11 / 2, //中间数
+            iWidth = iHeight = 35, //图片长宽
+            iColWidth = 3, //表格剩余空间的显示比例
+            tableCss = emotion.imageCss[tabName],
+            cssOffset = emotion.imageCssOffset[tabName],
+            textHTML = ['<table class="smileytable">'],
+            i = 0, imgNum = emotion.SmileyBox[tabName].length, imgColNum = 11, faceImage,
+            sUrl, realUrl, posflag, offset, infor;
+
+    for ( ; i < imgNum; ) {
+        textHTML.push( '<tr>' );
+        for ( var j = 0; j < imgColNum; j++, i++ ) {
+            faceImage = emotion.SmileyBox[tabName][i];
+            if ( faceImage ) {
+                sUrl = imagePath + faceImage + faceVersion;
+                realUrl = imagePath + faceImage;
+                posflag = j < positionLine ? 0 : 1;
+                offset = cssOffset * i * (-1) - 1;
+                infor = emotion.SmileyInfor[tabName][i];
+
+                textHTML.push( '<td  class="' + tableCss + '"   border="1" width="' + iColWidth + '%" style="border-collapse:collapse;" align="center"  bgcolor="transparent" onclick="InsertSmiley(\'' + realUrl.replace( /'/g, "\\'" ) + '\',event)" onmouseover="over(this,\'' + sUrl + '\',\'' + posflag + '\')" onmouseout="out(this)">' );
+                textHTML.push( '<span>' );
+                textHTML.push( '<img  style="background-position:left ' + offset + 'px;" title="' + infor + '" src="' + emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif" width="' : 'default/0.gif" width="') + iWidth + '" height="' + iHeight + '"></img>' );
+                textHTML.push( '</span>' );
+            } else {
+                textHTML.push( '<td width="' + iColWidth + '%"   bgcolor="#FFFFFF">' );
+            }
+            textHTML.push( '</td>' );
+        }
+        textHTML.push( '</tr>' );
+    }
+    textHTML.push( '</table>' );
+    textHTML = textHTML.join( "" );
+    tab.innerHTML = textHTML;
+}
+
+function over( td, srcPath, posFlag ) {
+    td.style.backgroundColor = "#ACCD3C";
+    $G( 'faceReview' ).style.backgroundImage = "url(" + srcPath + ")";
+    if ( posFlag == 1 ) $G( "tabIconReview" ).className = "show";
+    $G( "tabIconReview" ).style.display = 'block';
+}
+
+function out( td ) {
+    td.style.backgroundColor = "transparent";
+    var tabIconRevew = $G( "tabIconReview" );
+    tabIconRevew.className = "";
+    tabIconRevew.style.display = 'none';
+}
+
+function createTabList( tabNum ) {
+    var obj = {};
+    for ( var i = 0; i < tabNum; i++ ) {
+        obj["tab" + i] = [];
+    }
+    return obj;
+}
+
+function createArr( tabNum ) {
+    var arr = [];
+    for ( var i = 0; i < tabNum; i++ ) {
+        arr[i] = 0;
+    }
+    return arr;
+}
+
--- a/public/ueditor/dialogs/emotion/images/0.gif
+++ b/public/ueditor/dialogs/emotion/images/0.gif
--- a/public/ueditor/dialogs/emotion/images/bface.gif
+++ b/public/ueditor/dialogs/emotion/images/bface.gif
--- a/public/ueditor/dialogs/emotion/images/cface.gif
+++ b/public/ueditor/dialogs/emotion/images/cface.gif
--- a/public/ueditor/dialogs/emotion/images/fface.gif
+++ b/public/ueditor/dialogs/emotion/images/fface.gif
--- a/public/ueditor/dialogs/emotion/images/jxface2.gif
+++ b/public/ueditor/dialogs/emotion/images/jxface2.gif
--- a/public/ueditor/dialogs/emotion/images/neweditor-tab-bg.png
+++ b/public/ueditor/dialogs/emotion/images/neweditor-tab-bg.png
--- a/public/ueditor/dialogs/emotion/images/tface.gif
+++ b/public/ueditor/dialogs/emotion/images/tface.gif
--- a/public/ueditor/dialogs/emotion/images/wface.gif
+++ b/public/ueditor/dialogs/emotion/images/wface.gif
--- a/public/ueditor/dialogs/emotion/images/yface.gif
+++ b/public/ueditor/dialogs/emotion/images/yface.gif
--- a/public/ueditor/dialogs/gmap/gmap.html
+++ b/public/ueditor/dialogs/gmap/gmap.html
@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title></title>
+    <script type="text/javascript" src="../internal.js"></script>
+    <style type="text/css">
+        .content{width:530px; height: 350px;margin: 10px auto;}
+        .content table{width: 100%}
+        .content table td{vertical-align: middle;}
+        #address{width:220px;height:21px;background: #FFF;border:1px solid #d7d7d7; line-height: 21px;}
+    </style>
+    <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
+</head>
+<body>
+<div class="content">
+    <table>
+        <tr>
+            <td><label for="address"><var id="lang_input_address"></var></label></td>
+            <td><input id="address" type="text" /></td>
+            <td><a id="doSearch" href="javascript:void(0)" class="button"><var id="lang_input_search"></var></a></td>
+        </tr>
+    </table>
+    <div id="container" style="width: 100%; height: 340px;margin: 5px auto; border: 1px solid gray;"></div>
+</div>
+<script type="text/javascript">
+    domUtils.on(window,"load",function(){
+        var map = new google.maps.Map(document.getElementById('container'), {
+                zoom: 3,
+                streetViewControl: false,
+                scaleControl: true,
+                mapTypeId: google.maps.MapTypeId.ROADMAP
+            });
+            var imgcss;
+            var marker = new google.maps.Marker({
+                map: map,
+                draggable: true
+            });
+            function doSearch(){
+                var address = document.getElementById('address').value;
+                var geocoder = new google.maps.Geocoder();
+                geocoder.geocode( { 'address': address}, function (results, status) {
+                    if (status == google.maps.GeocoderStatus.OK) {
+                        var bounds = results[0].geometry.viewport;
+                        map.fitBounds(bounds);
+                        marker.setPosition(results[0].geometry.location);
+                        marker.setTitle(address);
+                    } else alert(lang.searchError);
+                });
+            }
+            $G('address').onkeydown = function (evt){
+                evt = evt || event;
+                if (evt.keyCode == 13) {
+                    doSearch();
+                }
+            };
+            $G("doSearch").onclick = doSearch;
+            dialog.onok = function (){
+                var center = map.getCenter();
+                var point = marker.getPosition();
+                var url = "http://maps.googleapis.com/maps/api/staticmap?center=" + center.lat() + ',' + center.lng() + "&zoom=" + map.zoom + "&size=520x340&maptype=" + map.getMapTypeId() + "&markers=" + point.lat() + ',' + point.lng() + "&sensor=false";
+                editor.execCommand('inserthtml', '<img width="520" height="340" src="' + url + '"' + (imgcss ? ' style="' + imgcss + '"' :'') + '/>');
+            };
+
+            function getPars(str,par){
+                var reg = new RegExp(par+"=((\\d+|[.,])*)","g");
+                return reg.exec(str)[1];
+            }
+            var img = editor.selection.getRange().getClosedNode();
+            if(img && img.src.indexOf("http://maps.googleapis.com/maps/api/staticmap")!=-1){
+                var url = img.getAttribute("src");
+                var centers = getPars(url,"center").split(",");
+                point = new google.maps.LatLng(Number(centers[0]),Number(centers[1]));
+                map.setCenter(point);
+                map.setZoom(Number(getPars(url,"zoom")));
+                centers = getPars(url,"markers").split(",");
+                marker.setPosition(new google.maps.LatLng(Number(centers[0]),Number(centers[1])));
+                imgcss = img.style.cssText;
+            }else{
+                setTimeout(function(){
+                    doSearch();
+                },30)
+            }
+    });
+
+</script>
+</body>
+</html>
--- a/public/ueditor/dialogs/help/help.css
+++ b/public/ueditor/dialogs/help/help.css
@ -0,0 +1,7 @@
+.wrapper{width: 370px;margin: 10px auto;zoom: 1;}
+.tabbody{height: 360px;}
+.tabbody .panel{width:100%;height: 360px;position: absolute;background: #fff;}
+.tabbody .panel h1{font-size:26px;margin: 5px 0 0 5px;}
+.tabbody .panel p{font-size:12px;margin: 5px 0 0 5px;}
+.tabbody table{width:90%;line-height: 20px;margin: 5px 0 0 5px;;}
+.tabbody table thead{font-weight: bold;line-height: 25px;}
--- a/public/ueditor/dialogs/help/help.html
+++ b/public/ueditor/dialogs/help/help.html
@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>帮助</title>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <script type="text/javascript" src="../internal.js"></script>
+    <link rel="stylesheet" type="text/css" href="help.css">
+</head>
+<body>
+<div class="wrapper" id="helptab">
+    <div id="tabHeads" class="tabhead">
+        <span class="focus" tabsrc="about"><var id="lang_input_about"></var></span>
+        <span tabsrc="shortcuts"><var id="lang_input_shortcuts"></var></span>
+    </div>
+    <div id="tabBodys" class="tabbody">
+        <div id="about" class="panel">
+            <h1>UEditor</h1>
+            <p id="version"></p>
+            <p><var id="lang_input_introduction"></var></p>
+        </div>
+        <div id="shortcuts" class="panel">
+            <table>
+                <thead>
+                <tr>
+                    <td><var id="lang_Txt_shortcuts"></var></td>
+                    <td><var id="lang_Txt_func"></var></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>ctrl+b</td>
+                    <td><var id="lang_Txt_bold"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+c</td>
+                    <td><var id="lang_Txt_copy"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+x</td>
+                    <td><var id="lang_Txt_cut"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+v</td>
+                    <td><var id="lang_Txt_Paste"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+y</td>
+                    <td><var id="lang_Txt_undo"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+z</td>
+                    <td><var id="lang_Txt_redo"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+i</td>
+                    <td><var id="lang_Txt_italic"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+u</td>
+                    <td><var id="lang_Txt_underline"></var></td>
+                </tr>
+                <tr>
+                    <td>ctrl+a</td>
+                    <td><var id="lang_Txt_selectAll"></var></td>
+                </tr>
+                <tr>
+                    <td>shift+enter</td>
+                    <td><var id="lang_Txt_visualEnter"></var></td>
+                </tr>
+                <tr>
+                    <td>alt+z</td>
+                    <td><var id="lang_Txt_fullscreen"></var></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" src="help.js"></script>
+</body>
+</html>
--- a/public/ueditor/dialogs/help/help.js
+++ b/public/ueditor/dialogs/help/help.js
@ -0,0 +1,56 @@
+/**
+ * Created with JetBrains PhpStorm.
+ * User: xuheng
+ * Date: 12-9-26
+ * Time: 下午1:06
+ * To change this template use File | Settings | File Templates.
+ */
+/**
+ * tab点击处理事件
+ * @param tabHeads
+ * @param tabBodys
+ * @param obj
+ */
+function clickHandler( tabHeads,tabBodys,obj ) {
+    //head样式更改
+    for ( var k = 0, len = tabHeads.length; k < len; k++ ) {
+        tabHeads[k].className = "";
+    }
+    obj.className = "focus";
+    //body显隐
+    var tabSrc = obj.getAttribute( "tabSrc" );
+    for ( var j = 0, length = tabBodys.length; j < length; j++ ) {
+        var body = tabBodys[j],
+            id = body.getAttribute( "id" );
+        body.onclick = function(){
+            this.style.zoom = 1;
+        };
+        if ( id != tabSrc ) {
+            body.style.zIndex = 1;
+        } else {
+            body.style.zIndex = 200;
+        }
+    }
+
+}
+
+/**
+ * TAB切换
+ * @param tabParentId  tab的父节点ID或者对象本身
+ */
+function switchTab( tabParentId ) {
+    var tabElements = $G( tabParentId ).children,
+        tabHeads = tabElements[0].children,
+        tabBodys = tabElements[1].children;
+
+    for ( var i = 0, length = tabHeads.length; i < length; i++ ) {
+        var head = tabHeads[i];
+        if ( head.className === "focus" )clickHandler(tabHeads,tabBodys, head );
+        head.onclick = function () {
+            clickHandler(tabHeads,tabBodys,this);
+        }
+    }
+}
+switchTab("helptab");
+
+document.getElementById('version').innerHTML = parent.UE.version;
--- a/public/ueditor/dialogs/image/image.css
+++ b/public/ueditor/dialogs/image/image.css
@ -0,0 +1,894 @@
+@charset "utf-8";
+/* dialog样式 */
+.wrapper {
+    zoom: 1;
+    width: 630px;
+    *width: 626px;
+    height: 380px;
+    margin: 0 auto;
+    padding: 10px;
+    position: relative;
+    font-family: sans-serif;
+}
+
+/*tab样式框大小*/
+.tabhead {
+    float:left;
+}
+.tabbody {
+    width: 100%;
+    height: 346px;
+    position: relative;
+    clear: both;
+}
+
+.tabbody .panel {
+    position: absolute;
+    width: 0;
+    height: 0;
+    background: #fff;
+    overflow: hidden;
+    display: none;
+}
+
+.tabbody .panel.focus {
+    width: 100%;
+    height: 346px;
+    display: block;
+}
+
+/* 图片对齐方式 */
+.alignBar{
+    float:right;
+    margin-top: 5px;
+    position: relative;
+}
+
+.alignBar .algnLabel{
+    float:left;
+    height: 20px;
+    line-height: 20px;
+}
+
+.alignBar #alignIcon{
+    zoom:1;
+    _display: inline;
+    display: inline-block;
+    position: relative;
+}
+.alignBar #alignIcon span{
+    float: left;
+    cursor: pointer;
+    display: block;
+    width: 19px;
+    height: 17px;
+    margin-right: 3px;
+    margin-left: 3px;
+    background-image: url(./images/alignicon.jpg);
+}
+.alignBar #alignIcon .none-align{
+    background-position: 0 -18px;
+}
+.alignBar #alignIcon .left-align{
+    background-position: -20px -18px;
+}
+.alignBar #alignIcon .right-align{
+    background-position: -40px -18px;
+}
+.alignBar #alignIcon .center-align{
+    background-position: -60px -18px;
+}
+.alignBar #alignIcon .none-align.focus{
+    background-position: 0 0;
+}
+.alignBar #alignIcon .left-align.focus{
+    background-position: -20px 0;
+}
+.alignBar #alignIcon .right-align.focus{
+    background-position: -40px 0;
+}
+.alignBar #alignIcon .center-align.focus{
+    background-position: -60px 0;
+}
+
+
+
+
+/* 远程图片样式 */
+#remote {
+    z-index: 200;
+}
+
+#remote .top{
+    width: 100%;
+    margin-top: 25px;
+}
+#remote .left{
+    display: block;
+    float: left;
+    width: 300px;
+    height:10px;
+}
+#remote .right{
+    display: block;
+    float: right;
+    width: 300px;
+    height:10px;
+}
+#remote .row{
+    margin-left: 20px;
+    clear: both;
+    height: 40px;
+}
+
+#remote .row label{
+    text-align: center;
+    width: 50px;
+    zoom:1;
+    _display: inline;
+    display:inline-block;
+    vertical-align: middle;
+}
+#remote .row label.algnLabel{
+    float: left;
+
+}
+
+#remote input.text{
+    width: 150px;
+    padding: 3px 6px;
+    font-size: 14px;
+    line-height: 1.42857143;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+#remote input.text:focus {
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+}
+#remote #url{
+    width: 500px;
+    margin-bottom: 2px;
+}
+#remote #width,
+#remote #height{
+    width: 20px;
+    margin-left: 2px;
+    margin-right: 2px;
+}
+#remote #border,
+#remote #vhSpace,
+#remote #title{
+    width: 180px;
+    margin-right: 5px;
+}
+#remote #lock{
+}
+#remote #lockicon{
+    zoom: 1;
+    _display:inline;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background: url("../../themes/default/images/lock.gif") -13px -13px no-repeat;
+    vertical-align: middle;
+}
+#remote #preview{
+    clear: both;
+    width: 260px;
+    height: 240px;
+    z-index: 9999;
+    margin-top: 10px;
+    background-color: #eee;
+    overflow: hidden;
+}
+
+/* 上传图片 */
+.tabbody #upload.panel {
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+    background: #fff;
+    display: block;
+}
+
+.tabbody #upload.panel.focus {
+    width: 100%;
+    height: 346px;
+    display: block;
+    clip: auto;
+}
+
+#upload .queueList {
+    margin: 0;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    overflow: hidden;
+}
+
+#upload p {
+    margin: 0;
+}
+
+.element-invisible {
+    width: 0 !important;
+    height: 0 !important;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    overflow: hidden;
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+}
+
+#upload .placeholder {
+    margin: 10px;
+    border: 2px dashed #e6e6e6;
+    *border: 0px dashed #e6e6e6;
+    height: 172px;
+    padding-top: 150px;
+    text-align: center;
+    background: url(./images/image.png) center 70px no-repeat;
+    color: #cccccc;
+    font-size: 18px;
+    position: relative;
+    top:0;
+    *top: 10px;
+}
+
+#upload .placeholder .webuploader-pick {
+    font-size: 18px;
+    background: #00b7ee;
+    border-radius: 3px;
+    line-height: 44px;
+    padding: 0 30px;
+    *width: 120px;
+    color: #fff;
+    display: inline-block;
+    margin: 0 auto 20px auto;
+    cursor: pointer;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+#upload .placeholder .webuploader-pick-hover {
+    background: #00a2d4;
+}
+
+
+#filePickerContainer {
+    text-align: center;
+}
+
+#upload .placeholder .flashTip {
+    color: #666666;
+    font-size: 12px;
+    position: absolute;
+    width: 100%;
+    text-align: center;
+    bottom: 20px;
+}
+
+#upload .placeholder .flashTip a {
+    color: #0785d1;
+    text-decoration: none;
+}
+
+#upload .placeholder .flashTip a:hover {
+    text-decoration: underline;
+}
+
+#upload .placeholder.webuploader-dnd-over {
+    border-color: #999999;
+}
+
+#upload .filelist {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+    position: relative;
+    height: 300px;
+}
+
+#upload .filelist:after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    clear: both;
+    position: relative;
+}
+
+#upload .filelist li {
+    width: 113px;
+    height: 113px;
+    background: url(./images/bg.png);
+    text-align: center;
+    margin: 9px 0 0 9px;
+    *margin: 6px 0 0 6px;
+    position: relative;
+    display: block;
+    float: left;
+    overflow: hidden;
+    font-size: 12px;
+}
+
+#upload .filelist li p.log {
+    position: relative;
+    top: -45px;
+}
+
+#upload .filelist li p.title {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    top: 5px;
+    text-indent: 5px;
+    text-align: left;
+}
+
+#upload .filelist li p.progress {
+    position: absolute;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    height: 8px;
+    overflow: hidden;
+    z-index: 50;
+    margin: 0;
+    border-radius: 0;
+    background: none;
+    -webkit-box-shadow: 0 0 0;
+}
+
+#upload .filelist li p.progress span {
+    display: none;
+    overflow: hidden;
+    width: 0;
+    height: 100%;
+    background: #1483d8 url(./images/progress.png) repeat-x;
+
+    -webit-transition: width 200ms linear;
+    -moz-transition: width 200ms linear;
+    -o-transition: width 200ms linear;
+    -ms-transition: width 200ms linear;
+    transition: width 200ms linear;
+
+    -webkit-animation: progressmove 2s linear infinite;
+    -moz-animation: progressmove 2s linear infinite;
+    -o-animation: progressmove 2s linear infinite;
+    -ms-animation: progressmove 2s linear infinite;
+    animation: progressmove 2s linear infinite;
+
+    -webkit-transform: translateZ(0);
+}
+
+@-webkit-keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+@-moz-keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+@keyframes progressmove {
+    0% {
+        background-position: 0 0;
+    }
+    100% {
+        background-position: 17px 0;
+    }
+}
+
+#upload .filelist li p.imgWrap {
+    position: relative;
+    z-index: 2;
+    line-height: 113px;
+    vertical-align: middle;
+    overflow: hidden;
+    width: 113px;
+    height: 113px;
+
+    -webkit-transform-origin: 50% 50%;
+    -moz-transform-origin: 50% 50%;
+    -o-transform-origin: 50% 50%;
+    -ms-transform-origin: 50% 50%;
+    transform-origin: 50% 50%;
+
+    -webit-transition: 200ms ease-out;
+    -moz-transition: 200ms ease-out;
+    -o-transition: 200ms ease-out;
+    -ms-transition: 200ms ease-out;
+    transition: 200ms ease-out;
+}
+
+#upload .filelist li img {
+    width: 100%;
+}
+
+#upload .filelist li p.error {
+    background: #f43838;
+    color: #fff;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 28px;
+    line-height: 28px;
+    width: 100%;
+    z-index: 100;
+    display:none;
+}
+
+#upload .filelist li .success {
+    display: block;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    height: 40px;
+    width: 100%;
+    z-index: 200;
+    background: url(./images/success.png) no-repeat right bottom;
+    background: url(./images/success.gif) no-repeat right bottom \9;
+}
+
+#upload .filelist li.filePickerBlock {
+    width: 113px;
+    height: 113px;
+    background: url(./images/image.png) no-repeat center 12px;
+    border: 1px solid #eeeeee;
+    border-radius: 0;
+}
+#upload .filelist li.filePickerBlock div.webuploader-pick  {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    opacity: 0;
+    background: none;
+    font-size: 0;
+}
+
+#upload .filelist div.file-panel {
+    position: absolute;
+    height: 0;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#80000000', endColorstr='#80000000') \0;
+    background: rgba(0, 0, 0, 0.5);
+    width: 100%;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    z-index: 300;
+}
+
+#upload .filelist div.file-panel span {
+    width: 24px;
+    height: 24px;
+    display: inline;
+    float: right;
+    text-indent: -9999px;
+    overflow: hidden;
+    background: url(./images/icons.png) no-repeat;
+    background: url(./images/icons.gif) no-repeat \9;
+    margin: 5px 1px 1px;
+    cursor: pointer;
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+#upload .filelist div.file-panel span.rotateLeft {
+    display:none;
+    background-position: 0 -24px;
+}
+
+#upload .filelist div.file-panel span.rotateLeft:hover {
+    background-position: 0 0;
+}
+
+#upload .filelist div.file-panel span.rotateRight {
+    display:none;
+    background-position: -24px -24px;
+}
+
+#upload .filelist div.file-panel span.rotateRight:hover {
+    background-position: -24px 0;
+}
+
+#upload .filelist div.file-panel span.cancel {
+    background-position: -48px -24px;
+}
+
+#upload .filelist div.file-panel span.cancel:hover {
+    background-position: -48px 0;
+}
+
+#upload .statusBar {
+    height: 45px;
+    border-bottom: 1px solid #dadada;
+    margin: 0 10px;
+    padding: 0;
+    line-height: 45px;
+    vertical-align: middle;
+    position: relative;
+}
+
+#upload .statusBar .progress {
+    border: 1px solid #1483d8;
+    width: 198px;
+    background: #fff;
+    height: 18px;
+    position: absolute;
+    top: 12px;
+    display: none;
+    text-align: center;
+    line-height: 18px;
+    color: #6dbfff;
+    margin: 0 10px 0 0;
+}
+#upload .statusBar .progress span.percentage {
+    width: 0;
+    height: 100%;
+    left: 0;
+    top: 0;
+    background: #1483d8;
+    position: absolute;
+}
+#upload .statusBar .progress span.text {
+    position: relative;
+    z-index: 10;
+}
+
+#upload .statusBar .info {
+    display: inline-block;
+    font-size: 14px;
+    color: #666666;
+}
+
+#upload .statusBar .btns {
+    position: absolute;
+    top: 7px;
+    right: 0;
+    line-height: 30px;
+}
+
+#filePickerBtn {
+    display: inline-block;
+    float: left;
+}
+#upload .statusBar .btns .webuploader-pick,
+#upload .statusBar .btns .uploadBtn,
+#upload .statusBar .btns .uploadBtn.state-uploading,
+#upload .statusBar .btns .uploadBtn.state-paused {
+    background: #ffffff;
+    border: 1px solid #cfcfcf;
+    color: #565656;
+    padding: 0 18px;
+    display: inline-block;
+    border-radius: 3px;
+    margin-left: 10px;
+    cursor: pointer;
+    font-size: 14px;
+    float: left;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+#upload .statusBar .btns .webuploader-pick-hover,
+#upload .statusBar .btns .uploadBtn:hover,
+#upload .statusBar .btns .uploadBtn.state-uploading:hover,
+#upload .statusBar .btns .uploadBtn.state-paused:hover {
+    background: #f0f0f0;
+}
+
+#upload .statusBar .btns .uploadBtn,
+#upload .statusBar .btns .uploadBtn.state-paused{
+    background: #00b7ee;
+    color: #fff;
+    border-color: transparent;
+}
+#upload .statusBar .btns .uploadBtn:hover,
+#upload .statusBar .btns .uploadBtn.state-paused:hover{
+    background: #00a2d4;
+}
+
+#upload .statusBar .btns .uploadBtn.disabled {
+    pointer-events: none;
+    filter:alpha(opacity=60);
+    -moz-opacity:0.6;
+    -khtml-opacity: 0.6;
+    opacity: 0.6;
+}
+
+
+
+/* 图片管理样式 */
+#online {
+    width: 100%;
+    height: 336px;
+    padding: 10px 0 0 0;
+}
+#online #imageList{
+    width: 100%;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    position: relative;
+}
+#online ul {
+    display: block;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#online li {
+    float: left;
+    display: block;
+    list-style: none;
+    padding: 0;
+    width: 113px;
+    height: 113px;
+    margin: 0 0 9px 9px;
+    *margin: 0 0 6px 6px;
+    background-color: #eee;
+    overflow: hidden;
+    cursor: pointer;
+    position: relative;
+}
+#online li.clearFloat {
+    float: none;
+    clear: both;
+    display: block;
+    width:0;
+    height:0;
+    margin: 0;
+    padding: 0;
+}
+#online li img {
+    cursor: pointer;
+}
+#online li .icon {
+    cursor: pointer;
+    width: 113px;
+    height: 113px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    border: 0;
+    background-repeat: no-repeat;
+}
+#online li .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+}
+#online li.selected .icon {
+    background-image: url(images/success.png);
+    background-image: url(images/success.gif)\9;
+    background-position: 75px 75px;
+}
+#online li.selected .icon:hover {
+    width: 107px;
+    height: 107px;
+    border: 3px solid #1094fa;
+    background-position: 72px 72px;
+}
+
+
+/* 图片搜索样式 */
+#search .searchBar {
+    width: 100%;
+    height: 30px;
+    margin: 10px 0 5px 0;
+    padding: 0;
+}
+
+#search input.text{
+    width: 150px;
+    padding: 3px 6px;
+    font-size: 14px;
+    line-height: 1.42857143;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+#search input.text:focus {
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+}
+#search input.searchTxt {
+    margin-left:5px;
+    padding-left: 5px;
+    background: #FFF;
+    width: 300px;
+    *width: 260px;
+    height: 21px;
+    line-height: 21px;
+    float: left;
+    dislay: block;
+}
+
+#search .searchType {
+    width: 65px;
+    height: 28px;
+    padding:0;
+    line-height: 28px;
+    border: 1px solid #d7d7d7;
+    border-radius: 0;
+    vertical-align: top;
+    margin-left: 5px;
+    float: left;
+    dislay: block;
+}
+
+#search #searchBtn,
+#search #searchReset {
+    display: inline-block;
+    margin-bottom: 0;
+    margin-right: 5px;
+    padding: 4px 10px;
+    font-weight: 400;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    background-image: none;
+    border: 1px solid transparent;
+    white-space: nowrap;
+    font-size: 14px;
+    border-radius: 4px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    vertical-align: top;
+    float: right;
+}
+
+#search #searchBtn {
+    color: white;
+    border-color: #285e8e;
+    background-color: #3b97d7;
+}
+#search #searchReset {
+    color: #333;
+    border-color: #ccc;
+    background-color: #fff;
+}
+#search #searchBtn:hover {
+    background-color: #3276b1;
+}
+#search #searchReset:hover {
+    background-color: #eee;
+}
+
+#search .msg {
+    margin-left: 5px;
+}
+
+#search .searchList{
+    width: 100%;
+    height: 300px;
+    overflow: hidden;
+    clear: both;
+}
+#search .searchList ul{
+    margin:0;
+    padding:0;
+    list-style:none;
+    clear: both;
+    width: 100%;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    zoom: 1;
+    position: relative;
+}
+
+#search .searchList li {
+    list-style:none;
+    float: left;
+    display: block;
+    width: 115px;
+    margin: 5px 10px 5px 20px;
+    *margin: 5px 10px 5px 15px;
+    padding:0;
+    font-size: 12px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
+    -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
+    position: relative;
+    vertical-align: top;
+    text-align: center;
+    overflow: hidden;
+    cursor: pointer;
+    filter: alpha(Opacity=100);
+    -moz-opacity: 1;
+    opacity: 1;
+    border: 2px solid #eee;
+}
+
+#search .searchList li.selected {
+    filter: alpha(Opacity=40);
+    -moz-opacity: 0.4;
+    opacity: 0.4;
+    border: 2px solid #00a0e9;
+}
+
+#search .searchList li p {
+    background-color: #eee;
+    margin: 0;
+    padding: 0;
+    position: relative;
+    width:100%;
+    height:115px;
+    overflow: hidden;
+}
+
+#search .searchList li p img {
+    cursor: pointer;
+    border: 0;
+}
+
+#search .searchList li a {
+    color: #999;
+    border-top: 1px solid #F2F2F2;
+    background: #FAFAFA;
+    text-align: center;
+    display: block;
+    padding: 0 5px;
+    width: 105px;
+    height:32px;
+    line-height:32px;
+    white-space:nowrap;
+    text-overflow:ellipsis;
+    text-decoration: none;
+    overflow: hidden;
+    word-break: break-all;
+}
+
+#search .searchList a:hover {
+    text-decoration: underline;
+    color: #333;
+}
+#search .searchList .clearFloat{
+    clear: both;
+}
--- a/public/ueditor/dialogs/image/image.html
+++ b/public/ueditor/dialogs/image/image.html
@ -0,0 +1,120 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>ueditor图片对话框</title>
+    <script type="text/javascript" src="../internal.js"></script>
+
+    <!-- jquery -->
+    <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
+
+    <!-- webuploader -->
+    <script src="../../third-party/webuploader/webuploader.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css">
+
+    <!-- image dialog -->
+    <link rel="stylesheet" href="image.css" type="text/css" />
+</head>
+<body>
+
+    <div class="wrapper">
+        <div id="tabhead" class="tabhead">
+            <span class="tab" data-content-id="remote"><var id="lang_tab_remote"></var></span>
+            <span class="tab focus" data-content-id="upload"><var id="lang_tab_upload"></var></span>
+            <span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>
+            <span class="tab" data-content-id="search"><var id="lang_tab_search"></var></span>
+        </div>
+        <div class="alignBar">
+            <label class="algnLabel"><var id="lang_input_align"></var></label>
+                    <span id="alignIcon">
+                        <span id="noneAlign" class="none-align focus" data-align="none"></span>
+                        <span id="leftAlign" class="left-align" data-align="left"></span>
+                        <span id="rightAlign" class="right-align" data-align="right"></span>
+                        <span id="centerAlign" class="center-align" data-align="center"></span>
+                    </span>
+            <input id="align" name="align" type="hidden" value="none"/>
+        </div>
+        <div id="tabbody" class="tabbody">
+
+            <!-- 远程图片 -->
+            <div id="remote" class="panel">
+                <div class="top">
+                    <div class="row">
+                        <label for="url"><var id="lang_input_url"></var></label>
+                        <span><input class="text" id="url" type="text"/></span>
+                    </div>
+                </div>
+                <div class="left">
+                    <div class="row">
+                        <label><var id="lang_input_size"></var></label>
+                        <span><var id="lang_input_width">&nbsp;&nbsp;</var><input class="text" type="text" id="width"/>px </span>
+                        <span><var id="lang_input_height">&nbsp;&nbsp;</var><input class="text" type="text" id="height"/>px </span>
+                        <span><input id="lock" type="checkbox" disabled="disabled"><span id="lockicon"></span></span>
+                    </div>
+                    <div class="row">
+                        <label><var id="lang_input_border"></var></label>
+                        <span><input class="text" type="text" id="border"/>px </span>
+                    </div>
+                    <div class="row">
+                        <label><var id="lang_input_vhspace"></var></label>
+                        <span><input class="text" type="text" id="vhSpace"/>px </span>
+                    </div>
+                    <div class="row">
+                        <label><var id="lang_input_title"></var></label>
+                        <span><input class="text" type="text" id="title"/></span>
+                    </div>
+                </div>
+                <div class="right"><div id="preview"></div></div>
+            </div>
+
+            <!-- 上传图片 -->
+            <div id="upload" class="panel focus">
+                <div id="queueList" class="queueList">
+                    <div class="statusBar element-invisible">
+                        <div class="progress">
+                            <span class="text">0%</span>
+                            <span class="percentage"></span>
+                        </div><div class="info"></div>
+                        <div class="btns">
+                            <div id="filePickerBtn"></div>
+                            <div class="uploadBtn"><var id="lang_start_upload"></var></div>
+                        </div>
+                    </div>
+                    <div id="dndArea" class="placeholder">
+                        <div class="filePickerContainer">
+                            <div id="filePickerReady"></div>
+                        </div>
+                    </div>
+                    <ul class="filelist element-invisible">
+                        <li id="filePickerBlock" class="filePickerBlock"></li>
+                    </ul>
+                </div>
+            </div>
+
+            <!-- 在线图片 -->
+            <div id="online" class="panel">
+                <div id="imageList"><var id="lang_imgLoading"></var></div>
+            </div>
+
+            <!-- 搜索图片 -->
+            <div id="search" class="panel">
+                <div class="searchBar">
+                    <input id="searchTxt" class="searchTxt text" type="text" />
+                    <select id="searchType" class="searchType">
+                        <option value="&s=4&z=0"></option>
+                        <option value="&s=1&z=19"></option>
+                        <option value="&s=2&z=0"></option>
+                        <option value="&s=3&z=0"></option>
+                    </select>
+                    <input id="searchReset" type="button"  />
+                    <input id="searchBtn" type="button"  />
+                </div>
+                <div id="searchList" class="searchList"><ul id="searchListUl"></ul></div>
+            </div>
+
+        </div>
+    </div>
+    <script type="text/javascript" src="image.js"></script>
+
+</body>
+</html>
--- a/public/ueditor/dialogs/image/image.js
+++ b/public/ueditor/dialogs/image/image.js
--- a/public/ueditor/dialogs/image/images/alignicon.jpg
+++ b/public/ueditor/dialogs/image/images/alignicon.jpg
--- a/public/ueditor/dialogs/image/images/bg.png
+++ b/public/ueditor/dialogs/image/images/bg.png
--- a/public/ueditor/dialogs/image/images/icons.gif
+++ b/public/ueditor/dialogs/image/images/icons.gif
--- a/public/ueditor/dialogs/image/images/icons.png
+++ b/public/ueditor/dialogs/image/images/icons.png
--- a/public/ueditor/dialogs/image/images/image.png
+++ b/public/ueditor/dialogs/image/images/image.png
--- a/Show More
+++ b/Show More