Skip to content
GitLab
"src/vscode:/vscode.git/clone" did not exist on "144968ee40eca672d2bca5b8584885e2a7e3d6fb"
Commit 2e8a6d98 authored by wujj's avatar wujj
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	pom.xml
#	src/main/resources/application.yml
parents 55b338db c4d4dadd
Show whitespace changes
Inline Side-by-side
bin/assembly.xml
View file @ 2e8a6d98
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<formats> <formats>
<format>dir</format> <format>dir</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets> <fileSets>
<!-- 从目标目录拷贝文件去压缩 --> <!-- 从目标目录拷贝文件去压缩 -->
<fileSet> <fileSet>
......
doc/历史/mcms-5.1.sql
View file @ 2e8a6d98
-- 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_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
...@@ -15,14 +10,6 @@ ...@@ -15,14 +10,6 @@
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!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` -- Table structure for table `app`
-- --
......
pom.bin 0 → 100644
View file @ 2e8a6d98
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mcms</artifactId>
<version>5.1</version>
<name>ms-mcms</name>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId>
<version>1.0.28</version>
</dependency>
<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>store-client</artifactId>
<version>5.1</version>
</dependency>
</dependencies>
<build>
<finalName>ms-mcms</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<!--打包生产-->
<configuration>
<fork>true</fork>
<mainClass>net.mingsoft.MSApplication</mainClass>
</configuration>
</plugin>
<!--
打包生产
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>bin/assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/webapp</directory>
<excludes>
<!--打包生产-->
<exclude>static/**</exclude>
<exclude>html/**</exclude>
<exclude>upload/**</exclude>
<exclude>templets/**</exclude>
<exclude>WEB-INF/**</exclude>
</excludes>
</resource>
</resources>
<defaultGoal>compile</defaultGoal>
</build>
</project>
\ No newline at end of file
pom.xml
View file @ 2e8a6d98
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<!-- <packaging>war</packaging> --> <!-- <packaging>war</packaging> -->
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
...@@ -156,6 +157,7 @@ ...@@ -156,6 +157,7 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- 打包war包使用 --> <!-- 打包war包使用 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -171,13 +173,6 @@ ...@@ -171,13 +173,6 @@
<resource> <resource>
<directory>src/main/webapp</directory> <directory>src/main/webapp</directory>
<excludes>
<!--打包生产 -->
<!-- <exclude>static/</exclude> -->
<!-- <exclude>html/</exclude> -->
<!-- <exclude>upload/</exclude> -->
<!-- <exclude>templets/</exclude> -->
</excludes>
<excludes> <excludes>
<!--打包生产 --> <!--打包生产 -->
<exclude>static/</exclude> <exclude>static/</exclude>
......
src/main/resources/application.yml
View file @ 2e8a6d98
server: server:
port: 5107 port: 8080
servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱 servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
# ssl: #https证书配置 配置了之后只能通过https访问应用 # ssl: #https证书配置 配置了之后只能通过https访问应用
# key-store: ms.pfx 证书文件 # key-store: ms.pfx 证书文件
...@@ -13,16 +13,13 @@ logging: ...@@ -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 path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log
ms: ms:
mwebsite: # scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
#站群需要appid过滤的表
tables: cms_category,cms_content,mdiy_dict,mdiy_model,mdiy_page,people,people_address,role
# scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
swagger: swagger:
enable: true #启用swagger文档，生产的时候务必关掉 访问地址：http://ip|域名/项目发布名/swagger-ui.html enable: true #启用swagger文档，生产的时候务必关掉 访问地址：http://ip|域名/项目发布名/swagger-ui.html
manager: manager:
path: /ms #后台访问的路径，如:http://项目/ms/login.do，生产的时候建议修改 path: /ms #后台访问的路径，如:http://项目/ms/login.do，生产的时候建议修改
view-path: /WEB-INF/manager #后台视图层路径配置 view-path: /WEB-INF/manager #后台视图层路径配置
check-code: false #默认开启验证码验证，false验证码不验证 chcek-code: true #默认开启验证码验证，false验证码不验证
upload: upload:
enable-web: true #启用web层的上传 enable-web: true #启用web层的上传
......
src/main/webapp/WEB-INF/macro.ftl 0 → 100644
View file @ 2e8a6d98
<#macro ms_file jsonString>
<#if jsonString??&&jsonString!=''>
<@compress>
${jsonString?eval[0].path}
</@compress>
</#if>
</#macro>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment