something

2017-03-06 16:51:20 +08:00
parent c527924169
commit 3e022ad101
6 changed files with 68 additions and 48 deletions
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.7.3</version>
+		<version>1.7.4</version>
 	</parent>
 	<artifactId>weixin4j-example</artifactId>
 	<version>1.0</version>
@@ -19,7 +19,7 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
 					<descriptors>
-						<descriptor>../script/assembly.xml</descriptor>
+						<descriptor>src/main/script/assembly.xml</descriptor>
 					</descriptors>
 					<finalName>weixin4j-server</finalName>
 				</configuration>
@@ -47,13 +47,13 @@
 		<dependency>
 			<groupId>com.foxinmy</groupId>
 			<artifactId>weixin4j-mp</artifactId>
-			<version>1.7.3</version>
+			<version>1.7.4</version>
 		</dependency>
 		<!-- 微信企业号 -->
 		<dependency>
 			<groupId>com.foxinmy</groupId>
 			<artifactId>weixin4j-qy</artifactId>
-			<version>1.7.3</version>
+			<version>1.7.4</version>
 		</dependency>
 		<!-- 微信被动消息(回调模式) -->
 		<dependency>
@@ -0,0 +1,31 @@
+<!-- maven-assembly-plugin:zip可执行包 -->
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+	<id>bin</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<dependencySets>
+		<dependencySet>
+			<includes>
+				<include>io.netty:netty-all</include>
+				<include>com.foxinmy:weixin4j-server</include>
+				<include>com.foxinmy:weixin4j-example</include>
+			</includes>
+			<useProjectArtifact>true</useProjectArtifact>
+			<outputDirectory>/lib</outputDirectory>
+		</dependencySet>
+	</dependencySets>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/script</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>*.sh</include>
+				<include>*.bat</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>
@@ -1,18 +1,13 @@
-# Jar执行脚本
-
-ulimit -n 110000
 #Jdk home
-JAVA_HOME="/usr/local/java"
- 
-#Executing user
-RUNNING_USER=root
- 
-#App home
-APP_HOME="/usr/local/weixin4j/weixin4j-server"
- 
+if [ ! -n "$JAVA_HOME" ]; then
+	export JAVA_HOME="/usr/local/java"
+fi
+
+APP_HOME=$(cd "$(dirname "$0")"; pwd)
+
 #Main class
 APP_MAINCLASS=com.foxinmy.weixin4j.example.server.Weixin4jServerStartup
- 
+
 #classpath
 CLASSPATH=$APP_HOME/classes
 for i in "$APP_HOME"/lib/*.jar; do
@@ -20,38 +15,36 @@ for i in "$APP_HOME"/lib/*.jar; do
 done

 CLASSPATH="$CLASSPATH":"$APP_HOME"/conf
- 
+
 #jvm options
 JAVA_OPTS="-Xms256m -Xmx512m -Djava.awt.headless=true -XX:MaxPermSize=128m -server -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=85 -XX:+DisableExplicitGC -Xnoclassgc -Xverify:none"
- 
+
 #psid
 psid=0
- 
+
 checkpid() {
   javaps=`$JAVA_HOME/bin/jps -l | grep $APP_MAINCLASS`
- 
+
   if [ -n "$javaps" ]; then
      psid=`echo $javaps | awk '{print $1}'`
   else
      psid=0
   fi
 }
- 
+
 ###################################
 #startup
 ###################################
 start() {
   checkpid
- 
+
   if [ $psid -ne 0 ]; then
      echo "================================"
      echo "warn: $APP_MAINCLASS already started! (pid=$psid)"
      echo "================================"
   else
      echo -n "Starting $APP_MAINCLASS ..."
-#      JAVA_CMD="nohup $JAVA_HOME/bin/java $JAVA_OPTS -classpath $CLASSPATH $APP_MAINCLASS >/dev/null 2>&1 &"
-          JAVA_CMD="$JAVA_HOME/bin/java $JAVA_OPTS -classpath $CLASSPATH $APP_MAINCLASS &"
-      su - $RUNNING_USER -c "$JAVA_CMD"
+          nohup ${JAVA_HOME}/bin/java ${JAVA_OPTS} -classpath ${CLASSPATH} ${APP_MAINCLASS} > ${APP_HOME}/nohup.log 2>&1 &
      checkpid
      if [ $psid -ne 0 ]; then
         echo "(pid=$psid) [OK]"
@@ -60,13 +53,13 @@ start() {
      fi
   fi
 }
- 
+
 ###################################
 #stop
 ###################################
 stop() {
   checkpid
- 
+
   if [ $psid -ne 0 ]; then
      echo -n "Stopping $APP_MAINCLASS ...(pid=$psid) "
      su - $RUNNING_USER -c "kill -9 $psid"
@@ -75,7 +68,7 @@ stop() {
      else
         echo "[Failed]"
      fi
- 
+
      checkpid
      if [ $psid -ne 0 ]; then
         stop
@@ -86,20 +79,20 @@ stop() {
      echo "================================"
   fi
 }
- 
+
 ###################################
 #status
 ###################################
 status() {
   checkpid
- 
+
   if [ $psid -ne 0 ];  then
      echo "$APP_MAINCLASS is running! (pid=$psid)"
   else
      echo "$APP_MAINCLASS is not running"
   fi
 }
- 
+
 ###################################
 #info
 ###################################
@@ -116,7 +109,7 @@ info() {
   echo "APP_MAINCLASS=$APP_MAINCLASS"
   echo "****************************"
 }
- 
+
 ###################################
 #access only 1 argument:{start|stop|restart|status|info}
 ###################################
@@ -141,4 +134,4 @@ case "$1" in
     echo "Usage: $0 {start|stop|restart|status|info}"
     exit 1
 esac
-exit 0
+exit 0