修改登录等资源权限

one-certificate-manager/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,11 +35,18 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
 
+#清理ui
+clear_ui_deploy() {
+  EXEC_UI_PATH=$1
+  rm -rf ${EXEC_UI_PATH}
+  mkdir -p ${EXEC_UI_PATH}
+}
+
 build_service() {
   SERVICE=$1
   EXECPATH=$2
@@ -51,6 +58,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}
@@ -83,11 +91,24 @@ project_deploy() {
   writelog "${PROJECT_NAME}_deploy_finish"
 }
 
+#部署前台服务
+project_ui_deploy() {
+  writelog "${PROJECT_NAME}_ui_deploy"
+  clear_ui_deploy ${PROJECT_UI_EXECPATH}
+  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
+  writelog "${PROJECT_NAME}_ui_deploy_finish"
+
+}
 
 #主函数
 main() {
   echo "后台服务部署"
   project_deploy
+  #判断是否需要部署ui
+  if [ "@skipDeploy@" == "false" ];then
+    echo "前端服务部署"
+    project_ui_deploy
+  fi;
   exit ${RETVAL}
 }
 

one-certificate-manager/src/main/bin/start.cmd

-chcp 65001
-@echo off
+echo off
 
 if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better! & EXIT /B 1
 set "JAVA=%JAVA_HOME%\bin\java.exe"
@@ -18,8 +17,8 @@ set HS_ERR_PATH=%LOG_PATH%PORT%-hs_err.log
 set HEAP_DUMP_PATH=%LOG_PATH%/heap_dump.hprof
 set TEMP_PATH=%LOG_PATH%/temp/
 if not exist "%TEMP_PATH%"  md "%TEMP_PATH%"
-
-set JAVA_OPTS=-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps  -XX:+HeapDumpOnOutOfMemoryError
+rem jvm启动参数
+set JAVA_OPTS=-Xms512M -Xmx512M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps  -XX:+HeapDumpOnOutOfMemoryError
 set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDateStamps -Xloggc:%GC_PATH%
 set JAVA_OPTS=%JAVA_OPTS% -XX:ErrorFile=%HS_ERR_PATH%
 set JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=%HEAP_DUMP_PATH%
@@ -54,11 +53,11 @@ goto end
 
 :debug
 echo "debug"
-"%JAVA%" -Xms512m -Xmx1024m -server %DEBUG_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
+"%JAVA%" -Xms512m -Xmx512m -server %DEBUG_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
 goto end
 
 :jmx
-"%JAVA%" -Xms512m -Xmx1024m -server %JMX_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
+"%JAVA%" -Xms512m -Xmx512m -server %JMX_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
 goto end
 
 :end

one-certificate-manager/src/main/bin/start.sh

@@ -33,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java`
-	echo  "Error: JAVA_HOME is $JAVACMD"
+    JAVACMD=`which java > /dev/null 2>&1`
+	echo  "Error: JAVA_HOME is not defined correctly."
+    exit $ERR_NO_JAVA
   fi
 fi
 
@@ -45,7 +46,7 @@ fi
 
 if [ -e "$BASEDIR" ]
 then
-  JAVA_OPTS="-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
+  JAVA_OPTS="-Xms256M -Xmx512M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
 fi
 
 CLASSPATH=$CLASSPATH_PREFIX:
@@ -61,7 +62,6 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
 				-jar $MAIN_CLASS \
 				> /dev/null &