From 9e5438a928e7c1845c4498bf1e6fff4f12790f30 Mon Sep 17 00:00:00 2001
From: ms group dev <dev@mingsoft.net>
Date: Tue, 4 Feb 2020 11:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 488 +++++++++---------
 .../static/plugins/ms/1.0.0/compatible.js     |   5 +-
 2 files changed, 246 insertions(+), 247 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e4cc33f..a80aff60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,258 +1,254 @@
 <?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>net.mingsoft</groupId>
-        <artifactId>ms-pom</artifactId>
-        <version>1.0.0</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>net.mingsoft</groupId>
-    <artifactId>ms-mcms</artifactId>
-    <version>5.0.0</version>
-    <name>${project.groupId}:${project.artifactId}</name>
-    <description>ms-mcms tools Library</description>
-    <url>https://github.com/ming-soft/ms-mcms</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://mit-license.org</url>
-        </license>
-    </licenses>
-    <developers>
-        <developer>
-            <name>mingsoft develop group</name>
-            <email>service@mingsoft.net</email>
-            <organization>mingsoft</organization>
-            <organizationUrl>http://www.mingsoft.net</organizationUrl>
-        </developer>
-    </developers>
+	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>ms-mcms</artifactId>
+	<version>5.0.0</version>
+	<name>${project.groupId}:${project.artifactId}</name>
+	<description>ms-mcms tools Library</description>
+	<url>https://github.com/ming-soft/ms-mcms</url>
+	<licenses>
+		<license>
+			<name>The MIT License (MIT)</name>
+			<url>http://mit-license.org</url>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<name>mingsoft develop group</name>
+			<email>service@mingsoft.net</email>
+			<organization>mingsoft</organization>
+			<organizationUrl>http://www.mingsoft.net</organizationUrl>
+		</developer>
+	</developers>
 
-    <scm>
-        <connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
-        <developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
-        <url>https://github.com/ming-soft/ms-mcms</url>
-    </scm>
-    <distributionManagement>
-        <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus snapshot repository</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>sonatype-nexus-staging</id>
-            <name>Sonatype Nexus release repository</name>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-    <properties>
-        <java.version>1.8</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
-        <!--		<dependency>-->
-        <!--			<groupId>mysql</groupId>-->
-        <!--			<artifactId>mysql-connector-java</artifactId>-->
-        <!--			<version>8.0.11</version>-->
-        <!--		</dependency>-->
-        <dependency>
-            <groupId>net.mingsoft</groupId>
-            <artifactId>ms-mpeople</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.mingsoft</groupId>
-            <artifactId>ms-upgrader</artifactId>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/webapp</directory>
-                <excludes>
-                    <exclude>html/</exclude>
-                    <exclude>static/</exclude>
-                    <exclude>upload/</exclude>
-                    <exclude>templets/</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <excludes>
-                        <!--注意这玩意从编译结果目录开始算目录结构 -->
-                        <exclude>**/static/plugins/</exclude>
-                        <exclude>**/static/skin/</exclude>
-                        <exclude>**/Dockerfile</exclude>
-                        <exclude>**/ehcache.xml</exclude>
-                        <exclude>**/upgrade/</exclude>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/static/plugins/</exclude>
-                        <exclude>**/static/skin/</exclude>
-                        <exclude>**/application*.yml</exclude>
-                        <exclude>**/Dockerfile</exclude>
-                        <exclude>**/ehcache.xml</exclude>
-                        <exclude>**/upgrade/</exclude>
-                        <exclude>**/config/</exclude>
-                        <exclude>**/MSApplication.java</exclude>
-                        <exclude>**/MSServletInitializer.java</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <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>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <additionalConfig>
-                        <file>
-                            <name>.settings/org.eclipse.core.resources.prefs</name>
-                            <content>
+	<scm>
+		<connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
+		<developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
+		<url>https://github.com/ming-soft/ms-mcms</url>
+	</scm>
+	<distributionManagement>
+		<snapshotRepository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus snapshot repository</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>sonatype-nexus-staging</id>
+			<name>Sonatype Nexus release repository</name>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+	<properties>
+		<java.version>1.8</java.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
+		<!-- <dependency> -->
+		<!-- <groupId>mysql</groupId> -->
+		<!-- <artifactId>mysql-connector-java</artifactId> -->
+		<!-- <version>8.0.11</version> -->
+		<!-- </dependency> -->
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-mpeople</artifactId>
+			<version>1.0.15</version>
+		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-upgrader</artifactId>
+			<version>1.0.15</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+			<resource>
+				<directory>src/main/webapp</directory>
+				<excludes>
+					<exclude>html/</exclude>
+					<exclude>static/</exclude>
+					<exclude>upload/</exclude>
+					<exclude>templets/</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<excludes>
+						<!--注意这玩意从编译结果目录开始算目录结构 -->
+						<exclude>**/static/plugins/</exclude>
+						<exclude>**/static/skin/</exclude>
+						<exclude>**/Dockerfile</exclude>
+						<exclude>**/ehcache.xml</exclude>
+						<exclude>**/upgrade/</exclude>
+						<exclude>**/*.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<excludes>
+						<exclude>**/static/plugins/</exclude>
+						<exclude>**/static/skin/</exclude>
+						<exclude>**/application*.yml</exclude>
+						<exclude>**/Dockerfile</exclude>
+						<exclude>**/ehcache.xml</exclude>
+						<exclude>**/upgrade/</exclude>
+						<exclude>**/config/</exclude>
+						<exclude>**/MSApplication.java</exclude>
+						<exclude>**/MSServletInitializer.java</exclude>
+					</excludes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<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>
+					<encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<additionalConfig>
+						<file>
+							<name>.settings/org.eclipse.core.resources.prefs</name>
+							<content>
                                 <![CDATA[
                             eclipse.preferences.version=1
                             encoding/<project>=${project.build.sourceEncoding}
                             ]]>
-                            </content>
-                        </file>
-                    </additionalConfig>
-                </configuration>
-            </plugin>
+							</content>
+						</file>
+					</additionalConfig>
+				</configuration>
+			</plugin>
 
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xmx256m</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-clover2-plugin</artifactId>
-                <version>2.6.3</version>
-                <configuration>
-                    <licenseLocation>${clover.license.file}</licenseLocation>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <generateXml>true</generateXml>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>1.2</version>
-                <configuration>
-                    <findbugsXmlOutput>true</findbugsXmlOutput>
-                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-                    <xmlOutput>true</xmlOutput>
-                </configuration>
-            </plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>-Xmx256m</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.atlassian.maven.plugins</groupId>
+				<artifactId>maven-clover2-plugin</artifactId>
+				<version>2.6.3</version>
+				<configuration>
+					<licenseLocation>${clover.license.file}</licenseLocation>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<generateXml>true</generateXml>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>1.2</version>
+				<configuration>
+					<findbugsXmlOutput>true</findbugsXmlOutput>
+					<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+					<xmlOutput>true</xmlOutput>
+				</configuration>
+			</plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <configuration>
-                    <charset>UTF-8</charset>
-                    <encoding>UTF-8</encoding>
-                    <docencoding>UTF-8</docencoding>
-                    <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/webapp/WEB-INF</directory>
-                            <targetPath>WEB-INF</targetPath>
-                            <filtering>true</filtering>
-                            <includes>
-                                <include>**/*.xml</include>
-                            </includes>
-                            <excludes>
-                                <exclude>web.xml</exclude>
-                            </excludes>
-                        </resource>
-                    </webResources>
-                    <attachClasses>true</attachClasses>
-                    <warSourceExcludes>*/web.xml,static</warSourceExcludes>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <packagingExcludes>
-                        ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class
-                    </packagingExcludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9.1</version>
+				<configuration>
+					<charset>UTF-8</charset>
+					<encoding>UTF-8</encoding>
+					<docencoding>UTF-8</docencoding>
+					<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<webResources>
+						<resource>
+							<directory>src/main/webapp/WEB-INF</directory>
+							<targetPath>WEB-INF</targetPath>
+							<filtering>true</filtering>
+							<includes>
+								<include>**/*.xml</include>
+							</includes>
+							<excludes>
+								<exclude>web.xml</exclude>
+							</excludes>
+						</resource>
+					</webResources>
+					<attachClasses>true</attachClasses>
+					<warSourceExcludes>*/web.xml,static</warSourceExcludes>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<packagingExcludes>
+						ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class
+					</packagingExcludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<configuration>
+					<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
+				</configuration>
+			</plugin>
 
-        </plugins>
-        <defaultGoal>compile</defaultGoal>
+		</plugins>
+		<defaultGoal>compile</defaultGoal>
 
-        <finalName>ms-mcms</finalName>
-    </build>
+		<finalName>ms-mcms</finalName>
+	</build>
 </project>
diff --git a/src/main/webapp/static/plugins/ms/1.0.0/compatible.js b/src/main/webapp/static/plugins/ms/1.0.0/compatible.js
index 28e6a06d..213b6af3 100644
--- a/src/main/webapp/static/plugins/ms/1.0.0/compatible.js
+++ b/src/main/webapp/static/plugins/ms/1.0.0/compatible.js
@@ -1,3 +1,6 @@
+//ie的兼容
+
+//Object.assign 对ie对支持
 if (typeof Object.assign != 'function') {
     Object.assign = function(target) {
         'use strict';
@@ -17,4 +20,4 @@ if (typeof Object.assign != 'function') {
         }
         return target;
     };
-}
+}
\ No newline at end of file