diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f2ec1da..328c6425d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,19 @@
-
-## [2.1.1](https://github.com/slimkit/plus/compare/2.1.0...2.1.1) (2018-10-29)
+
+## [2.1.2](https://github.com/slimkit/plus/compare/2.0.7...2.1.2) (2018-11-07)
-
-# [2.1.0](https://github.com/slimkit/plus/compare/2.0.4...2.1.0) (2018-10-22)
+
+## [2.0.7](https://github.com/slimkit/plus/compare/2.1.1...2.0.7) (2018-11-07)
### Bug Fixes
-* 修复核心加载中间件错误 ([55ad69e](https://github.com/slimkit/plus/commit/55ad69e))
-* **feeds:** 减少列表查询时的事务处理，避免数据库死锁问题 ([f8cd28e](https://github.com/slimkit/plus/commit/f8cd28e)), closes [slimkit/plus#394](https://github.com/slimkit/plus/issues/394)
-* **file-storage:** 增加兼容性，避免 headers 出现中文 ([3d6acbc](https://github.com/slimkit/plus/commit/3d6acbc))
-* **news:** 修复投稿时输入错误密码依然能够投稿成功！ ([c64e400](https://github.com/slimkit/plus/commit/c64e400)), closes [zhiyicx/thinksns-plus-android#2396](https://github.com/zhiyicx/thinksns-plus-android/issues/2396) [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* **news:** 修复撤销投稿 SQL 报错 ([312139c](https://github.com/slimkit/plus/commit/312139c)), closes [thinksns-plus-android/issues#2402](https://github.com/thinksns-plus-android/issues/issues/2402)
-* **news:** 开发人员错误提交表迁移导致通过后无法删除资讯 ([5fa170e](https://github.com/slimkit/plus/commit/5fa170e)), closes [zhiyicx/thinksns-plus-android#2402](https://github.com/zhiyicx/thinksns-plus-android/issues/2402)
-
-
-### Features
-
-* 启动接口返回是否需要用户输入支付时密码标识 ([058c852](https://github.com/slimkit/plus/commit/058c852)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* 增加支付节点验证用户密码 ([a50d0a4](https://github.com/slimkit/plus/commit/a50d0a4)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* 新增打赏用户需要验证用户密码 ([e873876](https://github.com/slimkit/plus/commit/e873876)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* 验证用户密码中间件允许后台开关 ([7ba0df1](https://github.com/slimkit/plus/commit/7ba0df1))
-* **admin:** 增加验证用户支付时密码开关功能 ([02d8ec0](https://github.com/slimkit/plus/commit/02d8ec0)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* **core:** 核心 FileWith 允许批量复制属性 ([ad2ff46](https://github.com/slimkit/plus/commit/ad2ff46))
-* **feeds:** 增加动态和动态评论置顶申请验证用户密码 ([0a219db](https://github.com/slimkit/plus/commit/0a219db))
-* **feeds:** 增加打赏动态验证用户密码 ([b82139c](https://github.com/slimkit/plus/commit/b82139c)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* **news:** 增加资讯和资讯评论申请置顶验证用户密码 ([8b89b39](https://github.com/slimkit/plus/commit/8b89b39)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
-* **news:** 增加资讯打赏验证密码 ([885dbf1](https://github.com/slimkit/plus/commit/885dbf1))
-* **news:** 增加资讯投稿验证用户密码 ([f7b3f9b](https://github.com/slimkit/plus/commit/f7b3f9b)), closes [zhiyicx/thinksns-plus-android#2390](https://github.com/zhiyicx/thinksns-plus-android/issues/2390)
+* 修复附近的人后台配置面板无法提交配置问题 ([c98a46f](https://github.com/slimkit/plus/commit/c98a46f)), closes [zhiyicx/plus-component-pc#1081](https://github.com/zhiyicx/plus-component-pc/issues/1081) [zhiyicx/plus-jiajialin#1](https://github.com/zhiyicx/plus-jiajialin/issues/1)
+* **file-storage:** 本地驱动不支持视频在线播放问题 ([76ae3a8](https://github.com/slimkit/plus/commit/76ae3a8))
+* **file-storage:** 修复本地存储系统不支持 GIF 图片 ([99e4e8a](https://github.com/slimkit/plus/commit/99e4e8a))
+* **file-storage:** 增加存储系统兼容性，错误配置将不会导致全站崩溃 ([af821ff](https://github.com/slimkit/plus/commit/af821ff))
+* **news:** 修复资讯前台投稿未做 Markdown 转换处理 ([0009250](https://github.com/slimkit/plus/commit/0009250))
diff --git a/app/Application.php b/app/Application.php
index 155f7d803..eb7aeed45 100644
--- a/app/Application.php
+++ b/app/Application.php
@@ -29,7 +29,7 @@ class Application extends LaravelApplication implements AppInterface
*
* @var string
*/
- const VERSION = '2.1.1';
+ const VERSION = '2.1.2';
/**
* Create a new Illuminate application instance.
diff --git a/composer.json b/composer.json
index 07ade7243..6f6fedb11 100644
--- a/composer.json
+++ b/composer.json
@@ -106,14 +106,14 @@
"overtrue/easy-sms": "^1.0",
"pingplusplus/pingpp-php": "^2.2",
"predis/predis": "^1.1",
- "slimkit/plus-appversion": "2.1.1",
- "slimkit/plus-around-amap": "2.1.1",
- "slimkit/plus-checkin": "2.1.1",
- "slimkit/plus-feed": "2.1.1",
- "slimkit/plus-id": "2.1.1",
- "slimkit/plus-music": "2.1.1",
- "slimkit/plus-news": "2.1.1",
- "slimkit/plus-socialite": "2.1.1",
+ "slimkit/plus-appversion": "2.1.2",
+ "slimkit/plus-around-amap": "2.1.2",
+ "slimkit/plus-checkin": "2.1.2",
+ "slimkit/plus-feed": "2.1.2",
+ "slimkit/plus-id": "2.1.2",
+ "slimkit/plus-music": "2.1.2",
+ "slimkit/plus-news": "2.1.2",
+ "slimkit/plus-socialite": "2.1.2",
"symfony/finder": "^4.0",
"symfony/yaml": "^4.0",
"tymon/jwt-auth": "1.0.0-rc.3"
diff --git a/package.json b/package.json
index 6822a7ac1..8069b9aef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"private": true,
- "version": "2.1.1",
+ "version": "2.1.2",
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
diff --git a/packages/slimkit-plus-appversion/composer.json b/packages/slimkit-plus-appversion/composer.json
index 3fc8abc01..1147390da 100644
--- a/packages/slimkit-plus-appversion/composer.json
+++ b/packages/slimkit-plus-appversion/composer.json
@@ -28,5 +28,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-around-amap/composer.json b/packages/slimkit-plus-around-amap/composer.json
index 8baaeaf11..e8e128b26 100755
--- a/packages/slimkit-plus-around-amap/composer.json
+++ b/packages/slimkit-plus-around-amap/composer.json
@@ -24,5 +24,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-checkin/composer.json b/packages/slimkit-plus-checkin/composer.json
index fe968c2b9..6adfdb277 100644
--- a/packages/slimkit-plus-checkin/composer.json
+++ b/packages/slimkit-plus-checkin/composer.json
@@ -34,5 +34,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-feed/composer.json b/packages/slimkit-plus-feed/composer.json
index e76f695cc..2d6036fed 100755
--- a/packages/slimkit-plus-feed/composer.json
+++ b/packages/slimkit-plus-feed/composer.json
@@ -34,5 +34,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-id/composer.json b/packages/slimkit-plus-id/composer.json
index dc1ba733c..b7d9d370c 100644
--- a/packages/slimkit-plus-id/composer.json
+++ b/packages/slimkit-plus-id/composer.json
@@ -28,5 +28,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-music/composer.json b/packages/slimkit-plus-music/composer.json
index ea4e1ae60..5a55927c2 100644
--- a/packages/slimkit-plus-music/composer.json
+++ b/packages/slimkit-plus-music/composer.json
@@ -28,5 +28,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-news/composer.json b/packages/slimkit-plus-news/composer.json
index 436df9756..d839235fa 100644
--- a/packages/slimkit-plus-news/composer.json
+++ b/packages/slimkit-plus-news/composer.json
@@ -29,5 +29,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}
diff --git a/packages/slimkit-plus-socialite/composer.json b/packages/slimkit-plus-socialite/composer.json
index 774f9e804..dc3c5bcf7 100644
--- a/packages/slimkit-plus-socialite/composer.json
+++ b/packages/slimkit-plus-socialite/composer.json
@@ -28,5 +28,5 @@
]
}
},
- "version": "2.1.1"
+ "version": "2.1.2"
}