Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	docker/Dockerfile
#	docker/redis-manager-start.sh
#	docs/images/wechat.png
#	src/main/java/com/newegg/ec/cache/app/controller/check/CheckLogic.java
#	src/main/java/com/newegg/ec/cache/app/controller/websocket/CreateClusterLogHandler.java
#	src/main/java/com/newegg/ec/cache/app/util/JedisUtil.java
#	src/main/java/com/newegg/ec/cache/app/util/NetUtil.java
#	src/main/java/com/newegg/ec/cache/backend/InitConfig.java
#	src/main/java/com/newegg/ec/cache/backend/checker/strategy/impl/WechatNotify.java
#	src/main/java/com/newegg/ec/cache/plugin/basemodel/PluginParent.java
#	src/main/resources/application.yml
#	src/main/resources/public/core/userApi.js
#	src/main/resources/public/js/node-manager.js
#	src/main/resources/templates/monitor.html

Author: Reason.H.Duan

.gitattributes

@@ -7,3 +7,22 @@ logs/*
 /.settings/
 /.classpath
 /.project
+
+.DS_Store
+node_modules/
+/dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+/test/unit/coverage/
+/test/e2e/reports/
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+redis-manger-ui/redis-manager-vue/package-lock.json

.gitignore

@@ -8,5 +8,5 @@ for i in *.jar; do
         CLASSPATH=${CLASSPATH}:$i
 done
 echo ${CLASSPATH}
-java -cp ${CLASSPATH} com.newegg.ec.cache.Application >> logs/start.log 2>&1 < /dev/null &
+java -cp ${CLASSPATH} com.newegg.ec.redis.RedisManagerApplication >> logs/start.log 2>&1 < /dev/null &
 echo $! > pid