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/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.bin b/pom.bin
new file mode 100644
index 00000000..03bf33c1
--- /dev/null
+++ b/pom.bin
@@ -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/pom.xml b/pom.xml
index 63f88b1d..37738e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
1.8
-
+ UTF-8
+
@@ -156,6 +157,7 @@
+
org.apache.maven.plugins
@@ -171,13 +173,6 @@
src/main/webapp
-
-
-
-
-
-
-
static/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 17dfd7e8..9e57c903 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 5107
+ port: 8080
servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
# ssl: #https证书配置 配置了之后只能通过https访问应用
# key-store: ms.pfx 证书文件
@@ -13,16 +13,13 @@ logging:
path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log
ms:
- mwebsite:
- #站群需要appid过滤的表
- tables: cms_category,cms_content,mdiy_dict,mdiy_model,mdiy_page,people,people_address,role
- # scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
+# scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
swagger:
enable: true #启用swagger文档，生产的时候务必关掉 访问地址：http://ip|域名/项目发布名/swagger-ui.html
manager:
path: /ms #后台访问的路径，如:http://项目/ms/login.do，生产的时候建议修改
view-path: /WEB-INF/manager #后台视图层路径配置
- check-code: false #默认开启验证码验证，false验证码不验证
+ chcek-code: true #默认开启验证码验证，false验证码不验证
upload:
enable-web: true #启用web层的上传
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