From 81aed067f5ba09dada3baa146403fecbdb023202 Mon Sep 17 00:00:00 2001 From: guwd Date: Mon, 12 Oct 2020 14:49:20 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/mcms-5.1.sql | 7 ------- 1 file changed, 7 deletions(-) diff --git a/doc/mcms-5.1.sql b/doc/mcms-5.1.sql index 07d06cad..b8d6604e 100644 --- a/doc/mcms-5.1.sql +++ b/doc/mcms-5.1.sql @@ -15,13 +15,6 @@ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; --- --- Current Database: `mcms-dev-5.1-1` --- - -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mcms-dev-5.1-1` /*!40100 DEFAULT CHARACTER SET utf8 */; - -USE `mcms-dev-5.1-1`; -- -- Table structure for table `app` From b5b096cae18d0b0c2b699efa87ff506678e64518 Mon Sep 17 00:00:00 2001 From: guwd Date: Mon, 12 Oct 2020 14:51:21 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/mcms-5.1.sql | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/mcms-5.1.sql b/doc/mcms-5.1.sql index b8d6604e..32c86f41 100644 --- a/doc/mcms-5.1.sql +++ b/doc/mcms-5.1.sql @@ -1,8 +1,3 @@ --- MySQL dump 10.13 Distrib 5.6.40, for Win64 (x86_64) --- --- Host: 192.168.0.8 Database: mcms-dev-5.1-1 --- ------------------------------------------------------ --- Server version 5.7.31 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -15,7 +10,6 @@ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -- -- Table structure for table `app` -- From a82a67b375ef02523f94cce30f5c4a4497c142ca Mon Sep 17 00:00:00 2001 From: guwd Date: Mon, 19 Oct 2020 14:19:37 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 432baaec..e536115f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ 1.8 + UTF-8 From 840c027a92904d9fc4581793e3aadee05c7d6487 Mon Sep 17 00:00:00 2001 From: sgjj <995959152@qq.com> Date: Wed, 21 Oct 2020 10:31:18 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/macro.ftl | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/webapp/WEB-INF/macro.ftl diff --git a/src/main/webapp/WEB-INF/macro.ftl b/src/main/webapp/WEB-INF/macro.ftl new file mode 100644 index 00000000..1565114d --- /dev/null +++ b/src/main/webapp/WEB-INF/macro.ftl @@ -0,0 +1,7 @@ +<#macro ms_file jsonString> + <#if jsonString??&&jsonString!=''> + <@compress> + ${jsonString?eval[0].path} + + + \ No newline at end of file From d9bf737b2267db6dd85ece07e7bf1dab7da216a3 Mon Sep 17 00:00:00 2001 From: guwd Date: Wed, 21 Oct 2020 14:46:41 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin.xml | 106 +++++++++++++++++++++++++++++++++++++++++++++++ bin/assembly.xml | 2 +- pom.xml | 18 ++++---- 3 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 bin.xml diff --git a/bin.xml b/bin.xml new file mode 100644 index 00000000..03bf33c1 --- /dev/null +++ b/bin.xml @@ -0,0 +1,106 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + 4.0.0 + net.mingsoft + ms-mcms + 5.1 + ms-mcms + + 1.8 + + + + + net.mingsoft + ms-mpeople + 1.0.28 + + + + net.mingsoft + store-client + 5.1 + + + + ms-mcms + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + true + net.mingsoft.MSApplication + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + + + bin/assembly.xml + + + + + make-assembly + package + + single + + + + + + + + + src/main/java + + **/*.java + + + + src/main/webapp + + + static/** + html/** + upload/** + templets/** + WEB-INF/** + + + + compile + + \ No newline at end of file diff --git a/bin/assembly.xml b/bin/assembly.xml index acb7078d..b8105c2f 100644 --- a/bin/assembly.xml +++ b/bin/assembly.xml @@ -3,7 +3,7 @@ dir - + false diff --git a/pom.xml b/pom.xml index e536115f..8e33c04a 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,7 @@ + org.apache.maven.plugins @@ -98,19 +99,22 @@ true src/main/webapp - - - - - - - + + + + + + + src/main/resources src/main/java + + **/*.java + compile From 654ee16eb70cb2ec900db0fa2c3fbe02691afebb Mon Sep 17 00:00:00 2001 From: guwd Date: Wed, 21 Oct 2020 14:54:40 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin.xml => pom.bin | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bin.xml => pom.bin (100%) diff --git a/bin.xml b/pom.bin similarity index 100% rename from bin.xml rename to pom.bin From 71c1dc1777720e70c9be0e6e05fc812f3844fefd Mon Sep 17 00:00:00 2001 From: guwd Date: Wed, 21 Oct 2020 15:18:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/config/WebConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java index b4aa60a7..fd570547 100644 --- a/src/main/java/net/mingsoft/config/WebConfig.java +++ b/src/main/java/net/mingsoft/config/WebConfig.java @@ -73,7 +73,7 @@ public class WebConfig implements WebMvcConfigurer { registry.addResourceHandler("/html/**").addResourceLocations("/html/","file:html/"); //三种映射方式 webapp下、当前目录下、jar内 registry.addResourceHandler("/app/**").addResourceLocations("/app/","file:app/", "classpath:/app/"); - registry.addResourceHandler("/static/**","/**").addResourceLocations("/static/","file:static/","classpath:/static/","classpath:/META-INF/resources/"); + registry.addResourceHandler("/static/**").addResourceLocations("/static/","file:static/","classpath:/static/","classpath:/META-INF/resources/"); registry.addResourceHandler("/api/**").addResourceLocations("/api/","file:api/", "classpath:/api/"); if(new File(uploadFloderPath).isAbsolute()){ //如果指定了绝对路径，上传的文件都映射到uploadMapping下 From 5ef28d9891d9c7585c9e81d208d1888105ff644f Mon Sep 17 00:00:00 2001 From: guwd Date: Wed, 21 Oct 2020 15:20:42 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8e33c04a..e1af397e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,15 +97,7 @@ - true src/main/webapp - - - - - - - src/main/resources From c4d4dadd244d4a82ea096273d86058fdb8cb4b7e Mon Sep 17 00:00:00 2001 From: guwd Date: Tue, 27 Oct 2020 09:29:27 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=A8=A1=E7=89=88=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 31237049..aeb8f1b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ ms: chcek-code: true #默认开启验证码验证，false验证码不验证 upload: - template: template + template: templets path: upload #文件上传路径，可以根据实际写绝对路径 mapping: /upload/** #修改需要谨慎，系统第一次部署可以随意修改，如果已经有了上传数据，再次修改会导致之前上传的文件404 denied: .exe,.jsp