From a99a7283846dc46321e0c98544759b7f599fac21 Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Thu, 22 Oct 2020 15:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/mcms-5.1.sql | 13 -------------
pom.xml | 14 ++++++++------
src/main/resources/application-test.yml | 2 +-
src/main/resources/application.yml | 6 +++---
4 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/doc/mcms-5.1.sql b/doc/mcms-5.1.sql
index 07d06cad..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,14 +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 */;
---
--- 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`
--
diff --git a/pom.xml b/pom.xml
index 581318ad..46747c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
net.mingsoft
ms-mcms
- 5.1
+ 5.2-SNAPSHOT
ms-mcms
jar
@@ -98,14 +98,13 @@
- true
src/main/webapp
-
-
-
-
+ static/
+ html/
+ upload/
+ templets/
@@ -113,6 +112,9 @@
src/main/java
+
+ **/*.java
+
compile
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 99c3d6c4..f029bbaa 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
spring:
datasource:
- url: jdbc:mysql://192.168.0.8:3316/mcms-5.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.8:3316/mcms-5.2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: mcms
password: mcms
filters: wall,mergeStat
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0543e858..8ce74e97 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 5107
servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
# ssl: #https证书配置 配置了之后只能通过https访问应用
# key-store: ms.pfx 证书文件
@@ -23,8 +23,8 @@ ms:
upload:
enable-web: true #启用web层的上传
- template: template #模板文件夹支持重命名，不支持路径
- path: D:\gitbck #文件上传路径，可以根据实际写绝对路径
+ template: templets #模板文件夹支持重命名，不支持路径
+ path: upload #文件上传路径，可以根据实际写绝对路径
mapping: /upload/** #修改需要谨慎，系统第一次部署可以随意修改，如果已经有了上传数据，再次修改会导致之前上传的文件404
denied: .exe,.jsp
back-up: /upload_back