Merge pull request #192 from yiming187/build_update

Update assembly build

Merge pull request #192 from yiming187/build_update
6f85ecac · Yiming Liu · 96bcd0f5 · f429b322 · 6f85ecac · 96bcd0f5
Commit 6f85ecac authored May 16, 2016 by Yiming Liu
31 changed files
--- a/apollo-adminservice/pom.xml
+++ b/apollo-adminservice/pom.xml
@@ -72,33 +72,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<executable>true</executable>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptors>
-								<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
--- a/apollo-adminservice/src/main/config/apollo-adminservice.conf
+++ b/apollo-adminservice/src/main/config/apollo-adminservice.conf
-MODE=service
-PID_FOLDER=.
-LOG_FOLDER=/opt/logs/100003172/
\ No newline at end of file
--- a/apollo-adminservice/src/main/config/app.properties
+++ b/apollo-adminservice/src/main/config/app.properties
-appId=100003172
-jdkVersion=1.8
\ No newline at end of file
--- a/apollo-adminservice/src/main/resources/application.yml
+++ b/apollo-adminservice/src/main/resources/application.yml
+spring:
+  application:
+    name: apollo-adminservice
+
+ctrip:
+  appid: 100003172
+  
+server:
+  port: 8090
+  
+logging:
+  file: /opt/logs/100003172/apollo-adminservice.log
\ No newline at end of file
--- a/apollo-adminservice/src/main/resources/bootstrap.yml
+++ b/apollo-adminservice/src/main/resources/bootstrap.yml
@@ -7,3 +7,7 @@ eureka:
      defaultZone: http://${eureka.instance.hostname}:8080/eureka/
    healthcheck:
      enabled: true
+
+endpoints:
+  shutdown:
+    enabled: true      
\ No newline at end of file
--- a/apollo-adminservice/src/main/scripts/shutdown.sh
+++ b/apollo-adminservice/src/main/scripts/shutdown.sh
-#!/bin/bash
-SERVICE_NAME=apollo-adminservice
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then
-    cd current
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  chmod a+x $SERVICE_NAME".jar"
-  ./$SERVICE_NAME".jar" stop
-fi
--- a/apollo-adminservice/src/main/scripts/startup.sh
+++ b/apollo-adminservice/src/main/scripts/startup.sh
-#!/bin/bash
-SERVICE_NAME=apollo-adminservice
-VERSION=0.0.1-SNAPSHOT
-PATH_TO_JAR=$SERVICE_NAME"-"$VERSION".jar"
-
-export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
-export JAVA_OPTS="$JAVA_OPTS -Xloggc:/opt/logs/100003172/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003172/HeapDumpOnOutOfMemoryError/"
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
-    cd current
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  rm -rf $SERVICE_NAME".jar"
-fi
-
-ln $PATH_TO_JAR $SERVICE_NAME".jar"
-chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
-
-exit 0;
--- a/apollo-assembly/pom.xml
+++ b/apollo-assembly/pom.xml
@@ -62,4 +62,81 @@
 			</plugin>
 		</plugins>
 	</build>
+	<profiles>
+		<profile>
+			<id>configservice</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
+									<appendAssemblyId>false</appendAssemblyId>
+									<descriptors>
+										<descriptor>src/assembly/configservice/assembly-descriptor.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>adminservice</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
+									<appendAssemblyId>false</appendAssemblyId>
+									<descriptors>
+										<descriptor>src/assembly/adminservice/assembly-descriptor.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>portal</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
+									<appendAssemblyId>false</appendAssemblyId>
+									<descriptors>
+										<descriptor>src/assembly/portal/assembly-descriptor.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
--- a/apollo-adminservice/src/assembly/assembly-descriptor.xml
+++ b/apollo-adminservice/src/assembly/assembly-descriptor.xml
@@ -2,7 +2,7 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-	<id>apollo-adminservice</id>
+	<id>apollo-assembly</id>
 	<formats>
 		<format>zip</format>
 	</formats>
@@ -10,6 +10,15 @@
 	<fileSets>
 		<!--scripts -->
 		<fileSet>
+			<directory>src/main/scripts/adminservice</directory>
+			<outputDirectory>scripts</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+			<fileMode>0755</fileMode>
+			<lineEnding>unix</lineEnding>
+		</fileSet>
+		<fileSet>
 			<directory>src/main/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
 			<includes>
@@ -22,7 +31,7 @@
 			<directory>src/main/config</directory>
 			<outputDirectory>config</outputDirectory>
 			<excludes>
-				<exclude>apollo-adminservice.conf</exclude>
+				<exclude>apollo-assembly.conf</exclude>
 			</excludes>
 			<lineEnding>unix</lineEnding>
 		</fileSet>
@@ -30,7 +39,7 @@
 			<directory>src/main/config</directory>
 			<outputDirectory>/</outputDirectory>
 			<includes>
-				<include>apollo-adminservice.conf</include>
+				<include>apollo-assembly.conf</include>
 			</includes>
 			<lineEnding>unix</lineEnding>
 		</fileSet>

--- a/apollo-configservice/src/assembly/assembly-descriptor.xml
+++ b/apollo-configservice/src/assembly/assembly-descriptor.xml
@@ -2,7 +2,7 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-	<id>apollo-configservice</id>
+	<id>apollo-assembly</id>
 	<formats>
 		<format>zip</format>
 	</formats>
@@ -10,6 +10,15 @@
 	<fileSets>
 		<!--scripts -->
 		<fileSet>
+			<directory>src/main/scripts/configservice</directory>
+			<outputDirectory>scripts</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+			<fileMode>0755</fileMode>
+			<lineEnding>unix</lineEnding>
+		</fileSet>
+		<fileSet>
 			<directory>src/main/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
 			<includes>
@@ -22,7 +31,7 @@
 			<directory>src/main/config</directory>
 			<outputDirectory>config</outputDirectory>
 			<excludes>
-				<exclude>apollo-configservice.conf</exclude>
+				<exclude>apollo-assembly.conf</exclude>
 			</excludes>
 			<lineEnding>unix</lineEnding>
 		</fileSet>
@@ -30,7 +39,7 @@
 			<directory>src/main/config</directory>
 			<outputDirectory>/</outputDirectory>
 			<includes>
-				<include>apollo-configservice.conf</include>
+				<include>apollo-assembly.conf</include>
 			</includes>
 			<lineEnding>unix</lineEnding>
 		</fileSet>

--- a/apollo-portal/src/assembly/assembly-descriptor.xml
+++ b/apollo-portal/src/assembly/assembly-descriptor.xml
@@ -2,7 +2,7 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-	<id>apollo-portal</id>
+	<id>apollo-assembly</id>
 	<formats>
 		<format>zip</format>
 	</formats>
@@ -10,6 +10,15 @@
 	<fileSets>
 		<!--scripts -->
 		<fileSet>
+			<directory>src/main/scripts/portal</directory>
+			<outputDirectory>scripts</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+			<fileMode>0755</fileMode>
+			<lineEnding>unix</lineEnding>
+		</fileSet>
+		<fileSet>
 			<directory>src/main/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
 			<includes>
@@ -22,7 +31,7 @@
 			<directory>src/main/config</directory>
 			<outputDirectory>config</outputDirectory>
 			<excludes>
-				<exclude>apollo-portal.conf</exclude>
+				<exclude>apollo-assembly.conf</exclude>
 			</excludes>
 			<lineEnding>unix</lineEnding>
 		</fileSet>
@@ -30,7 +39,7 @@
 			<directory>src/main/config</directory>
 			<outputDirectory>/</outputDirectory>
 			<includes>
-				<include>apollo-portal.conf</include>
+				<include>apollo-assembly.conf</include>
 			</includes>
 			<lineEnding>unix</lineEnding>
 		</fileSet>

--- a/apollo-assembly/src/main/scripts/adminservice/run_args.sh
+++ b/apollo-assembly/src/main/scripts/adminservice/run_args.sh
+#!/bin/bash
+RUN_ARGS='--adminservice'
--- a/apollo-assembly/src/main/scripts/configservice/run_args.sh
+++ b/apollo-assembly/src/main/scripts/configservice/run_args.sh
+#!/bin/bash
+RUN_ARGS='--configservice'
--- a/apollo-assembly/src/main/scripts/portal/run_args.sh
+++ b/apollo-assembly/src/main/scripts/portal/run_args.sh
+#!/bin/bash
+RUN_ARGS='--portal'
--- a/apollo-assembly/src/main/scripts/run_args.sh
+++ b/apollo-assembly/src/main/scripts/run_args.sh
+#!/bin/bash
+RUN_ARGS='--configservice --adminservice --portal'
--- a/apollo-assembly/src/main/scripts/startup.sh
+++ b/apollo-assembly/src/main/scripts/startup.sh
@@ -20,8 +20,10 @@ if [[ -f $SERVICE_NAME".jar" ]]; then
  rm -rf $SERVICE_NAME".jar"
 fi

+source ./scripts/run_args.sh
+
 ln $PATH_TO_JAR $SERVICE_NAME".jar"
 chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
+./$SERVICE_NAME".jar" start $RUN_ARGS

 exit 0;
--- a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh
+++ b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh
@@ -44,6 +44,7 @@ ln -s $APP_RELEASE_DIR $APP_DIR

 chmod +x $APP_STARTUP_SCRIPT
 chmod +x $APP_SHUTDOWN_SCRIPT
+env spring.profiles.active=dev bash
 $APP_SHUTDOWN_SCRIPT 
 $APP_STARTUP_SCRIPT
 wait
--- a/apollo-configservice/pom.xml
+++ b/apollo-configservice/pom.xml
@@ -73,33 +73,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<executable>true</executable>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptors>
-								<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
--- a/apollo-configservice/src/main/config/apollo-configservice.conf
+++ b/apollo-configservice/src/main/config/apollo-configservice.conf
-MODE=service
-PID_FOLDER=.
-LOG_FOLDER=/opt/logs/100003171/
--- a/apollo-configservice/src/main/config/app.properties
+++ b/apollo-configservice/src/main/config/app.properties
-appId=100003171
-jdkVersion=1.8
\ No newline at end of file
--- a/apollo-configservice/src/main/resources/application.yml
+++ b/apollo-configservice/src/main/resources/application.yml
+spring:
+  application:
+    name: apollo-configservice
+
+ctrip:
+  appid: 100003171
+  
+server:
+  port: 8080
+  
+logging:
+  file: /opt/logs/100003171/apollo-configservice.log
\ No newline at end of file
--- a/apollo-configservice/src/main/resources/bootstrap.yml
+++ b/apollo-configservice/src/main/resources/bootstrap.yml
@@ -2,8 +2,14 @@ eureka:
  instance:
    hostname: ${hostname:localhost}
    preferIpAddress: true
+  server:
+    enableSelfPreservation: false
  client:
    serviceUrl:
      defaultZone: http://${eureka.instance.hostname}:8080/eureka/
    healthcheck:
      enabled: true
+
+endpoints:
+  shutdown:
+    enabled: true     
\ No newline at end of file
--- a/apollo-configservice/src/main/scripts/shutdown.sh
+++ b/apollo-configservice/src/main/scripts/shutdown.sh
-#!/bin/bash
-SERVICE_NAME=apollo-configservice
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then
-    cd current
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  chmod a+x $SERVICE_NAME".jar"
-  ./$SERVICE_NAME".jar" stop
-fi
--- a/apollo-configservice/src/main/scripts/startup.sh
+++ b/apollo-configservice/src/main/scripts/startup.sh
-#!/bin/bash
-SERVICE_NAME=apollo-configservice
-VERSION=0.0.1-SNAPSHOT
-PATH_TO_JAR=$SERVICE_NAME"-"$VERSION".jar"
-
-export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
-export JAVA_OPTS="$JAVA_OPTS -Xloggc:/opt/logs/100003171/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003171/HeapDumpOnOutOfMemoryError/"
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
-    cd current
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  rm -rf $SERVICE_NAME".jar"
-fi
-
-ln $PATH_TO_JAR $SERVICE_NAME".jar"
-chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
-
-exit 0;
--- a/apollo-portal/pom.xml
+++ b/apollo-portal/pom.xml
@@ -24,34 +24,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<executable>true</executable>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptors>
-								<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
--- a/apollo-portal/src/main/config/apollo-portal.conf
+++ b/apollo-portal/src/main/config/apollo-portal.conf
-MODE=service
-PID_FOLDER=.
-LOG_FOLDER=/opt/logs/100003173/
--- a/apollo-portal/src/main/config/app.properties
+++ b/apollo-portal/src/main/config/app.properties
-appId=100003171
-jdkVersion=1.8
\ No newline at end of file
--- a/apollo-portal/src/main/resources/application.yml
+++ b/apollo-portal/src/main/resources/application.yml
+spring:
+  application:
+    name: apollo-portal
+
+ctrip:
+  appid: 100003173
+  
+server:
+  port: 8070
+  
+logging:
+  file: /opt/logs/100003173/apollo-portal.log
+  
+endpoints:
+  shutdown:
+    enabled: true     
\ No newline at end of file
--- a/apollo-portal/src/main/scripts/shutdown.sh
+++ b/apollo-portal/src/main/scripts/shutdown.sh
-#!/bin/bash
-SERVICE_NAME=apollo-portal
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then
-    cd current
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  chmod a+x $SERVICE_NAME".jar"
-  ./$SERVICE_NAME".jar" stop
-fi
--- a/apollo-portal/src/main/scripts/startup.sh
+++ b/apollo-portal/src/main/scripts/startup.sh
-#!/bin/bash
-SERVICE_NAME=apollo-portal
-VERSION=0.0.1-SNAPSHOT
-PATH_TO_JAR=$SERVICE_NAME"-"$VERSION".jar"
-
-export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:-ReduceInitialCardMarks -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8"
-export JAVA_OPTS="$JAVA_OPTS -Xloggc:/opt/logs/100003173/heap_trace.txt -XX:HeapDumpPath=/opt/logs/100003173/HeapDumpOnOutOfMemoryError/"
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
-    cd current
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  rm -rf $SERVICE_NAME".jar"
-fi
-
-ln $PATH_TO_JAR $SERVICE_NAME".jar"
-chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
-
-exit 0;
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<jetty.version>9.2.15.v20160210</jetty.version>
+		<jetty.version>9.3.8.v20160314</jetty.version>
 		<github.global.server>github</github.global.server>
 		<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
 	</properties>
@@ -250,7 +250,7 @@
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>1.3.4.RELEASE</version>
+					<version>1.3.5.RELEASE</version>
 					<executions>
 						<execution>
 							<goals>