修改门户配置打包

portal-manager-ui/admin/.env.test

+# 生产环境配置
+NODE_ENV = test
+
+VUE_APP_API_BASE_URL=http://192.168.0.98:11072/zwfw

portal-manager-ui/admin/package.json

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

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

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

portal-manager/assembly/assembly.xml

@@ -9,19 +9,29 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/dist/${project.artifactId}/bin</directory>
+            <directory>target/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/dist/${project.artifactId}/boot</directory>
+           <directory>${project.parent.basedir}/dist/${project.parent.artifactId}/boot</directory>
             <outputDirectory>boot</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/dist/${project.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

portal-manager/pom.xml

@@ -32,17 +32,22 @@
 				<profiles.nacos.server-addr>192.168.0.218:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
-				<skipDeploy>true</skipDeploy>
+				<package.environment>test</package.environment>
+				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
 		<profile>
 			<id>test</id>
 			<properties>
 				<profiles.active>test</profiles.active>
+				<profiles.server.ip>192.168.0.98</profiles.server.ip>
 				<profiles.server.port>17212</profiles.server.port>
-				<profiles.queue.type>rabbitmq</profiles.queue.type>
-				<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
+				<profiles.nginx.port>11072</profiles.nginx.port>
+				<profiles.server.gatewayport>11078</profiles.server.gatewayport>
+				<profiles.server.path>/zwfw</profiles.server.path>
+				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
 				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
@@ -51,17 +56,22 @@
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
-				<skipDeploy>true</skipDeploy>
+				<package.environment>test</package.environment>
+				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
 		<profile>
 			<id>product</id>
 			<properties>
 				<profiles.active>product</profiles.active>
+				<profiles.server.ip>192.168.0.251</profiles.server.ip>
 				<profiles.server.port>17212</profiles.server.port>
-				<profiles.queue.type>rabbitmq</profiles.queue.type>
-				<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
+				<profiles.nginx.port>11072</profiles.nginx.port>
+				<profiles.server.gatewayport>11078</profiles.server.gatewayport>
+				<profiles.server.path>/zwfw</profiles.server.path>
+				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
 				<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
@@ -70,7 +80,9 @@
 				<profiles.nacos.server-addr>192.168.0.218:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
+				<package.environment>test</package.environment>
 				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
@@ -153,27 +165,9 @@
 		</resources>
 
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
-				<configuration>
-					<skipTests>true</skipTests>    <!--默认关掉单元测试 -->
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
-					<outputDirectory>${project.basedir}/dist/${project.artifactId}/boot</outputDirectory>
-					<layout>ZIP</layout>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -197,10 +191,14 @@
 						</goals>
 						<configuration>
 							<encoding>UTF-8</encoding>
-							<outputDirectory>${project.basedir}/dist/${project.artifactId}/bin</outputDirectory>
+							<outputDirectory>target/bin
+							</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/bin/</directory>
+									<excludes>
+										<exclude>deploy.sh</exclude>
+									</excludes>
 									<filtering>true</filtering>
 								</resource>
 							</resources>
@@ -208,17 +206,21 @@
 					</execution>
 
 					<execution>
-						<id>copy-db</id>
+						<id>copy-deploy</id>
 						<phase>package</phase>
 						<goals>
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
 							<encoding>UTF-8</encoding>
-							<outputDirectory>${project.basedir}/dist/${project.artifactId}/db</outputDirectory>
+							<outputDirectory>${project.parent.basedir}/dist/${project.artifactId}/
+							</outputDirectory>
 							<resources>
 								<resource>
-									<directory>db/</directory>
+									<directory>src/main/bin</directory>
+									<includes>
+										<include>deploy.sh</include>
+									</includes>
 									<filtering>true</filtering>
 								</resource>
 							</resources>
@@ -257,12 +259,12 @@
 							<goal>exec</goal>
 						</goals>
 						<configuration>
-							<executable>npm</executable>
+							<executable>yarn</executable>
 							<arguments>
 								<argument>run</argument>
-								<arguments>build:prod</arguments>
+								<arguments>${package.environment}</arguments>
 							</arguments>
-							<workingDirectory>${project.parent.basedir}/base-manager-ui/admin</workingDirectory>
+							<workingDirectory>${project.parent.basedir}/portal-manager-ui/admin</workingDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -271,9 +273,7 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>3.3.0</version>
-				<configuration>
-					<skipAssembly>${skipDeploy}</skipAssembly>
-				</configuration>
+
 				<executions>
 					<execution>
 						<id>make-assembly</id>
@@ -282,12 +282,12 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>smart-portal-platform</finalName>
+							<finalName>${project.artifactId}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
 								<descriptor>./assembly/assembly.xml</descriptor>
 							</descriptors>
-							<outputDirectory>${project.parent.basedir}/dist/smart-portal-platform</outputDirectory>
+							<outputDirectory>${project.parent.basedir}/dist/${project.artifactId}</outputDirectory>
 						</configuration>
 					</execution>
 					<execution>
@@ -297,12 +297,13 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>smart-portal-platform-ui</finalName>
+							<skipAssembly>${skipDeploy}</skipAssembly>
+							<finalName>${project.artifactId}-ui</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
-								<descriptor>./assembly/assembly-ui.xml</descriptor>
+								<descriptor>./assembly/assembly-manager-ui.xml</descriptor>
 							</descriptors>
-							<outputDirectory>${project.parent.basedir}/dist/smart-portal-platform</outputDirectory>
+							<outputDirectory>${project.parent.basedir}/dist/${project.artifactId}</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>

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

+#!/bin/sh
+RETVAL=$?
+SHELL_NAME="deploy"
+BASEDIR=$(dirname $0)
+BASEDIR=$( (
+  cd "$BASEDIR"
+  pwd
+))
+LOCK_FILE="/tmp/deploy.lock"
+# 时间变量
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H:%M:%S")
+PUBLISH_PATH="@profiles.publish.path@"
+PROJECT_NAME="@project.artifactId@"
+IP="@profiles.server.ip@"
+PORT="@profiles.server.port@"
+GATEWAY_PORT="@profiles.server.gatewayport@"
+
+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}:${GATEWAY_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

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

 spring:
   main:
     allow-bean-definition-overriding: true
+application:
+  log:
+    level: @profiles.log.level@
+    path: @profiles.log.path@
 
 
 

smart-gateway/src/main/bin/deploy.sh

@@ -131,10 +131,12 @@ build_nginx() {
 
 #启动服务与nginx
 start_service_and_nginx() {
-  writelog "${PROJECT_NAME}服务启动..."
   systemctl enable ${PROJECT_NAME}
   systemctl daemon-reload
+  writelog "${PROJECT_NAME}服务停止..."
   systemctl stop ${PROJECT_NAME}
+  writelog "${PROJECT_NAME}服务停止成功！"
+  writelog "${PROJECT_NAME}服务启动..."
   systemctl start ${PROJECT_NAME}
   nginx -t
   nginx -s reload
@@ -147,7 +149,7 @@ project_deploy() {
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
 
-  tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvx ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
   build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   build_nginx
   start_service_and_nginx