重新设置配置文件

assembly/assembly-ui.xml → assembly/assembly-manager-ui.xml

@@ -7,8 +7,6 @@
         <format>tar.gz</format>
     </formats>
 
-<!--    <includeBaseDirectory>false</includeBaseDirectory>-->
-
     <!-- 需要打包的文件集 -->
     <fileSets>
         <fileSet>

assembly/assembly.xml

@@ -6,11 +6,10 @@
     <formats>
         <format>tar.gz</format>
     </formats>
-<!--    <includeBaseDirectory>false</includeBaseDirectory>-->
 
     <fileSets>
         <fileSet>
-            <directory>${project.parent.basedir}/dist/${project.parent.artifactId}/bin</directory>
+            <directory>target/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -20,9 +19,19 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${project.parent.basedir}/dist/${project.parent.artifactId}/db</directory>
+            <directory>./db</directory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
             <outputDirectory>db</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
+
+    <files>
+        <file>
+            <source>target/${project.artifactId}-${project.version}.jar</source>
+            <outputDirectory>boot</outputDirectory>
+        </file>
+    </files>
 </assembly>
\ No newline at end of file

log-manager-ui/admin/.env.stage → log-manager-ui/admin/.env.test

 # 测试环境配置
-NODE_ENV = 'production'
+NODE_ENV = 'test'
 
 # 地址
 VUE_APP_BASE_API = http://192.168.0.98:11091/m

log-manager-ui/admin/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "stage": "vue-cli-service build --mode stage",
+    "test": "vue-cli-service build --mode test",
     "build:prod": "vue-cli-service build --model prod"
   },
   "dependencies": {

log-manager-ui/admin/yarn.lock

@@ -2878,9 +2878,9 @@ core-js@^2.4.0:
   integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=
 
 core-js@^3.6.5:
-  version "3.25.5"
-  resolved "https://registry.npmmirror.com/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27"
-  integrity sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==
+  version "3.26.0"
+  resolved "https://registry.npmmirror.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe"
+  integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"

log-manager/src/main/bin/deploy.sh

+#!/bin/sh
+RETVAL=$?
+SHELL_NAME=$0
+BASEDIR=$(dirname $0)
+BASEDIR=$( (
+  cd "$BASEDIR"
+  pwd
+))
+LOCK_FILE="/tmp/deploy.lock"
+# 时间变量
+LOG_DATE='date "+%Y-%m-%d"'
+LOG_TIME='date "+%H-%M-%S"'
+PUBLISH_PATH="@profiles.publish.path@"
+PROJECT_NAME="@project.artifactId@"
+IP="@profiles.server.ip@"
+PORT="@profiles.server.port@"
+
+SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
+
+SERVICE_PATH="/usr/lib/systemd/system"
+JAVA_HOME="/usr/local/java/jdk1.8"
+
+NGINX_CONF_PATH="/etc/nginx/conf.d/"
+NGINX_PORT="@profiles.nginx.port@"
+NGINX_SERVER_PATH="@profiles.server.path@"
+PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
+PROJECT_UI_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}-ui"
+PROJECT_FILENAME="${PROJECT_NAME}.tar.gz"
+PROJECT_UI_FILENAME="${PROJECT_NAME}-ui.tar.gz"
+PROJECT_SERVICE="${SERVICE_PATH}/${PROJECT_NAME}.service"
+PROJECT_NGINX_CONF="${NGINX_CONF_PATH}/${PROJECT_NAME}.conf"
+
+#加锁
+shell_lock() {
+  touch ${LOCK_FILE}
+}
+#删除锁
+shell_unlock() {
+  rm -f ${LOCK_FILE}
+}
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+  echo ${LOGINFO}
+}
+
+#清理目标
+clear_deploy() {
+  SERVICE=$1
+  EXECPATH=$2
+  #清理后台自启服务
+  rm -rf ${SERVICE}
+  #清理执行文件目录
+  rm -rf ${EXECPATH}
+  #清理nginx服务配置文件
+  rm -f ${NGINX_CONF_PATH}/${PROJECT_NAME}.conf
+  mkdir -p ${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
+  echo "" >${SERVICE}
+  echo "[Unit]" >>${SERVICE}
+  echo "Description=${PROJECT_NAME}" >>${SERVICE}
+  echo "After=network.target" >>${SERVICE}
+  echo "" >>${SERVICE}
+  echo "[Service]" >>${SERVICE}
+  echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
+  echo "Type=forking" >>${SERVICE}
+  echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
+  echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
+  echo "PrivateTmp=true" >>${SERVICE}
+  echo "" >>${SERVICE}
+  echo "[Install]" >>${SERVICE}
+  echo "WantedBy=multi-user.target" >>${SERVICE}
+  writelog "${PROJECT_NAME}服务创建完成!"
+
+}
+build_nginx() {
+  echo "server{
+        gzip on;
+        gzip_min_length 1k;
+        gzip_buffers 4 16k;
+        #gzip_http_version 1.0;
+        gzip_comp_level 2;
+        gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+        gzip_vary off;
+        gzip_disable \"MSIE [1-6]\.\";
+        listen ${NGINX_PORT};
+
+        server_name localhost;
+        location / {
+             root ${PROJECT_UI_EXECPATH}/dist;
+             index index.html index.htm;
+        }
+
+        location ${NGINX_SERVER_PATH} {
+            proxy_pass http://${IP}:${PORT};
+            proxy_set_header Host \$host;
+            proxy_set_header X-Real-IP \$remote_addr;
+            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+        }
+       location /doc/ {
+           root ${PROJECT_EXECPATH};
+           index  api.html;
+        }
+        location /file/fileupload/ {
+          alias /mortals/app/data/file/fileupload/;
+          autoindex on;
+          autoindex_exact_size off;
+        }
+        location /file/uploadfile/ {
+          alias /mortals/app/data/file/uploadfile/;
+          autoindex on;
+          autoindex_exact_size off;
+        }
+        location /file/preview/ {
+          alias /mortals/app/data/file/preview/;
+          autoindex on;
+          autoindex_exact_size off;
+        }
+    }
+" >${PROJECT_NGINX_CONF}
+}
+
+#启动服务与nginx
+start_service_and_nginx() {
+  writelog "${PROJECT_NAME}服务启动..."
+  systemctl enable ${PROJECT_NAME}
+  systemctl daemon-reload
+  systemctl stop ${PROJECT_NAME}
+  systemctl start ${PROJECT_NAME}
+  nginx -t
+  nginx -s reload
+  jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
+  writelog "${PROJECT_NAME}服务启动,PID is ${jcpid}"
+}
+#部署后台服务
+project_deploy() {
+  writelog "${PROJECT_NAME}_deploy"
+  clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
+  writelog "${PROJECT_NAME}_clear_finish"
+
+  tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
+  build_nginx
+  start_service_and_nginx
+  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
+  echo "前端服务部署"
+  project_ui_deploy
+  exit ${RETVAL}
+}
+
+main $1

log-manager/src/main/bin/stop.sh

-#! /bin/sh
-PORT="@profiles.server.port@"
-BASEDIR=`dirname $0`
-BASEDIR=`(cd "$BASEDIR"; pwd)`
-PROJECT_NAME="@project.artifactId@"
-MAIN_CLASS="$PROJECT_NAME";
-
-if [ ! -n "$PORT" ]; then  
-	echo $"Usage: $0 {port}"
-	exit $FAIL
-fi
-
-echo "stoping application $PROJECT_NAME......"
-
-jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
-
-if [ -z $jcpid ]; then
-    echo "$PROJECT_NAME is not started or has been stopped!"
-else
-	curl -X POST -i -u $SECURITY_USERNAME:$SECURITY_PASSWORD http://127.0.0.1:$PORT/xxx_manager/shutdown
-	for i in {1..60}
-	do
-		jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
-		if [ -z $jcpid ]; then
-	    	echo "$PROJECT_NAME has been stopped!"
-	    	break
-	    else
-	    	echo "stoping the application .. $i"
-	    	sleep 1
-	    fi
-    done
-    jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
-    if [ $jcpid ]; then
-	    [ -z $jcpid ] || kill -15 $jcpid
-		    for i in {1..30}
-			do
-				jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
-				if [ -z $jcpid ]; then
-			    	echo "$PROJECT_NAME has been stopped!"
-			    	break
-			    else
-			    	echo "stoping the application .. $i"
-			    	sleep 1
-			    fi
-		    done
-	fi
-    jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
-    if [ $jcpid ]; then
-	    [ -z $jcpid ] || kill -9 $jcpid
-	    [ $? -eq 0 ] && echo "Stop $PROJECT_NAME OK!" || echo "Stop $PROJECT_NAME Fail!"
-	fi
-fi

log-manager/src/main/resources/application.yml

@@ -3,6 +3,7 @@ spring:
     allow-bean-definition-overriding: true
 application:
   log:
-    level:@profiles.log.level@
+    level: @profiles.log.level@
+    path: @profiles.log.path@