添加材料数量统计

assembly/assembly-client-ui.xml

-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>release</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-<!--    <includeBaseDirectory>false</includeBaseDirectory>-->
-
-    <!-- 需要打包的文件集 -->
-    <fileSets>
-        <fileSet>
-            <directory>${project.parent.basedir}/device-manager-ui/admin/dist</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <outputDirectory>/dist</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-
-</assembly>
\ No newline at end of file

sample-form-manager/pom.xml

@@ -41,16 +41,13 @@
                 <profiles.log.level>INFO</profiles.log.level>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
                 <package.environment>serve</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>false</skipUi>
             </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>11078</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
                 <profiles.server.gatewayport>11078</profiles.server.gatewayport>
                 <profiles.server.path>/sampleform</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
@@ -65,16 +62,13 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>false</skipUi>
             </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>11078</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
                 <profiles.server.gatewayport>11078</profiles.server.gatewayport>
                 <profiles.server.path>/sampleform</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
@@ -89,9 +83,33 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>build</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>false</skipUi>
+            </properties>
+        </profile>
+
+
+        <profile>
+            <id>yibin</id>
+            <properties>
+                <profiles.active>yibin</profiles.active>
+                <profiles.server.path>/sampleform</profiles.server.path>
+                <profiles.publish.path>/home/publish</profiles.publish.path>
+                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
+                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
+                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
+                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
+                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+                <profiles.filepath>/mortals/app/data</profiles.filepath>
+                <profiles.log.level>INFO</profiles.log.level>
+                <package.environment>yibin</package.environment>
+                <skipUi>false</skipUi>
             </properties>
         </profile>
+
     </profiles>
 
     <dependencies>
@@ -286,7 +304,7 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <version>1.6.0</version>
                 <configuration>
-                    <skip>${skipDeploy}</skip>
+                    <skip>${skipUi}</skip>
                 </configuration>
                 <executions>
                     <execution>
@@ -303,22 +321,6 @@
                             <workingDirectory>${project.parent.basedir}/sample-form-manager-ui/admin</workingDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>exec-npm-run-build</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>yarn</executable>
-                            <arguments>
-                                <argument>run</argument>
-                                <arguments>${package.environment}</arguments>
-                            </arguments>
-                            <workingDirectory>${project.parent.basedir}/sample-form-manager-ui/admin</workingDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -348,7 +350,7 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
-                            <skipAssembly>${skipDeploy}</skipAssembly>
+                            <skipAssembly>${skipUi}</skipAssembly>
                             <finalName>${project.artifactId}-ui</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>

sample-form-manager/src/main/bin/check_server.sh

+#!/bin/bash
+PORT="@profiles.server.port@"
+PROJECT_NAME="@project.artifactId@";
+MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
+SHELL_NAME=$0
+SHELL_LOG="${SHELL_NAME}.log"
+
+LOG_DATE='date "+%Y-%m-%d"'
+LOG_TIME='date "+%H-%M-%S"'
+
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H-%M-%S")
+
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+}
+jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
+
+if [ $jcpid ]; then
+		writelog "The $PROJECT_NAME start finished, PID is $jcpid"
+		exit $SUCCESS
+	else
+    writelog "start service..."
+    systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+fi
+

sample-form-manager/src/main/bin/deploy.sh

@@ -10,35 +10,19 @@ 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"
+SERVICE_PATH="/usr/lib/systemd/system"
+PUBLISH_PATH="@profiles.publish.path@"
+PROJECT_NAME="@project.artifactId@"
 
-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/dist"
 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
@@ -54,9 +38,6 @@ clear_deploy() {
   rm -rf ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
-  #清理nginx服务配置文件
-  rm -f ${NGINX_CONF_PATH}/${PROJECT_NAME}.conf
-  mkdir -p ${EXECPATH}
 }
 
 #清理ui
@@ -86,75 +67,26 @@ build_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};
-             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}服务启动..."
+start_service() {
   systemctl enable ${PROJECT_NAME}
   systemctl daemon-reload
+  writelog "${PROJECT_NAME}服务启动..."
   systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
   project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}')
-  nginx -t
-  nginx -s reload
   jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
   writelog "${PROJECT_NAME}服务启动,PID is ${jcpid} ,status:${project_status}"
 }
 #部署后台服务
 project_deploy() {
   writelog "${PROJECT_NAME}_deploy"
+  systemctl stop ${PROJECT_NAME}
   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
+  start_service
   writelog "${PROJECT_NAME}_deploy_finish"
 }