wujj 5 years ago
parent
commit
a99a728384
4 changed files with 12 additions and 23 deletions
  1. 0 13
      doc/mcms-5.1.sql
  2. 8 6
      pom.xml
  3. 1 1
      src/main/resources/application-test.yml
  4. 3 3
      src/main/resources/application.yml

+ 0 - 13
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 */;
@@ -16,14 +11,6 @@
 /*!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`
 --
 

+ 8 - 6
pom.xml

@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.mingsoft</groupId>
 	<artifactId>ms-mcms</artifactId>
-	<version>5.1</version>
+	<version>5.2-SNAPSHOT</version>
 	<name>ms-mcms</name>
 	<!-- 打包jar包 -->
 	<packaging>jar</packaging>
@@ -98,14 +98,13 @@
 		</plugins>
 		<resources>
 			<resource>
-				<filtering>true</filtering>
 				<directory>src/main/webapp</directory>
 				<excludes>
 					<!--打包生产 -->
-					<!-- <exclude>static/</exclude> -->
-					<!-- <exclude>html/</exclude> -->
-					<!-- <exclude>upload/</exclude> -->
-					<!-- <exclude>templets/</exclude> -->
+					 <exclude>static/</exclude>
+					 <exclude>html/</exclude>
+					 <exclude>upload/</exclude>
+					 <exclude>templets/</exclude>
 				</excludes>
 			</resource>
 			<resource>
@@ -113,6 +112,9 @@
 			</resource>
 			<resource>
 				<directory>src/main/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<defaultGoal>compile</defaultGoal>

+ 1 - 1
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

+ 3 - 3
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