Merge branch 'master' into docker_package

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java

renren-admin/src/main/docker/Dockerfile

@@ -3,6 +3,7 @@ ENV JAR_FILE renren-admin.jar
 ENV TAR_FILE renren-admin-1.0.tar.gz
 ENV ACTIVE "dev"
 ENV Xmx "1G"
+ENV Xms "512M"
 
 ENV VERTICLE_HOME /usr/hisense
 EXPOSE 8888
@@ -15,4 +16,4 @@ HEALTHCHECK --interval=3m --timeout=3s --start-period=3m --retries=5 CMD curl --
 
 WORKDIR $VERTICLE_HOME/renren-admin
 ENTRYPOINT ["sh", "-c"]
-CMD ["exec java -jar -Dfile.encoding=utf-8 -server -Xshareclasses -Xtune:virtualized -Xms512M -Xmx$Xmx -XX:ReservedCodeCacheSize=240m -XX:InitialCodeCacheSize=240m -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -XX:ConcGCThreads=1 -XX:ParallelGCThreads=2 -XX:ZCollectionInterval=120 -XX:ZAllocationSpikeTolerance=5 -Duser.timezone=GMT+08 $VERTICLE_HOME/renren-admin/$JAR_FILE --spring.profiles.active=$ACTIVE"]
+CMD ["exec java -jar -Dfile.encoding=utf-8 -server -Xshareclasses -Xtune:virtualized -Xms$Xms -Xmx$Xmx -XX:ReservedCodeCacheSize=240m -XX:InitialCodeCacheSize=240m -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -XX:ConcGCThreads=1 -XX:ParallelGCThreads=2 -XX:ZCollectionInterval=120 -XX:ZAllocationSpikeTolerance=5 -Duser.timezone=GMT+08 $VERTICLE_HOME/renren-admin/$JAR_FILE --spring.profiles.active=$ACTIVE"]

renren-admin/src/main/java/io/renren/common/utils/UpdateUtil.java

@@ -92,5 +92,7 @@ public class UpdateUtil {
 //        String cmd = String.format("cd %s && sh update.sh %s %s", pwd, pwd, updateFilePath, "renren-admin", active);
         logger.info("执行指令：{}", Arrays.asList(cmd).toString());
         logger.info(RuntimeUtil.execForStr(cmd));
+        String[] docker_cmd = {"/bin/sh", "-c", "docker restart renren-admin"};
+        logger.info(RuntimeUtil.execForStr(docker_cmd));
     }
 }