merge: 合并 wwjcloud 远程仓库，解决配置文件冲突

2025-10-14 22:41:41 +08:00
parent 8f3d14ef68 2285206b3f
commit 5cf86438ca
1690 changed files with 261103 additions and 0 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,17 @@
+node_modules
+dist
+npm-debug.log
+.env
+.env.local
+.env.*.local
+.git
+.gitignore
+.vscode
+.idea
+*.md
+!README.md
+test
+coverage
+.cache
+admin
+
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}
--- a/AI_FUTURE_PLAN.md
+++ b/AI_FUTURE_PLAN.md
@@ -0,0 +1,263 @@
+# 🚀 WWJCloud AI未来发展规划
+
+> 基于用户愿景：**让AI管理框架，自愈系统，自动调优，智能运维**
+
+## 🎯 核心愿景
+
+### 🔮 终极目标：AI自主管理框架
+- **自愈系统**: 自动检测异常 → 自动修复/扩容
+- **性能调优**: 智能优化数据库查询、缓存策略
+- **预测运维**: 预测问题、主动优化
+- **自主学习**: 理解业务模式，自动调整框架行为
+
+### 🚀 短期目标：AI代码生成平台
+- **非开发者友好**: 普通用户描述需求就能生成完整addon
+- **一键部署**: AI生成 → 自动编译 → 自动部署
+- **插件生态**: 自动化插件市场，一键安装使用
+
+## 🏗️ 技术实现路径
+
+### 📊 功能模块优先级
+
+| 功能模块 | 技术难度 | 开发周期 | 商业价值 | 优先级 |
+|----------|----------|----------|----------|--------|
+| **AI代码生成引擎** | ⭐⭐⭐ | 3个月 | ⭐⭐⭐⭐⭐ | 🔴 核心MVP |
+| **自动编译链** | ⭐⭐ | 1个月 | ⭐⭐⭐⭐ | 🟡 第二步 |
+| **自动部署** | ⭐⭐⭐ | 2个月 | ⭐⭐⭐⭐⭐ | 🟡 第二步 |
+| **插件生态市场** | ⭐⭐ | 2个月 | ⭐⭐⭐⭐ | 🟢 第三步 |
+| **AI自愈系统** | ⭐⭐⭐⭐⭐ | 6个月+ | ⭐⭐⭐⭐⭐ | 🔵 长期目标 |
+
+## 🎪 差异化竞争优势
+
+### 🔍 市场定位分析
+
+#### **大厂AI工具的局限性**
+```
+❌ GitHub Copilot: 通用代码补全，不懂企业框架
+❌ Google/阿里AI: Java导向，NestJS支持不足  
+❌ 字节Coze: Bot构建，不是脚手架开发
+❌ 传统方案: 外包3-6个月，自研还需学习1-2个月
+```
+
+#### **WWJCloud的核心优势**
+```
+✅ 专注NestJS企业级框架生态
+✅ 原生多租户支持 + AI生成
+✅ 中国本地化生态集成(微信、支付宝)
+✅ 面向非开发者的低代码平台
+✅ 30分钟 vs 传统3-6个月的时间优势
+```
+
+## 🚀 分阶段实施计划
+
+### Phase 1: AI代码生成引擎 (核心MVP)
+**目标**: 用户描述需求 → AI生成完整addon插件
+
+**实现场景**:
+```
+用户输入: "我想要一个积分商城插件"
+
+AI生成输出:
+- 📁 entities/points-product.entity.ts (积分商品实体)
+- 📁 services/points-exchange.service.ts (积分兑换服务)
+- 📁 controllers/admin/points-admin.controller.ts (管理端API)
+- 📁 controllers/api/points-shop.controller.ts (前台商城API)
+- 📁 dto/create-points-product.dto.ts (数据传输对象)
+- 📁 views/admin/points-admin.html (管理界面)
+- 📁 views/api/points-shop.html (商城界面)
+```
+
+**技术特色**:
+- 🎯 **业务理解**: AI理解商城、支付、库存等业务逻辑
+- 🏗️ **框架适配**: 自动生成NestJS + TypeORM + 多租户代码
+- 🔒 **安全集成**: 自动集成认证、权限、数据隔离
+- 🎨 **UI生成**: 同步生成管理端和前端界面
+
+### Phase 2: 自动化部署链
+**目标**: 代码生成 → 一键部署到生产环境
+
+**部署流程**:
+```
+1. AI生成TypeScript代码 ✅
+2. 自动编译检查 → dist/ ✅
+3. 自动打包 → Docker镜像 ✅
+4. 自动部署 → K8s集群 ✅
+5. 自动测试 → 集成测试 ✅
+6. 自动上线 → 用户可用 ✅
+```
+
+**部署亮点**:
+- 🔄 **热部署**: 零停机更新插件
+- 📊 **灰度发布**: 自动检测兼容性
+- 🔍 **健康检查**: 部署后自动验证功能
+- 📈 **性能监控**: 自动收集性能指标
+
+### Phase 3: 插件生态市场
+**目标**: 用户可以在市场购买/下载AI生成的插件
+
+**市场功能**:
+```
+🛍️ 插件商店:
+- 📂 分类浏览(商城、CRM、ERP、OA等)
+- 🔍 智能搜索(按行业、功能、复杂度)
+- 🎮 在线演示(一键体验插件效果)
+- 💾 一键安装(自动集成到现有项目)
+
+📈 生态运营:
+- ⭐ 用户评价系统
+- 📊 使用量排行榜
+- 💰 插件交易平台
+- 🏆 开发者认证体系
+```
+
+### Phase 4: AI自主管理系统
+**目标**: 插件运行后AI持续优化和改进
+
+**自主管理能力**:
+```
+🧠 AI自学习:
+- 📊 分析用户行为模式
+- 🔧 自动优化界面布局
+- ⚡ 动态调整缓存策略
+- 📈 预测业务增长点
+
+🔧 AI自修复:
+- 🚨 异常自动检测和报警
+- 🔄 服务自动重启和恢复
+- 💾 数据库连接池自动调优
+- 🌐 CDN缓存策略智能调整
+
+🎯 AI自优化:
+- 📊 SQL查询自动优化建议
+- 💡 业务逻辑自动重构
+- 🚀 API接口自动版本升级
+- 📱 移动端自适应优化
+```
+
+## 💰 商业模式创新
+
+### 🎪 WWJCloud独有的盈利模式
+
+#### 1. AI生成代币系统
+```
+💰 收费方式:
+- 按插件复杂度收费(简单/中等/复杂)
+- 按生成代码量收费(10K/100K/1M tokens)
+- 按业务领域收费(基础版/企业版/行业版)
+- 按使用频率收费(月度/年度订阅)
+```
+
+#### 2. 插件生态分成
+```
+📈 平台分成:
+- 插件市场交易: 70%开发者 + 30%平台
+- 企业定制服务: 60%开发者 + 40%平台  
+- 插件托管服务: 平台收取托管费用
+- 技术咨询服务: 平台认证专家服务
+```
+
+#### 3. 企业级解决方案
+```
+🏢 目标客户:
+- 小微企业: 需要业务功能但没开发能力
+- 外包公司: 快速交付客户需求
+- 独立开发者: 丰富自己的项目插件
+- 企业IT部门: 快速响应业务需求
+```
+
+## 🎯 竞争优势构建
+
+### 🏗️ 技术护城河
+```
+🔧 框架专精:
+- 深度NestJS框架理解和最佳实践
+- 原生多租户架构支持和优化
+- 中国互联网生态深度整合
+- 针对中小企业的性能优化方案
+
+📊 数据护城河:
+- 积累大量业务插件模板和最佳实践
+- 收集不同行业部署模式和使用数据
+- 实时性能优化和用户反馈数据
+- AI训练数据和模型迭代积累
+```
+
+### 🌐 生态护城河
+```
+🛍️ 插件生态:
+- 建立完整的插件开发和交易生态
+- 认证插件开发者和技术服务商
+- 构建行业标准和技术规范
+- 提供插件质量检测和认证服务
+
+🤝 合作伙伴:
+- 第三方服务集成网络(支付、推送、存储等)
+- 云服务商深度合作(AWS、阿里云、腾讯云)
+- 企业级客户推荐网络
+- 技术社区和开发者生态建设
+```
+
+## 📈 市场机会分析
+
+### 🔥 技术趋势红利
+```
+💡 AI技术成熟度: 大厂AI能力大幅降价，接入成本低
+🚀 低代码需求增长: 中小企业数字化转型需求爆发
+🛠️ 开发者工具升级: 痛点明显，现有方案不够专业
+🗾 中国特色需求: 中国业务模式独特，国外框架适配不足
+```
+
+### 📊 市场规模预测
+```
+🎯 目标市场规模:
+- 中国中小企业: 4000万家企业
+- NestJS开发者: 10万+活跃开发者
+- 低代码市场: 年增长50%+
+- AI辅助开发: 初生市场，增长潜力巨大
+```
+
+## 🚀 行动计划
+
+### 🎯 立即行动(1个月内)
+1. **市场调研**: 深入调研中小企业插件需求
+2. **技术验证**: 验证AI代码生成的技术可行性
+3. **MVP设计**: 设计第一个AI生成插件的完整流程
+4. **团队组建**: 招募AI和框架开发专家
+
+### 📅 短期目标(3-6个月)
+1. **核心功能开发**: 完成AI代码生成引擎MVP
+2. **自动化部署**: 实现一键部署到测试环境
+3. **首批插件**: 生成10个常用业务插件模板
+4. **早期用户**: 获取50家企业级种子用户
+
+### 🌟 中期目标(6-12个月)
+1. **市场成熟**: 插件生态市场正式上线
+2. **AI自愈**: 初步实现部分AI自主管理功能
+3. **生态扩展**: 建立插件开发者和生态合作伙伴
+4. **技术领先**: 成为NestJS AI开发的标准平台
+
+### 🔮 长期愿景(1-3年)
+1. **行业标准**: 成为中国企业级AI开发框架的代名词
+2. **技术生态**: 构建完整的AI技术开发生态系统
+3. **全球化**: 扩展到东南亚和其他海外市场
+4. **技术输出**: 对外输出AI框架管理技术和经验
+
+---
+
+## 🎊 总结
+
+WWJCloud AI未来规划的核心是：**先用AI赋能非开发者快速生成业务插件，再用AI持续管理和优化这些插件的运行**。
+
+这个路线图兼具：
+- ✅ **技术前瞻性**: 跟随AI技术发展趋势
+- ✅ **市场差异化**: 专注NestJS生态和中国市场需求  
+- ✅ **商业可行性**: 清晰的盈利模式和市场定位
+- ✅ **实施可控性**: 分阶段实施，风险可控
+
+**机会窗口**: 当前正是AI技术成熟、成本低廉、竞争较少的最佳时机
+**竞争优势**: 专精NestJS + 多租户 + 中国生态的差异化定位
+**长期价值**: 构建从代码生成到自主管理的完整AI生态系统
+
+---
+
+> 💡 **核心观点**: 我们不是在做另一个通用AI工具，而是在做一个**专注企业级NestJS开发的AI生态系统**！
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -0,0 +1,116 @@
+# WWJCloud 架构设计
+
+## 架构概述
+
+WWJCloud 基于 NestJS 框架设计，采用分层架构模式，参考 NiuCloud Java 和 PHP 版本的真实代码结构。
+
+## 分层架构
+
+### 1. Config 层 - 框架配置中心
+**职责**: 提供框架级配置管理
+- 环境变量管理
+- 配置验证
+- 配置热更新
+- 框架级配置项
+
+**位置**: `src/config/`
+**特点**: 纯配置管理，不包含业务逻辑
+
+### 2. Common 层 - 基础设施层
+**职责**: 提供纯基础设施能力
+- 安全认证和授权
+- 链路追踪
+- 缓存服务
+- 队列服务
+- 事件服务
+- 定时任务调度
+- 初始化管理
+- 上下文管理
+- API文档管理
+
+**位置**: `src/common/`
+**特点**: 纯基础设施，不包含业务逻辑
+
+### 3. Core 层 - 核心业务逻辑层
+**职责**: 提供核心业务能力
+- 认证授权业务
+- 系统管理业务
+- 会员管理业务
+- 支付业务
+- 上传业务
+- 通知业务
+- 数据字典业务
+- 多语言业务
+
+**位置**: `src/core/`
+**特点**: 核心业务逻辑，可被多个应用复用
+
+### 4. Vendor 层 - 第三方集成层
+**职责**: 提供第三方服务集成能力
+- 支付服务集成
+- 短信服务集成
+- 通知服务集成
+- 上传服务集成
+- 存储服务集成
+
+**位置**: `src/vendor/`
+**特点**: 第三方服务适配器，支持动态切换
+
+### 5. App 层 - 具体业务应用层
+**职责**: 具体业务应用实现
+- 特定业务逻辑
+- 业务特定的控制器
+- 业务特定的服务
+
+**位置**: `src/app/`
+**特点**: 具体业务实现，依赖其他层
+
+## 依赖关系
+
+```
+App Layer
+    ↓
+Core Layer ← Vendor Layer
+    ↓
+Common Layer
+    ↓
+Config Layer
+```
+
+## 与 NiuCloud 的对应关系
+
+### Java 版本对应
+- `niucloud-core/common/config/` → `src/config/` (框架配置)
+- `niucloud-core/common/component/` → `src/common/` (基础设施)
+- `niucloud-core/service/core/` → `src/core/` (核心业务)
+- `niucloud-core/common/component/pay|sms|upload/` → `src/vendor/` (第三方集成)
+
+### PHP 版本对应
+- `core/dict/Config.php` → `src/config/` (框架配置)
+- `core/base/` → `src/common/` (基础设施)
+- `core/dict/` → `src/core/` (核心业务)
+- `core/pay|sms|upload/` → `src/vendor/` (第三方集成)
+
+## 设计原则
+
+1. **单一职责**: 每层只负责自己的职责
+2. **依赖倒置**: 上层依赖下层，下层不依赖上层
+3. **开闭原则**: 对扩展开放，对修改关闭
+4. **接口隔离**: 使用接口定义契约
+5. **配置驱动**: 通过配置驱动行为
+
+## 微服务演进
+
+未来可拆分为：
+- **Config 微服务**: 配置中心
+- **Common+Vendor 微服务**: 基础设施服务
+- **Core 微服务**: 核心业务服务
+- **App 微服务**: 具体业务服务
+
+## 开发规范
+
+1. **命名规范**: 遵循 NestJS 和业务对齐原则
+2. **目录结构**: 按功能模块组织
+3. **依赖管理**: 明确层间依赖关系
+4. **配置管理**: 统一使用 Config 层
+5. **错误处理**: 统一异常处理机制
--- a/DEVELOPMENT_PLAN.md
+++ b/DEVELOPMENT_PLAN.md
@@ -0,0 +1,120 @@
+# WWJCloud 开发计划
+
+## 开发顺序
+
+按以下顺序完成各层开发：
+
+1. ✅ **Config 层** - 框架配置中心（已完成基础配置）
+2. 🔄 **Core 层** - 基础设施层（进行中）
+3. ⏳ **Vendor 层** - 第三方集成层（待开发）
+4. ⏳ **Common 层** - 通用业务层（最后开发）
+
+## Core 层开发计划
+
+基于 NestJS 官方文档实现以下模块：
+
+### 1. 缓存模块 (Cache Module)
+**参考文档**: https://docs.nestjs.cn/techniques/caching
+- [ ] 使用 `@nestjs/cache-manager` 集成缓存
+- [ ] 实现 Redis 缓存支持
+- [ ] 实现内存缓存支持
+- [ ] 提供统一的缓存接口
+
+### 2. 队列模块 (Queue Module)
+**参考文档**: https://docs.nestjs.cn/techniques/queues
+- [ ] 使用 `@nestjs/bull` 集成队列
+- [ ] 实现任务队列处理
+- [ ] 实现延迟任务
+- [ ] 实现任务重试机制
+
+### 3. 事件模块 (Event Module)
+**参考文档**: https://docs.nestjs.cn/techniques/events
+- [ ] 使用 `@nestjs/event-emitter` 实现事件系统
+- [ ] 实现事件发布
+- [ ] 实现事件订阅
+- [ ] 实现事件监听器
+
+### 4. 安全模块 (Security Module)
+**参考文档**: https://docs.nestjs.cn/security/authentication
+- [ ] 实现 JWT 认证
+- [ ] 实现守卫 (Guards)
+- [ ] 实现拦截器 (Interceptors)
+- [ ] 实现管道 (Pipes)
+
+### 5. 调度模块 (Scheduler Module)
+**参考文档**: https://docs.nestjs.cn/techniques/task-scheduling
+- [ ] 使用 `@nestjs/schedule` 实现定时任务
+- [ ] 实现 Cron 任务
+- [ ] 实现间隔任务
+- [ ] 实现超时任务
+
+### 6. 链路追踪模块 (Tracing Module)
+- [ ] 实现请求追踪
+- [ ] 实现日志追踪
+- [ ] 实现性能监控
+
+### 7. 上下文模块 (Context Module)
+- [ ] 实现请求上下文
+- [ ] 实现用户上下文
+- [ ] 实现站点上下文
+
+### 8. 初始化模块 (Init Module)
+- [ ] 实现应用启动初始化
+- [ ] 实现健康检查
+- [ ] 实现优雅关闭
+
+### 9. Swagger 文档模块
+**参考文档**: https://docs.nestjs.cn/recipes/swagger
+- [ ] 使用 `@nestjs/swagger` 实现 API 文档
+- [ ] 实现文档配置
+- [ ] 实现文档访问控制
+
+## Vendor 层开发计划
+
+基于 NestJS 官方文档实现第三方集成：
+
+### 1. 支付模块 (Pay Module)
+- [ ] 实现支付宝集成
+- [ ] 实现微信支付集成
+- [ ] 实现统一支付接口
+
+### 2. 短信模块 (SMS Module)
+- [ ] 实现阿里云短信
+- [ ] 实现腾讯云短信
+- [ ] 实现统一短信接口
+
+### 3. 通知模块 (Notice Module)
+- [ ] 实现邮件通知
+- [ ] 实现站内通知
+- [ ] 实现推送通知
+
+### 4. 上传模块 (Upload Module)
+- [ ] 实现本地上传
+- [ ] 实现云存储上传
+- [ ] 实现统一上传接口
+
+### 5. 存储模块 (Storage Module)
+- [ ] 实现阿里云 OSS
+- [ ] 实现腾讯云 COS
+- [ ] 实现七牛云存储
+
+## Config 层完善计划
+
+- [ ] 完善配置验证
+- [ ] 实现配置热更新
+- [ ] 实现配置缓存
+
+## 开发规范
+
+1. **必须查阅 NestJS 中文网相关文档**
+2. **严格遵循 NestJS 官方最佳实践**
+3. **使用 NestJS 官方推荐的包和模块**
+4. **保持代码风格一致**
+5. **添加完整的注释和文档**
+
+## 参考文档
+
+- NestJS 中文文档: https://docs.nestjs.cn/
+- NestJS 英文文档: https://docs.nestjs.com/
+- NiuCloud Java 版本: /niucloud-java/
+- NiuCloud PHP 版本: /niucloud-php/
--- a/README.md
+++ b/README.md
@@ -0,0 +1,140 @@
+# WWJCloud-Nest 🚀
+
+基于NestJS v11的企业级全栈框架，对标Java Spring Boot和PHP ThinkPHP。
+
+## 🏗️ 架构设计
+
+```
+WWJCloud NestJS企业级架构：
+
+├── Config层     ✅ 框架配置中心 (NuCloud Config)
+├── Common层     ✅ 基础设施层 (缓存/日志/监控/异常)
+├── Vendor层     ✅ 第三方服务集成 (支付/短信/上传/通知)
+├── Core层       🔄 通用业务逻辑 (会员/装修/字典)
+└── App层        🔄 具体业务实现 (前台/管理端)
+```
+
+## ✨ 核心特性
+
+- 🎯 **企业级框架**：完整的企业应用开发基础设施
+- 🔧 **配置中心**：动态配置、热更新、多租户支持
+- 💰 **支付集成**：微信支付、支付宝、线下支付
+- 📱 **多渠道支持**：微信、小程序、H5、APP
+- 🔐 **多租户架构**：SaaS/独立版混合部署
+- 📊 **监控告警**：日志、指标、链路追踪
+- 🛠️ **开发工具**：代码生成器、插件系统
+
+## 🚀 快速开始
+
+### 环境要求
+- Node.js 18+
+- MySQL 8.0+
+- Redis 6.0+
+
+### 安装运行
+
+```bash
+# 1. 克隆项目
+git clone <repository-url>
+cd wwjcloud-nest
+
+# 2. 安装依赖
+npm install
+
+# 3. 启动数据库 (Docker)
+docker-compose up -d mysql redis
+
+# 4. 启动应用
+npm run start
+
+# 5. 访问应用
+http://localhost:3001
+```
+
+### API测试
+
+```bash
+# 健康检查
+curl http://localhost:3001/
+
+# 配置状态
+curl http://localhost:3001/config/status
+
+# 查询配置
+curl http://localhost:3001/config/value/WECHAT
+```
+
+## 📁 项目结构
+
+```
+src/
+├── config/          # 配置中心
+├── common/          # 基础设施
+│   ├── cache/       # 缓存服务
+│   ├── logging/     # 日志服务
+│   ├── monitoring/  # 监控服务
+│   ├── queue/       # 队列服务
+│   ├── utils/       # 工具类
+│   └── ...
+├── vendor/          # 第三方集成
+│   ├── pay/         # 支付服务
+│   ├── sms/         # 短信服务
+│   ├── upload/      # 上传服务
+│   └── ...
+├── core/            # 通用业务
+└── main.ts          # 应用入口
+```
+
+## 🏪 技术栈
+
+### 后端技术
+- **框架**: NestJS 11 + TypeScript
+- **数据库**: MySQL 8.0 + TypeORM
+- **缓存**: Redis + BullMQ队列
+- **文档**: Swagger API文档
+- **监控**: Prometheus + OpenTelemetry
+
+### 开发工具
+- **构建**: Nest CLI + Webpack
+- **代码质量**: ESLint + Prettier
+- **测试**: Jest + Supertest
+- **容器**: Docker + Docker Compose
+
+## 🌟 对标说明
+
+| 特性 | Java Spring Boot | PHP ThinkPHP | WWJCloud NestJS |
+|-----|------------------|--------------|-----------------|
+| 依赖注入 | ✅ Spring IoC | ✅ Container | ✅ NestJS DI |
+| 配置管理 | ✅ Application.yml | ✅ Config | ✅ ConfigCenter |
+| 数据库ORM | ✅ JPA/MyBatis | ✅ Model | ✅ TypeORM |
+| 缓存支持 | ✅ Redisson | ✅ Cache | ✅ Redis |
+| 队列系统 | ✅ Rabbit/Active | ✅ Queue | ✅ BullMQ |
+| 监控告警 | ✅ Micrometer | ✅ Monitor | ✅ Prometheus |
+
+## 📖 开发文档
+
+- [架构设计文档](./ARCHITECTURE.md)
+- [迁移指南](./MIGRATION_GUIDE.md)
+- [开发计划](./DEVELOPMENT_PLAN.md)
+
+## 🤝 贡献指南
+
+1. Fork 项目
+2. 创建特性分支 (`git checkout -b feature/amazing-feature`)
+3. 提交更改 (`git commit -m 'Add amazing feature'`)
+4. 推送到分支 (`git push origin feature/amazing-feature`)
+5. 创建 Pull Request
+
+## 📄 许可证
+
+本项目采用 MIT 许可证 - 查看 [LICENSE](LICENSE) 文件了解详情。
+
+## 👥 团队
+
+- **架构师**: WWJCloud团队
+- **开发者**: NestJS企业级开发团队
+- **产品经理**: SaaS平台产品团队
+
+---
+
+⭐ 如果这个项目对你有帮助，请给它一个星星！
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -0,0 +1,11 @@
+# NestJS后端API地址
+VITE_APP_BASE_URL=http://localhost:3000
+
+# 开发模式
+NODE_ENV=development
+
+# API请求超时（毫秒）
+VITE_APP_TIMEOUT=30000
+
+# 是否开启Mock数据
+VITE_APP_MOCK=false
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -0,0 +1,11 @@
+# NestJS后端API地址（生产环境）
+VITE_APP_BASE_URL=http://localhost:3000
+
+# 生产模式
+NODE_ENV=production
+
+# API请求超时（毫秒）
+VITE_APP_TIMEOUT=30000
+
+# 是否开启Mock数据
+VITE_APP_MOCK=false
--- a/admin/.eslintrc.json
+++ b/admin/.eslintrc.json
@@ -0,0 +1,28 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "plugin:vue/vue3-essential",
+        "standard-with-typescript",
+        "eslint:recommended"
+    ],
+    "overrides": [
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module",
+        "parser": "@typescript-eslint/parser"
+    },
+    "plugins": [
+        "vue",
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "no-tabs":"off",
+        "indent": [1, 4, { "SwitchCase": 1 }],
+        "eqeqeq":"off",
+        "vue/multi-word-component-names": "off" 
+    }
+}
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -0,0 +1,40 @@
+# ========================================
+# Admin Frontend Dockerfile
+# ========================================
+FROM node:20-alpine AS builder
+
+WORKDIR /app
+
+# 复制package文件
+COPY package*.json ./
+
+# 安装依赖
+RUN npm ci && npm cache clean --force
+
+# 复制源码
+COPY . .
+
+# 构建应用
+RUN npm run build
+
+# ========================================
+# Production Stage (Nginx)
+# ========================================
+FROM nginx:alpine
+
+# 复制构建产物
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# 复制Nginx配置
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# 暴露端口
+EXPOSE 80
+
+# 健康检查
+HEALTHCHECK --interval=30s --timeout=3s \
+  CMD wget --quiet --tries=1 --spider http://localhost/ || exit 1
+
+# 启动Nginx
+CMD ["nginx", "-g", "daemon off;"]
+
--- a/admin/auto-imports.d.ts
+++ b/admin/auto-imports.d.ts
@@ -0,0 +1,7 @@
+// Generated by 'unplugin-auto-import'
+export {}
+declare global {
+  const ElMessage: typeof import('element-plus/es')['ElMessage']
+  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
+  const ElNotification: typeof import('element-plus/es')['ElNotification']
+}
--- a/admin/components.d.ts
+++ b/admin/components.d.ts
@@ -0,0 +1,107 @@
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/core/pull/3399
+import '@vue/runtime-core'
+
+export {}
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default']
+    DiyLink: typeof import('./src/components/diy-link/index.vue')['default']
+    DiyPage: typeof import('./src/components/diy-page/index.vue')['default']
+    Editor: typeof import('./src/components/editor/index.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
+    ElAside: typeof import('element-plus/es')['ElAside']
+    ElAvatar: typeof import('element-plus/es')['ElAvatar']
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
+    ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
+    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
+    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
+    ElDropdown: typeof import('element-plus/es')['ElDropdown']
+    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
+    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
+    ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
+    ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
+    ElMain: typeof import('element-plus/es')['ElMain']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElResult: typeof import('element-plus/es')['ElResult']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElStatistic: typeof import('element-plus/es')['ElStatistic']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
+    ExportSure: typeof import('./src/components/export-sure/index.vue')['default']
+    HeatMap: typeof import('./src/components/heat-map/index.vue')['default']
+    Icon: typeof import('./src/components/icon/index.vue')['default']
+    Markdown: typeof import('./src/components/markdown/index.vue')['default']
+    PopoverInput: typeof import('./src/components/popover-input/index.vue')['default']
+    RangeInput: typeof import('./src/components/range-input/index.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    SelectArea: typeof import('./src/components/select-area/index.vue')['default']
+    SelectIcon: typeof import('./src/components/select-icon/index.vue')['default']
+    SpreadPopup: typeof import('./src/components/spread-popup/index.vue')['default']
+    UploadAttachment: typeof import('./src/components/upload-attachment/index.vue')['default']
+    UploadAudio: typeof import('./src/components/upload-audio/index.vue')['default']
+    UploadFile: typeof import('./src/components/upload-file/index.vue')['default']
+    UploadImage: typeof import('./src/components/upload-image/index.vue')['default']
+    UploadVideo: typeof import('./src/components/upload-video/index.vue')['default']
+    Verify: typeof import('./src/components/verifition/Verify.vue')['default']
+    VerifyPoints: typeof import('./src/components/verifition/Verify/VerifyPoints.vue')['default']
+    VerifySlide: typeof import('./src/components/verifition/Verify/VerifySlide.vue')['default']
+    VideoPlayer: typeof import('./src/components/video-player/index.vue')['default']
+  }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
+}
--- a/admin/index.html
+++ b/admin/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image" href="/niucloud.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title></title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
--- a/admin/nginx.conf
+++ b/admin/nginx.conf
@@ -0,0 +1,45 @@
+server {
+    listen 80;
+    server_name localhost;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Gzip压缩
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml+rss application/json application/javascript;
+
+    # Vue Router History模式支持
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # API代理到NestJS后端
+    location /adminapi/ {
+        proxy_pass http://nestjs-backend:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_cache_bypass $http_upgrade;
+        proxy_connect_timeout 60s;
+        proxy_send_timeout 60s;
+        proxy_read_timeout 60s;
+    }
+
+    # 静态资源缓存
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|svg|woff|woff2|ttf|eot)$ {
+        expires 7d;
+        add_header Cache-Control "public, immutable";
+    }
+
+    # 安全headers
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+}
+
--- a/admin/postcss.config.cjs
+++ b/admin/postcss.config.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: {
+        tailwindcss: {},
+        autoprefixer: {}
+    }
+}
--- a/admin/public/niucloud.ico
+++ b/admin/public/niucloud.ico
--- a/admin/public/ueditor/dialogs/anchor/anchor.html
+++ b/admin/public/ueditor/dialogs/anchor/anchor.html
@@ -0,0 +1,62 @@
+<!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 {
+            margin-left: 4px;
+            box-sizing: border-box;
+            width: 210px;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid #d7d7d7;
+            border-radius: 3px;
+            padding: 0 5px;
+            outline: none;
+        }
+    </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?aea0c61c"></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/admin/public/ueditor/dialogs/attachment/attachment.css
+++ b/admin/public/ueditor/dialogs/attachment/attachment.css
@@ -0,0 +1,716 @@
+@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/admin/public/ueditor/dialogs/attachment/attachment.html
+++ b/admin/public/ueditor/dialogs/attachment/attachment.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>ueditor图片对话框</title>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+
+    <!-- jquery -->
+    <script type="text/javascript" src="../../third-party/jquery-1.10.2.js?628072e7"></script>
+
+    <!-- webuploader -->
+    <script src="../../third-party/webuploader/webuploader.js?f37088cc"></script>
+    <link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css?0057c5c7">
+
+    <!-- attachment dialog -->
+    <link rel="stylesheet" href="attachment.css?e8f09700" 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?21e4194b"></script>
+
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/attachment/attachment.js
+++ b/admin/public/ueditor/dialogs/attachment/attachment.js
@@ -0,0 +1,774 @@
+/**
+ * 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,
+                headers: editor.getOpt('serverHeaders') || {},
+                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>');
+                        // 触发上传附件事件
+                        editor.fireEvent("uploadsuccess", {
+                            res: json,
+                            type: 'file'
+                        });
+                    } 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')),
+                    headers: editor.options.serverHeaders || {},
+                    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].original || 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/admin/public/ueditor/dialogs/attachment/images/alignicon.gif
+++ b/admin/public/ueditor/dialogs/attachment/images/alignicon.gif
--- a/admin/public/ueditor/dialogs/attachment/images/alignicon.png
+++ b/admin/public/ueditor/dialogs/attachment/images/alignicon.png
--- a/admin/public/ueditor/dialogs/attachment/images/bg.png
+++ b/admin/public/ueditor/dialogs/attachment/images/bg.png
--- a/admin/public/ueditor/dialogs/attachment/images/file-icons.gif
+++ b/admin/public/ueditor/dialogs/attachment/images/file-icons.gif
--- a/admin/public/ueditor/dialogs/attachment/images/file-icons.png
+++ b/admin/public/ueditor/dialogs/attachment/images/file-icons.png
--- a/admin/public/ueditor/dialogs/attachment/images/icons.gif
+++ b/admin/public/ueditor/dialogs/attachment/images/icons.gif
--- a/admin/public/ueditor/dialogs/attachment/images/icons.png
+++ b/admin/public/ueditor/dialogs/attachment/images/icons.png
--- a/admin/public/ueditor/dialogs/attachment/images/image.png
+++ b/admin/public/ueditor/dialogs/attachment/images/image.png
--- a/admin/public/ueditor/dialogs/attachment/images/progress.png
+++ b/admin/public/ueditor/dialogs/attachment/images/progress.png
--- a/admin/public/ueditor/dialogs/attachment/images/success.gif
+++ b/admin/public/ueditor/dialogs/attachment/images/success.gif
--- a/admin/public/ueditor/dialogs/attachment/images/success.png
+++ b/admin/public/ueditor/dialogs/attachment/images/success.png
--- a/admin/public/ueditor/dialogs/audio/audio.css
+++ b/admin/public/ueditor/dialogs/audio/audio.css
@@ -0,0 +1,818 @@
+@charset "utf-8";
+.wrapper {
+    width: 570px;
+    _width: 575px;
+    margin: 10px auto;
+    zoom: 1;
+    position: relative
+}
+
+.tabbody {
+    height: 355px;
+}
+
+.tabbody .panel {
+    position: absolute;
+    width: 0;
+    height: 0;
+    background: #fff;
+    overflow: hidden;
+    display: none;
+}
+
+.tabbody .panel.focus {
+    width: 100%;
+    height: 355px;
+    display: block;
+}
+
+.tabbody .panel table td {
+    vertical-align: middle;
+}
+
+#audioUrl {
+    width: 380px;
+    height: 26px;
+    line-height: 26px;
+    margin: 8px 5px;
+    background: #FFF;
+    border: 1px solid #d7d7d7;
+    outline: none;
+    border-radius: 3px;
+    padding: 0 5px;
+}
+
+#audioSelect {
+    width: 100px;
+    display: inline-block;
+    background: #FFF;
+    border: 1px solid #EEE;
+    line-height: 26px;
+    text-align: center;
+    color: #333;
+    text-decoration: none;
+    border-radius: 3px;
+    vertical-align: middle;
+}
+
+#audioSearchTxt {
+    margin-left: 15px;
+    background: #FFF;
+    width: 200px;
+    height: 21px;
+    line-height: 21px;
+    border: 1px solid #d7d7d7;
+}
+
+#searchList {
+    width: 570px;
+    overflow: auto;
+    zoom: 1;
+    height: 270px;
+}
+
+#searchList div {
+    float: left;
+    width: 120px;
+    height: 135px;
+    margin: 5px 15px;
+}
+
+#searchList img {
+    margin: 2px 8px;
+    cursor: pointer;
+    border: 2px solid #fff
+}
+
+/*不用缩略图*/
+#searchList p {
+    margin-left: 10px;
+}
+
+#audioType {
+    width: 65px;
+    height: 23px;
+    line-height: 22px;
+    border: 1px solid #d7d7d7;
+}
+
+#audioSearchBtn, #audioSearchReset {
+    /*width: 80px;*/
+    height: 25px;
+    line-height: 25px;
+    background: #eee;
+    border: 1px solid #d7d7d7;
+    cursor: pointer;
+    padding: 0 5px;
+}
+
+
+#preview {
+    position: relative;
+    width: 420px;
+    padding: 0;
+    overflow: hidden;
+    margin-left: 10px;
+    _margin-left: 5px;
+    height: 280px;
+    background-color: #ddd;
+    float: left
+}
+
+#preview .previewMsg {
+    position: absolute;
+    top: 0;
+    margin: 0;
+    padding: 0;
+    height: 280px;
+    width: 100%;
+    background-color: #666;
+}
+
+#preview .previewMsg span {
+    display: block;
+    margin: 125px auto 0 auto;
+    text-align: center;
+    font-size: 18px;
+    color: #fff;
+}
+
+#preview .previewaudio {
+    position: absolute;
+    top: 0;
+    margin: 0;
+    padding: 0;
+    height: 280px;
+    width: 100%;
+}
+
+.edui-audio-wrapper fieldset {
+    border: 1px solid #ddd;
+    padding-left: 5px;
+    margin-bottom: 20px;
+    padding-bottom: 5px;
+    width: 115px;
+}
+
+#audioInfo {
+    width: 120px;
+    float: left;
+    margin-left: 10px;
+    _margin-left: 7px;
+}
+
+fieldset {
+    border: 1px solid #ddd;
+    padding-left: 5px;
+    margin-bottom: 20px;
+    padding-bottom: 5px;
+    width: 115px;
+}
+
+fieldset legend {
+    font-weight: bold;
+}
+
+fieldset p {
+    line-height: 30px;
+}
+
+fieldset input.txt {
+    width: 65px;
+    height: 21px;
+    line-height: 21px;
+    margin: 8px 5px;
+    background: #FFF;
+    border: 1px solid #d7d7d7;
+}
+
+label.url {
+    font-weight: bold;
+    margin-left: 5px;
+}
+
+#audioFloat div {
+    cursor: pointer;
+    opacity: 0.5;
+    filter: alpha(opacity=50);
+    margin: 9px;
+    _margin: 5px;
+    width: 38px;
+    height: 36px;
+    float: left;
+}
+
+#audioFloat .focus {
+    opacity: 1;
+    filter: alpha(opacity=100)
+}
+
+span.view {
+    display: inline-block;
+    width: 30px;
+    float: right;
+    cursor: pointer;
+    color: blue
+}
+
+
+/* upload audio */
+.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: 335px;
+    display: block;
+    clip: auto;
+}
+
+#upload_alignment div {
+    cursor: pointer;
+    opacity: 0.5;
+    filter: alpha(opacity=50);
+    margin: 9px;
+    _margin: 5px;
+    width: 38px;
+    height: 36px;
+    float: left;
+}
+
+#upload_alignment .focus {
+    opacity: 1;
+    filter: alpha(opacity=100)
+}
+
+#upload_left {
+    width: 427px;
+    float: left;
+}
+
+#upload_left .controller {
+    height: 30px;
+    clear: both;
+}
+
+#uploadaudioInfo {
+    margin-top: 10px;
+    float: right;
+    padding-right: 8px;
+}
+
+#upload .queueList {
+    margin: 0;
+}
+
+#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;
+    margin-right: 0;
+    border: 2px dashed #e6e6e6;
+    *border: 0px dashed #e6e6e6;
+    height: 161px;
+    padding-top: 150px;
+    text-align: center;
+    width: 97%;
+    float: left;
+    background: url(./images/image.png) center 70px no-repeat;
+    color: #cccccc;
+    font-size: 18px;
+    position: relative;
+    top: 0;
+    *margin-left: 0;
+    *left: 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: 285px;
+}
+
+#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: 15px 0 0 20px;
+    *margin: 15px 0 0 15px;
+    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;
+}
+
+
+/* 在线文件的文件预览图标 */
+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/admin/public/ueditor/dialogs/audio/audio.html
+++ b/admin/public/ueditor/dialogs/audio/audio.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <link rel="stylesheet" type="text/css" href="audio.css?c75591bc"/>
+</head>
+<body>
+<div class="wrapper">
+    <div id="audioTab">
+        <div id="tabHeads" class="tabhead">
+            <span tabSrc="audio" class="focus" data-content-id="audio"><var id="lang_tab_insertV"></var></span>
+            <span tabSrc="upload" style="display:none;" data-content-id="upload"><var
+                id="lang_tab_uploadV"></var></span>
+        </div>
+        <div id="tabBodys" class="tabbody">
+            <div id="audio" class="panel focus">
+                <table>
+                    <tr>
+                        <td><label for="audioUrl" class="url"><var id="lang_audio_url"></var></label></td>
+                        <td><input id="audioUrl" type="text"><a href="javascript:;" id="audioSelect"
+                                                                style="display:none;">选择音频</a></td>
+                    </tr>
+                </table>
+                <div style="padding:0 5px 5px 5px;color:#999;">
+                    外链音频支持MP3格式
+                </div>
+                <div id="preview"></div>
+                <div id="audioInfo">
+                    <fieldset>
+                        <legend><var id="lang_alignment"></var></legend>
+                        <div id="audioFloat"></div>
+                    </fieldset>
+                </div>
+            </div>
+            <div id="upload" class="panel">
+                <div id="upload_left">
+                    <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="uploadaudioInfo">
+                    <fieldset>
+                        <legend><var id="lang_upload_alignment"></var></legend>
+                        <div id="upload_alignment"></div>
+                    </fieldset>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- jquery -->
+<script type="text/javascript" src="../../third-party/jquery-1.10.2.js?628072e7"></script>
+
+<!-- webuploader -->
+<script type="text/javascript" src="../../third-party/webuploader/webuploader.js?f37088cc"></script>
+<link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css?0057c5c7">
+
+<!-- audio -->
+<script type="text/javascript" src="audio.js?9f84905f"></script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/audio/audio.js
+++ b/admin/public/ueditor/dialogs/audio/audio.js
@@ -0,0 +1,782 @@
+/**
+ * Created by JetBrains PhpStorm.
+ * User: taoqili
+ * Date: 12-2-20
+ * Time: 上午11:19
+ * To change this template use File | Settings | File Templates.
+ */
+
+(function () {
+
+    var audio = {},
+        uploadaudioList = [],
+        isModifyUploadaudio = false,
+        uploadFile;
+    var editorOpt = {};
+
+    window.onload = function () {
+        editorOpt = editor.getOpt('audioConfig');
+        $focus($G("audioUrl"));
+        initTabs();
+        initAudio();
+        initUpload();
+    };
+
+    /* 初始化tab标签 */
+    function initTabs() {
+        var tabs = $G('tabHeads').children;
+        for (var i = 0; i < tabs.length; i++) {
+            domUtils.on(tabs[i], "click", function (e) {
+                var j, bodyId, target = e.target || e.srcElement;
+                for (j = 0; j < tabs.length; j++) {
+                    bodyId = tabs[j].getAttribute('data-content-id');
+                    if (tabs[j] == target) {
+                        domUtils.addClass(tabs[j], 'focus');
+                        domUtils.addClass($G(bodyId), 'focus');
+                    } else {
+                        domUtils.removeClasses(tabs[j], 'focus');
+                        domUtils.removeClasses($G(bodyId), 'focus');
+                    }
+                }
+            });
+        }
+        if (!editorOpt.disableUpload) {
+            $G('tabHeads').querySelector('[data-content-id="upload"]').style.display = 'inline-block';
+        }
+        if (!!editorOpt.selectCallback) {
+            $G('audioSelect').style.display = 'inline-block';
+            domUtils.on($G('audioSelect'), "click", function (e) {
+                editorOpt.selectCallback(editor, function (info) {
+                    if (info) {
+                        $G('audioUrl').value = info.path;
+                        createPreview(info.path);
+                    }
+                });
+            });
+        }
+    }
+
+    function initAudio() {
+        createAlignButton(["audioFloat", "upload_alignment"]);
+        addUrlChangeListener($G("audioUrl"));
+        addOkListener();
+
+        //编辑视频时初始化相关信息
+        (function () {
+            var img = editor.selection.getRange().getClosedNode(), url;
+            if (img && img.className) {
+                var hasFakedClass = (img.className == "edui-faked-audio"),
+                    hasUploadClass = img.className.indexOf("edui-upload-audio") != -1;
+                if (hasFakedClass || hasUploadClass) {
+                    $G("audioUrl").value = url = img.getAttribute("_url");
+                    var align = domUtils.getComputedStyle(img, "float"),
+                        parentAlign = domUtils.getComputedStyle(img.parentNode, "text-align");
+                    updateAlignButton(parentAlign === "center" ? "center" : align);
+                }
+                if (hasUploadClass) {
+                    isModifyUploadaudio = true;
+                }
+            }
+            createPreview(url);
+        })();
+    }
+
+    /**
+     * 监听确认和取消两个按钮事件，用户执行插入或者清空正在播放的视频实例操作
+     */
+    function addOkListener() {
+        dialog.onok = function () {
+            $G("preview").innerHTML = "";
+            var currentTab = findFocus("tabHeads", "tabSrc");
+            switch (currentTab) {
+                case "audio":
+                    return insertSingle();
+                    break;
+                // case "audioSearch":
+                //     return insertSearch("searchList");
+                //     break;
+                case "upload":
+                    return insertUpload();
+                    break;
+            }
+        };
+        dialog.oncancel = function () {
+            $G("preview").innerHTML = "";
+        };
+    }
+
+    /**
+     * 依据传入的align值更新按钮信息
+     * @param align
+     */
+    function updateAlignButton(align) {
+        var aligns = $G("audioFloat").children;
+        for (var i = 0, ci; ci = aligns[i++];) {
+            if (ci.getAttribute("name") == align) {
+                if (ci.className != "focus") {
+                    ci.className = "focus";
+                }
+            } else {
+                if (ci.className == "focus") {
+                    ci.className = "";
+                }
+            }
+        }
+    }
+
+    /**
+     * 将单个视频信息插入编辑器中
+     */
+    function insertSingle() {
+        var url = $G('audioUrl').value,
+            align = findFocus("audioFloat", "name");
+        if (!url) return false;
+        editor.execCommand('insertaudio', {
+            url: url,
+        }, isModifyUploadaudio ? 'upload' : null);
+    }
+
+    /**
+     * 将元素id下的所有代表视频的图片插入编辑器中
+     * @param id
+     */
+    function insertSearch(id) {
+        var imgs = domUtils.getElementsByTagName($G(id), "img"),
+            audioObjs = [];
+        for (var i = 0, img; img = imgs[i++];) {
+            if (img.getAttribute("selected")) {
+                audioObjs.push({
+                    url: img.getAttribute("ue_audio_url"),
+                    width: 420,
+                    height: 280,
+                    align: "none"
+                });
+            }
+        }
+        editor.execCommand('insertaudio', audioObjs);
+    }
+
+    /**
+     * 找到id下具有focus类的节点并返回该节点下的某个属性
+     * @param id
+     * @param returnProperty
+     */
+    function findFocus(id, returnProperty) {
+        var tabs = $G(id).children,
+            property;
+        for (var i = 0, ci; ci = tabs[i++];) {
+            if (ci.className == "focus") {
+                property = ci.getAttribute(returnProperty);
+                break;
+            }
+        }
+        return property;
+    }
+
+    /**
+     * 数字判断
+     * @param value
+     */
+    function isNumber(value) {
+        return /(0|^[1-9]\d*$)/.test(value);
+    }
+
+    /**
+     * 创建图片浮动选择按钮
+     * @param ids
+     */
+    function createAlignButton(ids) {
+        for (var i = 0, ci; ci = ids[i++];) {
+            var floatContainer = $G(ci),
+                nameMaps = {
+                    "none": lang['default'],
+                    "left": lang.floatLeft,
+                    "right": lang.floatRight,
+                    "center": lang.block
+                };
+            for (var j in nameMaps) {
+                var div = document.createElement("div");
+                div.setAttribute("name", j);
+                if (j == "none") div.className = "focus";
+                div.style.cssText = "background:url(images/" + j + "_focus.jpg);";
+                div.setAttribute("title", nameMaps[j]);
+                floatContainer.appendChild(div);
+            }
+            switchSelect(ci);
+        }
+    }
+
+    /**
+     * 选择切换
+     * @param selectParentId
+     */
+    function switchSelect(selectParentId) {
+        var selects = $G(selectParentId).children;
+        for (var i = 0, ci; ci = selects[i++];) {
+            domUtils.on(ci, "click", function () {
+                for (var j = 0, cj; cj = selects[j++];) {
+                    cj.className = "";
+                    cj.removeAttribute && cj.removeAttribute("class");
+                }
+                this.className = "focus";
+            })
+        }
+    }
+
+    /**
+     * 监听url改变事件
+     * @param url
+     */
+    function addUrlChangeListener(url) {
+        if (browser.ie) {
+            url.onpropertychange = function () {
+                createPreview(this.value);
+            }
+        } else {
+            url.addEventListener("input", function () {
+                createPreview(this.value);
+            }, false);
+        }
+    }
+
+    function createAudioHtml(url, param) {
+        param = param || {};
+        var str = [
+            "<audio",
+            (param.id ? ' id="' + param.id + '"' : ""),
+            (param.cls ? ' class="' + param.cls + '"' : ''),
+            ' controls >',
+            '<source src="' + url + '" type="audio/mpeg' + '" />',
+            '</audio>',
+        ];
+        return str.join('');
+    }
+
+    /**
+     * 根据url生成视频预览
+     * @param url
+     */
+    function createPreview(url) {
+        if (!url) {
+            return;
+        }
+
+        $G("preview").innerHTML = '<div class="previewMsg"><span>' + lang.urlError + '</span></div>' +
+            '<div style="position: absolute; inset: 0; background: #FFF; text-align: center; display: flex; justify-items: center; align-items: center;">' +
+            '<div style="text-align:center;flex-grow:1;">' + createAudioHtml(url) + '</div>'
+            + '</div>';
+    }
+
+
+    /* 插入上传视频 */
+    function insertUpload() {
+        var audioObjs = [],
+            uploadDir = editor.getOpt('audioUrlPrefix'),
+            align = findFocus("upload_alignment", "name") || 'none';
+        for (var key in uploadaudioList) {
+            var file = uploadaudioList[key];
+            audioObjs.push({
+                url: uploadDir + file.url,
+                align: align
+            });
+        }
+
+        var count = uploadFile.getQueueCount();
+        if (count) {
+            $('.info', '#queueList').html('<span style="color:red;">' + '还有2个未上传文件'.replace(/[\d]/, count) + '</span>');
+            return false;
+        } else {
+            editor.execCommand('insertaudio', audioObjs, 'upload');
+        }
+    }
+
+    /*初始化上传标签*/
+    function initUpload() {
+        uploadFile = new UploadFile('queueList');
+    }
+
+
+    /* 上传附件 */
+    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('audioActionName')),
+                fileMaxSize = editor.getOpt('audioMaxSize'),
+                acceptExtensions = (editor.getOpt('audioAllowFiles') || []).join('').replace(/\./g, ',').replace(/^[,]/, '');
+            ;
+
+            if (!WebUploader.Uploader.support()) {
+                $('#filePickerReady').after($('<div>').html(lang.errorNotSupport)).hide();
+                return;
+            } else if (!editor.getOpt('audioActionName')) {
+                $('#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('audioFieldName'),
+                duplicate: true,
+                fileSingleSizeLimit: fileMaxSize,
+                headers: editor.getOpt('serverHeaders') || {},
+                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">' + file.name + '</span>');
+                    } else {
+                        if (browser.ie && browser.version <= 7) {
+                            $wrap.text(lang.uploadNoPreview);
+                        } else {
+                            uploader.makeThumb(file, function (error, src) {
+                                if (error || !src || (/^data:/.test(src) && browser.ie && browser.version <= 7)) {
+                                    $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) {
+                fileCount++;
+                fileSize += file.size;
+
+                if (fileCount === 1) {
+                    $placeHolder.addClass('element-invisible');
+                    $statusBar.show();
+                }
+
+                addFile(file);
+            });
+
+            uploader.on('fileDequeued', function (file) {
+                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') {
+                        uploadaudioList.push({
+                            'url': json.url,
+                            'type': json.type,
+                            'original': json.original
+                        });
+                        $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;
+        },
+        refresh: function () {
+            this.uploader.refresh();
+        }
+    };
+
+})();
--- a/admin/public/ueditor/dialogs/audio/images/bg.png
+++ b/admin/public/ueditor/dialogs/audio/images/bg.png
--- a/admin/public/ueditor/dialogs/audio/images/center_focus.jpg
+++ b/admin/public/ueditor/dialogs/audio/images/center_focus.jpg
--- a/admin/public/ueditor/dialogs/audio/images/file-icons.gif
+++ b/admin/public/ueditor/dialogs/audio/images/file-icons.gif
--- a/admin/public/ueditor/dialogs/audio/images/file-icons.png
+++ b/admin/public/ueditor/dialogs/audio/images/file-icons.png
--- a/admin/public/ueditor/dialogs/audio/images/icons.gif
+++ b/admin/public/ueditor/dialogs/audio/images/icons.gif
--- a/admin/public/ueditor/dialogs/audio/images/icons.png
+++ b/admin/public/ueditor/dialogs/audio/images/icons.png
--- a/admin/public/ueditor/dialogs/audio/images/image.png
+++ b/admin/public/ueditor/dialogs/audio/images/image.png
--- a/admin/public/ueditor/dialogs/audio/images/left_focus.jpg
+++ b/admin/public/ueditor/dialogs/audio/images/left_focus.jpg
--- a/admin/public/ueditor/dialogs/audio/images/none_focus.jpg
+++ b/admin/public/ueditor/dialogs/audio/images/none_focus.jpg
--- a/admin/public/ueditor/dialogs/audio/images/progress.png
+++ b/admin/public/ueditor/dialogs/audio/images/progress.png
--- a/admin/public/ueditor/dialogs/audio/images/right_focus.jpg
+++ b/admin/public/ueditor/dialogs/audio/images/right_focus.jpg
--- a/admin/public/ueditor/dialogs/audio/images/success.gif
+++ b/admin/public/ueditor/dialogs/audio/images/success.gif
--- a/admin/public/ueditor/dialogs/audio/images/success.png
+++ b/admin/public/ueditor/dialogs/audio/images/success.png
--- a/admin/public/ueditor/dialogs/background/background.css
+++ b/admin/public/ueditor/dialogs/background/background.css
@@ -0,0 +1,193 @@
+.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/admin/public/ueditor/dialogs/background/background.html
+++ b/admin/public/ueditor/dialogs/background/background.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <link rel="stylesheet" type="text/css" href="background.css?da860c7a">
+</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>
+    </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>
+</div>
+<script type="text/javascript" src="background.js?dd36acd0"></script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/background/background.js
+++ b/admin/public/ueditor/dialogs/background/background.js
@@ -0,0 +1,370 @@
+(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";
+                    } 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 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')),
+                    'headers': editor.options.serverHeaders || {},
+                    '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/admin/public/ueditor/dialogs/background/images/bg.png
+++ b/admin/public/ueditor/dialogs/background/images/bg.png
--- a/admin/public/ueditor/dialogs/background/images/success.png
+++ b/admin/public/ueditor/dialogs/background/images/success.png
--- a/admin/public/ueditor/dialogs/contentimport/contentimport.html
+++ b/admin/public/ueditor/dialogs/contentimport/contentimport.html
@@ -0,0 +1,176 @@
+<!DOCTYPE html>
+<head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <style type="text/css">
+        .wrapper {
+            width: 600px;
+            padding: 10px;
+            height: 352px;
+            overflow: hidden;
+            position: relative;
+            border-bottom: 1px solid #d7d7d7;
+        }
+
+        .wrapper .file-upload {
+            display: flex;
+            align-items: center;
+        }
+
+        .wrapper .file-upload .file-tip {
+            color: #999;
+            font-size: 12px;
+            padding-left: 10px;
+            flex-grow: 1;
+        }
+
+        .wrapper .file-manual {
+            background: #EEE;
+            padding: 10px;
+            border-radius: 5px;
+            margin-top: 10px;
+            line-height: 2;
+        }
+
+        .wrapper .file-manual .title {
+            font-weight: bold;
+            font-size: 120%;
+        }
+
+        .wrapper .file-manual .body {
+        }
+
+        .wrapper .file-manual .body li {
+            list-style: disc;
+            margin-left: 20px;
+        }
+
+        .wrapper .upload-button {
+            width: 100px;
+            height: 30px;
+            background-color: #F8F8F8;
+            border: 1px solid #EEE;
+            border-radius: 4px;
+            text-align: center;
+            line-height: 28px;
+            cursor: pointer;
+            position: relative;
+            flex-shrink: 0;
+            margin-right: 5px;
+        }
+
+        .wrapper .upload-button .text {
+            display: inline-block;
+            vertical-align: middle;
+        }
+
+        .wrapper .upload-button input {
+            position: absolute;
+            left: 0;
+            top: 0;
+            opacity: 0;
+            cursor: pointer;
+            height: 100%;
+            width: 100%;
+        }
+
+        .wrapper .file-result {
+            border: 1px solid #333;
+            padding: 10px;
+            border-radius: 5px;
+            position: absolute;
+            left: 10px;
+            right: 10px;
+            top: 50px;
+            background: #FFF;
+            bottom: 10px;
+            overflow: auto;
+            display: none;
+        }
+        .wrapper .file-input{
+            position: absolute;
+            left: 10px;
+            right: 10px;
+            top: 50px;
+            background: #EEE;
+            bottom: 10px;
+            border-radius: 5px;
+            display:none;
+        }
+        .wrapper .file-input textarea{
+            position: absolute;
+            left: 10px;
+            right: 10px;
+            bottom: 10px;
+            border: none;
+            resize: none;
+            border-radius: 5px;
+            padding: 5px;
+            outline: none;
+            top: 30px;
+        }
+        .wrapper .file-input .tool{
+            text-align: right;
+            padding: 5px 10px;
+        }
+        .wrapper .file-input .tool a{
+            display: inline-block;
+            text-decoration: none;
+            color: #333;
+            background: #FFF;
+            padding: 0 10px;
+            line-height: 20px;
+            border-radius: 3px;
+        }
+    </style>
+</head>
+<body>
+<div class="wrapper">
+    <div class="file-upload">
+        <div class="upload-button">
+            <div class="text">选择本地文件</div>
+            <input type="file" id="contentImport"/>
+        </div>
+        <div class="upload-button">
+            <div class="text" onclick="$('.file-input').show();">粘贴Markdown</div>
+        </div>
+        <div class="file-tip"></div>
+    </div>
+    <div class="file-manual">
+        <div class="title">
+            支持文档格式
+        </div>
+        <div class="body">
+            <ul>
+                <li><b>Word</b>：docx</li>
+                <li><b>Markdown</b>：md</li>
+            </ul>
+        </div>
+    </div>
+    <div class="file-result"></div>
+    <div class="file-input">
+        <textarea id="fileInputContent"></textarea>
+        <div class="tool">
+            <a href="javascript:;" id="fileInputConfirm">
+                确定
+            </a>
+            <a href="javascript:;" onclick="$(this).closest('.file-input').hide();">
+                关闭
+            </a>
+        </div>
+    </div>
+</div>
+<script src="../../third-party/jquery-1.10.2.js?628072e7"></script>
+<script src="https://cdn.bootcdn.net/ajax/libs/mammoth/1.6.0/mammoth.browser.min.js"></script>
+<script src="https://cdn.bootcdn.net/ajax/libs/showdown/2.1.0/showdown.min.js"></script>
+<script type="text/javascript" src="contentimport.js?5760833a"></script>
+<script type="text/javascript">
+    utils.domReady(function () {
+        var options = {};
+        var callbacks = {};
+        contentImport.init(options, callbacks);
+    });
+</script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/contentimport/contentimport.js
+++ b/admin/public/ueditor/dialogs/contentimport/contentimport.js
@@ -0,0 +1,91 @@
+var contentImport = {};
+var g = $G;
+
+contentImport.data = {
+    result: null,
+};
+contentImport.init = function (opt, callbacks) {
+    addUploadButtonListener();
+    addOkListener();
+};
+
+function processWord(file) {
+    $('.file-tip').html('正在转换Word文件，请稍后...');
+    $('.file-result').html('').hide();
+    var reader = new FileReader();
+    reader.onload = function (loadEvent) {
+        mammoth.convertToHtml({
+            arrayBuffer: loadEvent.target.result
+        })
+            .then(function displayResult(result) {
+                $('.file-tip').html('转换成功');
+                contentImport.data.result = result.value;
+                $('.file-result').html(result.value).show();
+            }, function (error) {
+                $('.file-tip').html('Word文件转换失败:' + error);
+            });
+    };
+    reader.onerror = function (loadEvent) {
+        $('.file-tip').html('Word文件转换失败:' + loadEvent);
+    };
+    reader.readAsArrayBuffer(file);
+}
+
+function processMarkdown( markdown ){
+    var converter = new showdown.Converter();
+    var html = converter.makeHtml(markdown);
+    $('.file-tip').html('转换成功');
+    contentImport.data.result = html;
+    $('.file-result').html(html).show();
+}
+
+function processMarkdownFile(file) {
+    $('.file-tip').html('正在转换Markdown文件，请稍后...');
+    $('.file-result').html('').hide();
+    var reader = new FileReader();
+    reader.onload = function (loadEvent) {
+        processMarkdown( loadEvent.target.result );
+    };
+    reader.onerror = function (loadEvent) {
+        $('.file-tip').html('Markdown文件转换失败:' + loadEvent);
+    };
+    reader.readAsText(file, "UTF-8");
+}
+
+function addUploadButtonListener() {
+    g('contentImport').addEventListener('change', function () {
+        const file = this.files[0];
+        const fileName = file.name;
+        const fileExt = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
+        switch (fileExt) {
+            case 'docx':
+            case 'doc':
+                processWord(file);
+                break;
+            case 'md':
+                processMarkdownFile(file);
+                break;
+            default:
+                $('.file-tip').html('不支持的文件格式:' + fileExt);
+                break;
+        }
+    });
+    g('fileInputConfirm').addEventListener('click', function () {
+        processMarkdown( g('fileInputContent').value );
+        $('.file-input').hide();
+    });
+}
+
+function addOkListener() {
+    dialog.onok = function () {
+        if (!contentImport.data.result) {
+            alert('请先上传文件识别内容');
+            return false;
+        }
+        editor.fireEvent('saveScene');
+        editor.execCommand("inserthtml", contentImport.data.result);
+        editor.fireEvent('saveScene');
+    };
+    dialog.oncancel = function () {
+    };
+}
--- a/admin/public/ueditor/dialogs/emotion/emotion.css
+++ b/admin/public/ueditor/dialogs/emotion/emotion.css
@@ -0,0 +1,129 @@
+.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/admin/public/ueditor/dialogs/emotion/emotion.html
+++ b/admin/public/ueditor/dialogs/emotion/emotion.html
@@ -0,0 +1,70 @@
+<!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?aea0c61c"></script>
+    <link rel="stylesheet" type="text/css" href="emotion.css?d5b42328">
+</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?61027075"></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/admin/public/ueditor/dialogs/emotion/emotion.js
+++ b/admin/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/admin/public/ueditor/dialogs/emotion/images/0.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/0.gif
--- a/admin/public/ueditor/dialogs/emotion/images/bface.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/bface.gif
--- a/admin/public/ueditor/dialogs/emotion/images/cface.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/cface.gif
--- a/admin/public/ueditor/dialogs/emotion/images/fface.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/fface.gif
--- a/admin/public/ueditor/dialogs/emotion/images/jxface2.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/jxface2.gif
--- a/admin/public/ueditor/dialogs/emotion/images/neweditor-tab-bg.png
+++ b/admin/public/ueditor/dialogs/emotion/images/neweditor-tab-bg.png
--- a/admin/public/ueditor/dialogs/emotion/images/tface.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/tface.gif
--- a/admin/public/ueditor/dialogs/emotion/images/wface.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/wface.gif
--- a/admin/public/ueditor/dialogs/emotion/images/yface.gif
+++ b/admin/public/ueditor/dialogs/emotion/images/yface.gif
--- a/admin/public/ueditor/dialogs/formula/formula.html
+++ b/admin/public/ueditor/dialogs/formula/formula.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <style type="text/css">
+        .wrapper {
+            box-sizing: border-box;
+            width: 800px;
+            height: 390px;
+            overflow: hidden;
+            position: relative;
+            border-bottom: 1px solid #d7d7d7
+        }
+
+        .editor-wrap {
+            display: flex;
+            margin: 10px;
+        }
+
+        .editor-wrap #editor {
+            width: 0;
+            flex-grow: 1;
+            border: 1px solid #CCC;
+            border-radius: 3px;
+            padding: 5px;
+            height: 100px;
+            outline: none;
+        }
+
+        .input-tip {
+            margin: 10px;
+        }
+
+        .input-tip a {
+            color: #0f0d0d;
+        }
+
+        .editor-preview {
+            background: #FFF;
+            border-radius: 3px;
+            border: 1px solid #EEE;
+            display: none;
+            margin: 10px;
+        }
+
+        .editor-preview .title {
+            padding: 5px;
+        }
+
+        .editor-preview .body {
+            padding: 5px 5px 15px 5px;
+            text-align: center;
+        }
+
+        .editor-preview .body .image {
+            max-width: 100%;
+            max-height: 100px;
+        }
+    </style>
+</head>
+<body>
+<div class="wrapper">
+
+    <div id="modeLive" style="display:none;">
+        <iframe id="liveEditor"
+                frameborder="0"
+                style="width:800px;height:390px;border: 0;outline: none;"
+        ></iframe>
+    </div>
+
+    <div id="modePlain" style="display:none;">
+        <div class="editor-wrap">
+            <textarea id="editor"></textarea>
+        </div>
+        <div class="input-tip">
+            基于 latex 语法，<a href="javascript:;" id="inputDemo">点击输入示例</a>。
+        </div>
+        <div class="editor-preview" id="preview">
+            <div class="title">预览</div>
+            <div class="body">
+                <img class="image" id="previewImage"/>
+            </div>
+        </div>
+    </div>
+
+</div>
+<script src="../../third-party/jquery-1.10.2.js?628072e7"></script>
+<script type="text/javascript" src="../../third-party/clipboard/clipboard.js?555edf0a"></script>
+<script type="text/javascript" src="formula.js?8fdd0a42"></script>
+<script type="text/javascript">
+    utils.domReady(function () {
+        Formula.init();
+    });
+</script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/formula/formula.js
+++ b/admin/public/ueditor/dialogs/formula/formula.js
@@ -0,0 +1,147 @@
+function preg_quote(str, delimiter) {
+    // Quote regular expression characters plus an optional character
+    //
+    // version: 1107.2516
+    // discuss at: http://phpjs.org/functions/preg_quote
+    // +   original by: booeyOH
+    // +   improved by: Ates Goral (http://magnetiq.com)
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   bugfixed by: Onno Marsman
+    // +   improved by: Brett Zamir (http://brett-zamir.me)
+    // *     example 1: preg_quote("$40");
+    // *     returns 1: '\$40'
+    // *     example 2: preg_quote("*RRRING* Hello?");
+    // *     returns 2: '\*RRRING\* Hello\?'
+    // *     example 3: preg_quote("\\.+*?[^]$(){}=!<>|:");
+    // *     returns 3: '\\\.\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:'
+    return (str + '').replace(new RegExp('[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\' + (delimiter || '') + '-]', 'g'), '\\$&');
+}
+
+function loadScript(url, cb) {
+    var script;
+    script = document.createElement('script');
+    script.src = url;
+    script.onload = function () {
+        cb && cb({isNew: true})
+    };
+    document.getElementsByTagName('head')[0].appendChild(script);
+}
+
+var Formula = {
+    mode: 'plain',
+    latexeasy: null,
+    init: function () {
+        // console.log('Formula.init')
+        Formula.initMode();
+        Formula.initEvent();
+        Formula.initSubmit();
+    },
+    renderPlain: function () {
+        var $preview = $('#preview');
+        var value = $('#editor').val();
+        if (!value) {
+            $preview.hide();
+            return;
+        }
+        value = encodeURIComponent(value);
+        var formulaConfig = editor.getOpt('formulaConfig');
+        var src = formulaConfig.imageUrlTemplate.replace(/\{\}/, value);
+        $('#previewImage').attr('src', src);
+        $preview.show();
+    },
+    setValuePlain: function (value) {
+        $('#editor').val(value);
+        Formula.renderPlain();
+    },
+    setValueLive: function (value) {
+        if (!Formula.latexeasy) {
+            setTimeout(function () {
+                Formula.setValueLive(value);
+            }, 100);
+            return;
+        }
+        Formula.latexeasy.call('set.latex', {latex: value});
+    },
+    initMode: function () {
+        var formulaConfig = editor.getOpt('formulaConfig');
+        if ('live' === formulaConfig.editorMode) {
+            $('#liveEditor').attr('src', formulaConfig.editorLiveServer + '/editor');
+            $('#modeLive').show();
+            Formula.mode = 'live';
+        } else {
+            $('#modePlain').show();
+            Formula.mode = 'plain';
+        }
+        var img = editor.selection.getRange().getClosedNode();
+        if (img && img.getAttribute('data-formula-image') !== null) {
+            var value = img.getAttribute('data-formula-image');
+            if (value) {
+                Formula.setValue(decodeURIComponent(value));
+            }
+        }
+    },
+    setValue: function (value) {
+        switch (Formula.mode) {
+            case 'plain':
+                Formula.setValuePlain(value);
+                break;
+            case 'live':
+                Formula.setValueLive(value);
+                break;
+        }
+    },
+    getValue: function (cb) {
+        switch (Formula.mode) {
+            case 'plain':
+                cb($.trim($('#editor').val()));
+                break;
+            case 'live':
+                Formula.latexeasy.call('get.latex', {}, function (data) {
+                    cb(data.latex);
+                });
+                break;
+        }
+    },
+    initEvent: function () {
+        var changeTimer = null, le;
+        switch (Formula.mode) {
+            case 'plain':
+                // console.log('Formula.initEvent');
+                $('#editor').on('change keypress', function () {
+                    changeTimer && clearTimeout(changeTimer);
+                    changeTimer = setTimeout(function () {
+                        Formula.renderPlain();
+                    }, 1000);
+                });
+                $('#inputDemo').on('click', function () {
+                    $('#editor').val('f(a) = \\frac{1}{2\\pi i} \\oint\\frac{f(z)}{z-a}dz');
+                    Formula.renderPlain();
+                });
+                break;
+            case 'live':
+                var formulaConfig = editor.getOpt('formulaConfig');
+                loadScript(formulaConfig.editorLiveServer + '/vendor/LatexEasyEditor/editor/sdk.js', function () {
+                    le = new window.LatexEasy(document.getElementById('liveEditor'));
+                    le.on('ready', function () {
+                        Formula.latexeasy = le;
+                    });
+                    le.init();
+                });
+                break;
+        }
+    },
+    initSubmit: function () {
+        dialog.onclose = function (t, ok) {
+            if (!ok) {
+                return true;
+            }
+            // console.log('onclose', t, ok);
+            Formula.getValue(function (value) {
+                editor.execCommand('formula', value);
+                editor.fireEvent('saveScene');
+                dialog.close(false);
+            });
+            return false;
+        };
+    }
+};
--- a/admin/public/ueditor/dialogs/help/help.css
+++ b/admin/public/ueditor/dialogs/help/help.css
@@ -0,0 +1,37 @@
+.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/admin/public/ueditor/dialogs/help/help.html
+++ b/admin/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?aea0c61c"></script>
+    <link rel="stylesheet" type="text/css" href="help.css?81231bdb">
+</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 Plus</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?0a6823d2"></script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/help/help.js
+++ b/admin/public/ueditor/dialogs/help/help.js
@@ -0,0 +1,57 @@
+/**
+ * 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/admin/public/ueditor/dialogs/image/image.css
+++ b/admin/public/ueditor/dialogs/image/image.css
@@ -0,0 +1,752 @@
+@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 {
+    outline: 0;
+}
+
+#remote #url {
+    width: 400px;
+    margin-bottom: 2px;
+}
+
+#remote #imageSelect {
+    width: 100px;
+    display: inline-block;
+    background: #FFF;
+    border: 1px solid #EEE;
+    line-height: 26px;
+    text-align: center;
+    color: #333;
+    text-decoration: none;
+    border-radius: 3px;
+    vertical-align: top;
+}
+
+#remote #width,
+#remote #height {
+    width: 30px;
+    margin-left: 2px;
+    margin-right: 2px;
+    text-align: center;
+}
+
+#remote #border,
+#remote #vhSpace,
+#remote #title {
+    width: 180px;
+    margin-right: 5px;
+}
+
+#remote #lock {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+#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;
+}
--- a/admin/public/ueditor/dialogs/image/image.html
+++ b/admin/public/ueditor/dialogs/image/image.html
@@ -0,0 +1,125 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>ueditor图片对话框</title>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+
+    <!-- jquery -->
+    <script type="text/javascript" src="../../third-party/jquery-1.10.2.js?628072e7"></script>
+
+    <!-- webuploader -->
+    <script src="../../third-party/webuploader/webuploader.js?f37088cc"></script>
+    <link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css?0057c5c7">
+
+    <!-- image dialog -->
+    <link rel="stylesheet" href="image.css?fc461d7b" type="text/css"/>
+</head>
+<body>
+
+<div class="wrapper">
+    <div id="tabhead" class="tabhead">
+        <span class="tab focus" data-content-id="remote"><var id="lang_tab_remote"></var></span>
+        <span style="display:none;" class="tab" data-content-id="upload"><var id="lang_tab_upload"></var></span>
+        <span style="display:none;" class="tab" data-content-id="online"><var id="lang_tab_online"></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>
+                    <a href="javascript:;" id="imageSelect" style="display:none;">选择图片</a>
+                </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?a72fb84c"></script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/image/image.js
+++ b/admin/public/ueditor/dialogs/image/image.js
--- a/admin/public/ueditor/dialogs/image/images/alignicon.jpg
+++ b/admin/public/ueditor/dialogs/image/images/alignicon.jpg
--- a/admin/public/ueditor/dialogs/image/images/bg.png
+++ b/admin/public/ueditor/dialogs/image/images/bg.png
--- a/admin/public/ueditor/dialogs/image/images/icons.gif
+++ b/admin/public/ueditor/dialogs/image/images/icons.gif
--- a/admin/public/ueditor/dialogs/image/images/icons.png
+++ b/admin/public/ueditor/dialogs/image/images/icons.png
--- a/admin/public/ueditor/dialogs/image/images/image.png
+++ b/admin/public/ueditor/dialogs/image/images/image.png
--- a/admin/public/ueditor/dialogs/image/images/progress.png
+++ b/admin/public/ueditor/dialogs/image/images/progress.png
--- a/admin/public/ueditor/dialogs/image/images/success.gif
+++ b/admin/public/ueditor/dialogs/image/images/success.gif
--- a/admin/public/ueditor/dialogs/image/images/success.png
+++ b/admin/public/ueditor/dialogs/image/images/success.png
--- a/admin/public/ueditor/dialogs/insertframe/insertframe.html
+++ b/admin/public/ueditor/dialogs/insertframe/insertframe.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <link rel="stylesheet" href="../../themes/default/dialog.css?963f161c">
+    <style type="text/css">
+        .warp {
+            width: 320px;
+            height: 200px;
+            margin-left: 5px;
+            padding: 20px 0 0 15px;
+            position: relative;
+        }
+
+        #url {
+            width: 290px;
+            margin-bottom: 2px;
+            margin-left: -6px;
+            margin-left: -2px \9;
+            *margin-left: 0;
+            _margin-left: 0;
+        }
+
+        .format span {
+            display: inline-block;
+            width: 58px;
+            text-align: left;
+            zoom: 1;
+        }
+
+        table td {
+            padding: 5px 0;
+        }
+
+        #align {
+            width: 65px;
+            height: 23px;
+            line-height: 22px;
+        }
+    </style>
+</head>
+<body>
+<div class="warp">
+    <table width="300" cellpadding="0" cellspacing="0">
+        <tr>
+            <td colspan="2" class="format">
+                <span><var id="lang_input_address"></var></span>
+                <input style="width:200px" id="url" type="text" value=""/>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2" class="format"><span><var id="lang_input_width"></var></span><input style="width:200px"
+                                                                                                type="text" id="width"/>
+                px
+            </td>
+
+        </tr>
+        <tr>
+            <td colspan="2" class="format"><span><var id="lang_input_height"></var></span><input style="width:200px"
+                                                                                                 type="text"
+                                                                                                 id="height"/> px
+            </td>
+        </tr>
+        <tr>
+            <td><span><var id="lang_input_isScroll"></var></span><input type="checkbox" id="scroll"/></td>
+            <td><span><var id="lang_input_frameborder"></var></span><input type="checkbox" id="frameborder"/></td>
+        </tr>
+
+        <tr>
+            <td colspan="2"><span><var id="lang_input_alignMode"></var></span>
+                <select id="align">
+                    <option value=""></option>
+                    <option value="left"></option>
+                    <option value="right"></option>
+                </select>
+            </td>
+        </tr>
+    </table>
+</div>
+<script type="text/javascript">
+    var iframe = editor._iframe;
+    if (iframe) {
+        $G("url").value = iframe.getAttribute("src") || "";
+        $G("width").value = iframe.getAttribute("width") || iframe.style.width.replace("px", "") || "";
+        $G("height").value = iframe.getAttribute("height") || iframe.style.height.replace("px", "") || "";
+        $G("scroll").checked = (iframe.getAttribute("scrolling") == "yes") ? true : false;
+        $G("frameborder").checked = (iframe.getAttribute("frameborder") == "1") ? true : false;
+        $G("align").value = iframe.align ? iframe.align : "";
+    }
+
+    function queding() {
+        var url = $G("url").value.replace(/^\s*|\s*$/ig, ""),
+            width = $G("width").value,
+            height = $G("height").value,
+            scroll = $G("scroll"),
+            frameborder = $G("frameborder"),
+            float = $G("align").value,
+            newIframe = editor.document.createElement("iframe"),
+            div;
+        if (!url) {
+            alert(lang.enterAddress);
+            return false;
+        }
+        newIframe.setAttribute("src", /http:\/\/|https:\/\//ig.test(url) ? url : "http://" + url);
+        /^[1-9]+[.]?\d*$/g.test(width) ? newIframe.setAttribute("width", width) : "";
+        /^[1-9]+[.]?\d*$/g.test(height) ? newIframe.setAttribute("height", height) : "";
+        scroll.checked ? newIframe.setAttribute("scrolling", "yes") : newIframe.setAttribute("scrolling", "no");
+        frameborder.checked ? newIframe.setAttribute("frameborder", "1", 0) : newIframe.setAttribute("frameborder", "0", 0);
+        float ? newIframe.setAttribute("align", float) : newIframe.setAttribute("align", "");
+        if (iframe) {
+            iframe.parentNode.insertBefore(newIframe, iframe);
+            domUtils.remove(iframe);
+        } else {
+            div = editor.document.createElement("div");
+            div.appendChild(newIframe);
+            editor.execCommand("inserthtml", div.innerHTML);
+        }
+        editor._iframe = null;
+        dialog.close();
+    }
+
+    dialog.onok = queding;
+    $G("url").onkeydown = function (evt) {
+        evt = evt || event;
+        if (evt.keyCode == 13) {
+            queding();
+        }
+    };
+    $focus($G("url"));
+
+</script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/internal.js
+++ b/admin/public/ueditor/dialogs/internal.js
@@ -0,0 +1,81 @@
+(function () {
+    var parent = window.parent;
+    //dialog对象
+    dialog = parent.$EDITORUI[window.frameElement.id.replace(/_iframe$/, '')];
+    //当前打开dialog的编辑器实例
+    editor = dialog.editor;
+
+    UE = parent.UE;
+
+    domUtils = UE.dom.domUtils;
+
+    utils = UE.utils;
+
+    browser = UE.browser;
+
+    ajax = UE.ajax;
+
+    $G = function (id) {
+        return document.getElementById(id)
+    };
+    //focus元素
+    $focus = function (node) {
+        setTimeout(function () {
+            if (browser.ie) {
+                var r = node.createTextRange();
+                r.collapse(false);
+                r.select();
+            } else {
+                node.focus()
+            }
+        }, 0)
+    };
+    utils.loadFile(document, {
+        href: editor.options.themePath + editor.options.theme + "/dialogbase.css?cache=" + Math.random(),
+        tag: "link",
+        type: "text/css",
+        rel: "stylesheet"
+    });
+    lang = editor.getLang(dialog.className.split("-")[2]);
+    if (lang) {
+        domUtils.on(window, 'load', function () {
+
+            var langImgPath = editor.options.langPath + editor.options.lang + "/images/";
+            //针对静态资源
+            for (var i in lang["static"]) {
+                var dom = $G(i);
+                if (!dom) continue;
+                var tagName = dom.tagName,
+                    content = lang["static"][i];
+                if (content.src) {
+                    //clone
+                    content = utils.extend({}, content, false);
+                    content.src = langImgPath + content.src;
+                }
+                if (content.style) {
+                    content = utils.extend({}, content, false);
+                    content.style = content.style.replace(/url\s*\(/g, "url(" + langImgPath)
+                }
+                switch (tagName.toLowerCase()) {
+                    case "var":
+                        dom.parentNode.replaceChild(document.createTextNode(content), dom);
+                        break;
+                    case "select":
+                        var ops = dom.options;
+                        for (var j = 0, oj; oj = ops[j];) {
+                            oj.innerHTML = content.options[j++];
+                        }
+                        for (var p in content) {
+                            p != "options" && dom.setAttribute(p, content[p]);
+                        }
+                        break;
+                    default :
+                        domUtils.setAttributes(dom, content);
+                }
+            }
+        });
+    }
+
+
+})();
+
--- a/admin/public/ueditor/dialogs/link/link.html
+++ b/admin/public/ueditor/dialogs/link/link.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <style type="text/css">
+        * {
+            margin: 0;
+            padding: 0;
+            color: #838383;
+        }
+
+        table {
+            font-size: 12px;
+            margin: 10px;
+            line-height: 36px;
+            width: 100%;
+        }
+
+        .txt {
+            box-sizing: border-box;
+            width: 90%;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid #d7d7d7;
+            border-radius: 3px;
+            padding: 0 5px;
+            outline: none;
+        }
+    </style>
+</head>
+<body>
+<div style="padding:10px;">
+    <table>
+        <tr>
+            <td><label for="text"> <var id="lang_input_text"></var></label></td>
+            <td><input class="txt" id="text" type="text" disabled="true"/></td>
+        </tr>
+        <tr>
+            <td><label for="href"> <var id="lang_input_url"></var></label></td>
+            <td><input class="txt" id="href" type="text"/></td>
+        </tr>
+        <tr>
+            <td><label for="title"> <var id="lang_input_title"></var></label></td>
+            <td><input class="txt" id="title" type="text"/></td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <label for="target"><var id="lang_input_target"></var></label>
+                <input id="target" type="checkbox"/>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2" id="msg"></td>
+        </tr>
+    </table>
+</div>
+<script type="text/javascript">
+
+    editor.setOpt('allowLinkProtocols', ['http:', 'https:', '#', '/', 'ftp:', 'mailto:', 'tel:']);
+    var allowLinkProtocols = editor.getOpt('allowLinkProtocols');
+
+    var range = editor.selection.getRange(),
+        link = range.collapsed ? editor.queryCommandValue("link") : editor.selection.getStart(),
+        url,
+        text = $G('text'),
+        rangeLink = domUtils.findParentByTagName(range.getCommonAncestor(), 'a', true),
+        orgText;
+
+    link = domUtils.findParentByTagName(link, "a", true);
+
+    if (link) {
+        url = utils.html(link.getAttribute('_href') || link.getAttribute('href', 2));
+
+        if (rangeLink === link && !link.getElementsByTagName('img').length) {
+            text.removeAttribute('disabled');
+            orgText = text.value = link[browser.ie ? 'innerText' : 'textContent'];
+        } else {
+            text.setAttribute('disabled', 'true');
+            text.value = lang.validLink;
+        }
+
+    } else {
+        if (range.collapsed) {
+            text.removeAttribute('disabled');
+            text.value = '';
+        } else {
+            text.setAttribute('disabled', 'true');
+            text.value = lang.validLink;
+        }
+
+    }
+    $G("title").value = url ? link.title : "";
+    $G("href").value = url ? url : '';
+    $G("target").checked = url && link.target == "_blank" ? true : false;
+    $focus($G("href"));
+
+    function handleDialogOk() {
+        var href = $G('href').value.replace(/^\s+|\s+$/g, '');
+        if (href) {
+            if (!hrefStartWith(href, allowLinkProtocols)) {
+                href = "http://" + href;
+            }
+            var obj = {
+                'href': href,
+                'target': $G("target").checked ? "_blank" : '_self',
+                'title': $G("title").value.replace(/^\s+|\s+$/g, ''),
+                '_href': href
+            };
+            //修改链接内容的情况太特殊了，所以先做到这里了
+            //todo:情况多的时候，做到command里
+            if (orgText && text.value != orgText) {
+                link[browser.ie ? 'innerText' : 'textContent'] = obj.textValue = text.value;
+                range.selectNode(link).select()
+            }
+            if (range.collapsed) {
+                obj.textValue = text.value;
+            }
+            editor.execCommand('link', utils.clearEmptyAttrs(obj));
+            dialog.close();
+        }
+    }
+
+    dialog.onok = handleDialogOk;
+    $G('href').onkeydown = $G('title').onkeydown = function (evt) {
+        evt = evt || window.event;
+        if (evt.keyCode == 13) {
+            handleDialogOk();
+            return false;
+        }
+    };
+    $G('href').onblur = function () {
+        if (!hrefStartWith(this.value, allowLinkProtocols)) {
+            $G("msg").innerHTML = "<span style='color: red'>" + lang.httpPrompt + "</span>";
+        } else {
+            $G("msg").innerHTML = "";
+        }
+    };
+
+    function hrefStartWith(href, arr) {
+        href = href.replace(/^\s+|\s+$/g, '');
+        for (var i = 0, ai; ai = arr[i++];) {
+            if (href.indexOf(ai) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+</script>
+</body>
+</html>
--- a/admin/public/ueditor/dialogs/preview/preview.html
+++ b/admin/public/ueditor/dialogs/preview/preview.html
@@ -0,0 +1,45 @@
+<!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"/>
+    <style>
+        html, body {
+            height: 100%;
+            width: 100%;
+            padding: 0;
+            margin: 0;
+        }
+
+        #preview {
+            width: 100%;
+            height: 100%;
+            padding: 0;
+            margin: 0;
+        }
+
+        #preview * {
+            font-family: sans-serif;
+            font-size: 16px;
+        }
+    </style>
+    <script type="text/javascript" src="../internal.js?aea0c61c"></script>
+    <script src="../../ueditor.parse.js?8e3d12c6"></script>
+    <title></title>
+</head>
+<body class="view">
+<div id="preview" style="margin:8px">
+
+</div>
+</body>
+<script>
+    document.getElementById('preview').innerHTML = editor.getContent();
+    uParse('#preview', {
+        rootPath: '../../',
+        chartContainerHeight: 500
+    })
+    dialog.oncancel = function () {
+        document.getElementById('preview').innerHTML = '';
+    }
+</script>
+</html>
--- a/admin/public/ueditor/dialogs/scrawl/images/addimg.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/addimg.png
--- a/admin/public/ueditor/dialogs/scrawl/images/brush.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/brush.png
--- a/admin/public/ueditor/dialogs/scrawl/images/delimg.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/delimg.png
--- a/admin/public/ueditor/dialogs/scrawl/images/delimgH.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/delimgH.png
--- a/admin/public/ueditor/dialogs/scrawl/images/empty.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/empty.png
--- a/admin/public/ueditor/dialogs/scrawl/images/emptyH.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/emptyH.png
--- a/admin/public/ueditor/dialogs/scrawl/images/eraser.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/eraser.png
--- a/admin/public/ueditor/dialogs/scrawl/images/redo.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/redo.png
--- a/admin/public/ueditor/dialogs/scrawl/images/redoH.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/redoH.png
--- a/admin/public/ueditor/dialogs/scrawl/images/scale.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/scale.png
--- a/admin/public/ueditor/dialogs/scrawl/images/scaleH.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/scaleH.png
--- a/admin/public/ueditor/dialogs/scrawl/images/size.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/size.png
--- a/admin/public/ueditor/dialogs/scrawl/images/undo.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/undo.png
--- a/admin/public/ueditor/dialogs/scrawl/images/undoH.png
+++ b/admin/public/ueditor/dialogs/scrawl/images/undoH.png
--- a/Show More
+++ b/Show More