升级为平台ms

README.md

-# 铭飞业务系统基础开发平台 此系统为演示版
-当前版本:4.7.0 <br/>
+# 铭飞业务系统基础开发平台
+线上ms.mingsoft.net
+
+当前版本:4.7.1 <br/>
 铭飞MS官网:http://ms.mingsoft.net<br/>
+演示版:http://demo.cms.mingsoft.net/ms/login.do<br/>
 官网同时提供一键运行版本下载，请步移官网....<br/>
 QQ交流群号：[![加入QQ群](https://img.shields.io/badge/三群-242805203-blue.svg)](https://jq.qq.com/?_wv=1027&k=5oF19sl)  [![加入QQ群](https://img.shields.io/badge/一群-231212174-blue.svg)](https://jq.qq.com/?_wv=1027&k=5zykX7V)  [![加入QQ群](https://img.shields.io/badge/二群-221335098-blue.svg)](https://jq.qq.com/?_wv=1027&k=56BqFKu) 
 

pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
+<?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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.mingsoft</groupId>
-	<artifactId>wb-mcms</artifactId>
+	<artifactId>mcms</artifactId>
 	<version>4.7.1</version>
-	<packaging>war</packaging>
 	<name>ms-mcms</name>
 	<properties>
 		<java.version>1.8</java.version>
@@ -46,6 +45,16 @@
 			<artifactId>ms-mpeople</artifactId>
 			<version>1.0.8</version>
 		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-msso-client</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-msso-server</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
 		<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
 		<dependency>
 			<groupId>net.mingsoft</groupId>

src/main/java/net/mingsoft/config/WebConfig.java

 package net.mingsoft.config;
 
 import java.io.File;
-import java.util.Arrays;
 
-import net.mingsoft.basic.filter.XSSEscapeFilter;
 import org.springframework.aop.Advisor;
+import net.mingsoft.basic.filter.XSSEscapeFilter;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.JdkRegexpMethodPointcut;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -133,9 +132,9 @@ public class WebConfig implements WebMvcConfigurer {
 		return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor());
 	}
 
-//	 /**
-//	 * xssFilter注册
-//	 */
+	 /**
+	 * xssFilter注册
+	 */
 //	 @Bean
 //	 public FilterRegistrationBean xssFilterRegistration() {
 //	 XSSEscapeFilter xssFilter = new XSSEscapeFilter();

src/main/resources/application-dev.yml

 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
-    username: root
-    password: root
+    url: jdbc:mysql://172.17.0.1:3308/db-ms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+    username: pm
+    password: pm!2019
     filters: wall,mergeStat
-    type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file
+    type: com.alibaba.druid.pool.DruidDataSource

src/main/resources/application.yml

@@ -2,29 +2,50 @@ server:
   port: 8080
   servlet.context-path: /ms-mcms
   servlet.session.timeout: 60M
-  
+
 logging:
- level:
-  net.mingsoft: trace
+  level:
+    net.mingsoft: trace
 ms:
- manager: 
-  path: /ms
-  view-path: /WEB-INF/manager
-  
- upload: 
-   path: /upload 
-   denied: .exe,.jsp
-   allowed: jpg
-   max-size: 1
-   memory-size: 4096
-      
+  wx:
+    app.id: wx8c96aa3db4611395
+    secret: 6502f1437c583a346f0d71c4be7d99b2
+  sso:
+    url:
+      login: http://ms.mingsoft.net/sso/login.do
+      logout: http://ms.mingsoft.net/sso/logout.do
+      token: http://ms.mingsoft.net/sso/token.do
+    session:
+      prefix: msso
+      time: 2592000
+    cookie: ms.mingsoft.net,pm.mingsoft.net,code.mingsoft.net,bbs.mingsoft.net,localhost
+  manager:
+    path: /m-admin
+    view-path: /WEB-INF/manager
+
+  upload:
+    path: /upload
+    denied: .exe,.jsp
+    allowed: jpg
+    max-size: 1
+    memory-size: 4096
+
 spring:
+  redis:
+    host: 172.17.0.1
+    port: 6380
+    password: mingsoft
+    pool:
+      max-idle: 300
+      min-idle: 0
+      max-active: 600
+      max-wait: 1000
   http.multipart.enabled: false
   profiles:
     active: dev
   mvc:
-    pathmatch: 
-     use-suffix-pattern: true
+    pathmatch:
+      use-suffix-pattern: true
   devtools:
     restart:
       enabled: true
@@ -45,7 +66,7 @@ spring:
     expose-spring-macro-helpers: true
     prefer-file-system-access: false
     template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
-    settings: 
+    settings:
       template_update_delay: 1
       default_encoding: UTF-8
       classic_compatible: true
@@ -53,8 +74,8 @@ spring:
       time_format: HH:mm:ss
       datetime_format: yyyy-MM-dd HH:mm:ss
       auto_import: /include/macro.ftl as ms
-      
+
 mybatis:
   mapper-locations: classpath*:**/dao/*.xml
-  configuration: 
-   database-id: mysql
\ No newline at end of file
+  configuration:
+    database-id: mysql

src/main/webapp/templets/1/default/head-file.htm

 <title>{ms:global.name/}</title>
 <meta charset="utf-8">
-<link rel="icon" href="http://cdn.mingsoft.net/global/images/ms.ico" type="x-icon">
 <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
 <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
 <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/index.less">