sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/resources/application.yml
master
wujj 5 years ago
parent 55b338db4e c4d4dadd24
commit 2e8a6d9817
6 changed files with 120 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bin/assembly.xml
  2. 13
      doc/历史/mcms-5.1.sql
  3. 106
      pom.bin
  4. 11
      pom.xml
  5. 9
      src/main/resources/application.yml
  6. 7
      src/main/webapp/WEB-INF/macro.ftl

2
bin/assembly.xml
Unescape View File

@ -3,7 +3,7 @@
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!-- 从目标目录拷贝文件去压缩 -->
<fileSet>

13
doc/历史/mcms-5.1.sql
Unescape View File

@ -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`
--

106
pom.bin
Unescape View File

@ -0,0 +1,106 @@
<?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>

11
pom.xml
Unescape View File

@ -18,7 +18,8 @@
<!-- <packaging>war</packaging> -->
<properties>
<java.version>1.8</java.version>
</properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@ -156,6 +157,7 @@
</configuration>
</plugin>
<!-- 打包war包使用 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -171,13 +173,6 @@
<resource>
<directory>src/main/webapp</directory>
<excludes>
<!--打包生产 -->
<!-- <exclude>static/</exclude> -->
<!-- <exclude>html/</exclude> -->
<!-- <exclude>upload/</exclude> -->
<!-- <exclude>templets/</exclude> -->
</excludes>
<excludes>
<!--打包生产 -->
<exclude>static/</exclude>

9
src/main/resources/application.yml
Unescape View File

@ -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层的上传

7
src/main/webapp/WEB-INF/macro.ftl
Unescape View File

@ -0,0 +1,7 @@
<#macro ms_file jsonString>
<#if jsonString??&&jsonString!=''>
<@compress>
${jsonString?eval[0].path}
</@compress>
</#if>
</#macro>
Write Preview
Loading…
Cancel
Save