diff --git a/bin/build-server.sh b/bin/build-server.sh
new file mode 100755
index 000000000..fe82787a4
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/bin/build-web.sh b/bin/build-web.sh
new file mode 100755
index 000000000..abca2f3ab
--- /dev/null
+++ b/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/
\ No newline at end of file
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5d215da05..723fa82ff 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -7,7 +7,7 @@
3.1.0
4.0.0
- war
+ jar
ruoyi-admin
@@ -102,23 +102,6 @@
compile
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
- provided
-
-
diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java
index 97c078f8b..6ac222b3d 100644
--- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java
+++ b/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();
}
}
diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/page/PdfProcessInfo.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/page/PdfProcessInfo.java
index 1c0254650..24dd1babb 100644
--- a/ruoyi-custom/src/main/java/com/ruoyi/custom/page/PdfProcessInfo.java
+++ b/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;