!2 修改部署

Merge pull request !2 from 德仔/wx

bin/build-server.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/sh
+cd /home/workspace/ShengTangManage
+git pull origin master
+mvn clean package -Dmaven.test.skip=true
+rm -f /home/api/manage.shengtangdiet.com/st-manage.jar
+cp -f ./ruoyi-admin/target/ruoyi-admin.jar /home/api/manage.shengtangdiet.com/st-manage.jar
+systemctl restart st-manage.service

bin/build-web.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/sh
+cd /home/workspace/ShengTangManage/ruoyi-ui
+git pull origin master
+yarn
+yarn build:prod
+rm -rf /home/web/manage.shengtangdiet.com/dist
+cp -rf ./dist /home/web/manage.shengtangdiet.com/

ruoyi-admin/pom.xml

@@ -7,7 +7,7 @@
         <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <artifactId>ruoyi-admin</artifactId>
 
     <description>
@@ -102,23 +102,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!-- 多模块排除内置tomcat -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java

@@ -216,6 +216,8 @@ public class SysContract extends BaseEntity {
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
+                .append("signName", getSignName())
+
                 .toString();
     }
 }

ruoyi-custom/src/main/java/com/ruoyi/custom/page/PdfProcessInfo.java

@@ -3,6 +3,8 @@ package com.ruoyi.custom.page;
 import java.io.Serializable;
 
 public class PdfProcessInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private int code;
     private String msg;