Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/js/channel.js
#	src/main/resources/js/channel.min.js
#	src/main/resources/scss/base.scss

README.md

@@ -3,20 +3,20 @@
 <br>
 Rhythm 社区系统，超丰富的社区功能，基于 Symphony 社区版深度定制。
 <br><br>
-<img src="https://img.shields.io/github/languages/code-size/csfwff/rhythm.svg?style=flat-square">
+<img src="https://img.shields.io/github/languages/code-size/FishPiOffical/rhythm.svg?style=flat-square">
 <img src="http://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square">
-<img src="https://img.shields.io/github/last-commit/csfwff/rhythm.svg?style=flat-square">
-<img src="https://img.shields.io/github/issues-pr-closed/csfwff/rhythm.svg?style=flat-square">
+<img src="https://img.shields.io/github/last-commit/FishPiOffical/rhythm.svg?style=flat-square">
+<img src="https://img.shields.io/github/issues-pr-closed/FishPiOffical/rhythm.svg?style=flat-square">
 <br>
-<img src="https://img.shields.io/github/repo-size/csfwff/rhythm?style=flat-square">
-<img src="https://img.shields.io/github/languages/count/csfwff/rhythm?style=flat-square">
-<img src="https://img.shields.io/github/languages/top/csfwff/rhythm?style=flat-square">
-<img src="https://img.shields.io/github/issues/csfwff/rhythm?style=flat-square">
-<img src="https://img.shields.io/github/issues-closed-raw/csfwff/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/repo-size/FishPiOffical/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/languages/count/FishPiOffical/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/languages/top/FishPiOffical/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/issues/FishPiOffical/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/issues-closed-raw/FishPiOffical/rhythm?style=flat-square">
 <br>
-<img src="https://img.shields.io/github/forks/csfwff/rhythm?style=flat-square">
-<img src="https://img.shields.io/github/stars/csfwff/rhythm?style=flat-square">
-<img src="https://img.shields.io/github/watchers/csfwff/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/forks/FishPiOffical/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/stars/FishPiOffical/rhythm?style=flat-square">
+<img src="https://img.shields.io/github/watchers/FishPiOffical/rhythm?style=flat-square">
 </p>
 
 本仓库为摸鱼派社区全部源码，欢迎访问基于 Rhythm 的程序员社区：[摸鱼派](https://fishpi.cn)
@@ -27,6 +27,6 @@ Rhythm 社区系统，超丰富的社区功能，基于 Symphony 社区版深度
 
 ### 贡献者
 
-<a href="https://github.com/csfwff/rhythm/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=csfwff/rhythm" />
+<a href="https://github.com/FishPiOffical/rhythm/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=FishPiOffical/rhythm" />
 </a>

gulpfile.js

@@ -29,7 +29,7 @@
 var gulp = require('gulp')
 var concat = require('gulp-concat')
 var cleanCSS = require('gulp-clean-css')
-var uglify = require('gulp-uglify')
+var terser = require('gulp-terser')
 var sass = require('gulp-sass')(require('sass'));
 var rename = require('gulp-rename')
 var del = require('del')
@@ -74,7 +74,7 @@ function minArticleCSS () {
 function minJS () {
   // min js
   return gulp.src('./src/main/resources/js/*.js').
-    pipe(uglify()).
+    pipe(terser()).
     pipe(rename({suffix: '.min'})).
     pipe(gulp.dest('./src/main/resources/js/'))
 }
@@ -88,7 +88,7 @@ function minUpload () {
     './src/main/resources/js/lib/jquery/file-upload-9.10.1/jquery.fileupload-process.js',
     './src/main/resources/js/lib/jquery/file-upload-9.10.1/jquery.fileupload-validate.js']
   return gulp.src(jsJqueryUpload).
-    pipe(uglify()).
+    pipe(terser()).
     pipe(concat('jquery.fileupload.min.js')).
     pipe(gulp.dest('./src/main/resources/js/lib/jquery/file-upload-9.10.1/'))
 }
@@ -104,7 +104,7 @@ function minLibs () {
     './src/main/resources/js/lib/jquery/jquery.pjax.js',
     './src/main/resources/js/lib/nprogress/nprogress.js']
   return gulp.src(jsCommonLib).
-    pipe(uglify()).
+    pipe(terser()).
     pipe(concat('libs.min.js')).
     pipe(gulp.dest('./src/main/resources/js/lib/compress/'))
 }
@@ -118,7 +118,7 @@ function minArticleLibs () {
     './src/main/resources/js/lib/diff2html/diff2html-ui.min.js',
     './src/main/resources/js/lib/diff2html/diff.min.js']
   return gulp.src(jsArticleLib).
-    pipe(uglify()).
+    pipe(terser()).
     pipe(concat('article-libs.min.js')).
     pipe(gulp.dest('./src/main/resources/js/lib/compress/'))
 }