Merge remote-tracking branch 'origin/master'
This commit is contained in:
wujj
commit
b375d2cc4f
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2019 铭飞科技
|
Copyright (c) 2020 铭飞科技
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
this software and associated documentation files (the "Software"), to deal in
|
||||||
|
|
|
||||||
105
pom-bin.xml
105
pom-bin.xml
|
|
@ -1,105 +0,0 @@
|
||||||
<?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>2.0.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mcms</artifactId>
|
|
||||||
<version>5.2-SNAPSHOT</version>
|
|
||||||
<name>ms-mcms</name>
|
|
||||||
<properties>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mpeople</artifactId>
|
|
||||||
</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>
|
|
||||||
</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>
|
|
||||||
116
pom-war.xml
116
pom-war.xml
|
|
@ -1,116 +0,0 @@
|
||||||
<?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>2.0.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mcms</artifactId>
|
|
||||||
<version>5.2-SNAPSHOT</version>
|
|
||||||
<name>ms-mcms</name>
|
|
||||||
<packaging>war</packaging>
|
|
||||||
<properties>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mpeople</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>store-client</artifactId>
|
|
||||||
<version>5.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.tomcat</groupId>
|
|
||||||
<artifactId>tomcat-servlet-api</artifactId>
|
|
||||||
<version>7.0.42</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-logging</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</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>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<warSourceExcludes>src/main/resources/**</warSourceExcludes>
|
|
||||||
<warName>mcms</warName>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
</plugins>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<filtering>true</filtering>
|
|
||||||
<directory>src/main/webapp</directory>
|
|
||||||
</resource>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
</resource>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/java</directory>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<defaultGoal>compile</defaultGoal>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
201
pom.xml
201
pom.xml
|
|
@ -1,98 +1,117 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
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>2.0.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mcms</artifactId>
|
|
||||||
<version>5.2-SNAPSHOT</version>
|
|
||||||
<name>ms-mcms</name>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<properties>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<repositories>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<repository>
|
<groupId>net.mingsoft</groupId>
|
||||||
<id>alimaven</id>
|
<artifactId>ms-mcms</artifactId>
|
||||||
<name>aliyun maven</name>
|
<version>5.1</version>
|
||||||
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
|
<name>ms-mcms</name>
|
||||||
<releases>
|
<!-- 打包jar包 -->
|
||||||
<enabled>true</enabled>
|
<packaging>jar</packaging>
|
||||||
</releases>
|
<!-- 打包war包 -->
|
||||||
<snapshots>
|
<!-- <packaging>war</packaging> -->
|
||||||
<enabled>true</enabled>
|
<properties>
|
||||||
</snapshots>
|
<java.version>1.8</java.version>
|
||||||
</repository>
|
</properties>
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<dependencies>
|
<repositories>
|
||||||
<dependency>
|
<repository>
|
||||||
<groupId>net.mingsoft</groupId>
|
<id>alimaven</id>
|
||||||
<artifactId>ms-mpeople</artifactId>
|
<name>aliyun maven</name>
|
||||||
</dependency>
|
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
|
||||||
|
<releases>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.mingsoft</groupId>
|
<groupId>net.mingsoft</groupId>
|
||||||
<artifactId>store-client</artifactId>
|
<artifactId>ms-mpeople</artifactId>
|
||||||
<version>5.1</version>
|
<version>1.0.28</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-logging</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
|
||||||
<finalName>ms-mcms</finalName>
|
<dependency>
|
||||||
<plugins>
|
<groupId>net.mingsoft</groupId>
|
||||||
<plugin>
|
<artifactId>store-client</artifactId>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<version>5.1</version>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
</dependency>
|
||||||
<configuration>
|
<dependency>
|
||||||
<source>${java.version}</source>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<target>${java.version}</target>
|
<artifactId>spring-boot-starter</artifactId>
|
||||||
</configuration>
|
<version>2.2.2.RELEASE</version>
|
||||||
</plugin>
|
<exclusions>
|
||||||
<plugin>
|
<exclusion>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-starter-logging</artifactId>
|
||||||
<executions>
|
</exclusion>
|
||||||
<execution>
|
</exclusions>
|
||||||
<goals>
|
</dependency>
|
||||||
<goal>repackage</goal>
|
</dependencies>
|
||||||
</goals>
|
|
||||||
</execution>
|
<build>
|
||||||
</executions>
|
<finalName>ms-mcms</finalName>
|
||||||
<configuration>
|
<plugins>
|
||||||
<fork>true</fork>
|
<plugin>
|
||||||
</configuration>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
</plugin>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
</plugins>
|
<configuration>
|
||||||
<resources>
|
<source>${java.version}</source>
|
||||||
<resource>
|
<target>${java.version}</target>
|
||||||
<filtering>true</filtering>
|
</configuration>
|
||||||
<directory>src/main/webapp</directory>
|
</plugin>
|
||||||
</resource>
|
<plugin>
|
||||||
<resource>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<directory>src/main/resources</directory>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
</resource>
|
<executions>
|
||||||
<resource>
|
<execution>
|
||||||
<directory>src/main/java</directory>
|
<goals>
|
||||||
</resource>
|
<goal>repackage</goal>
|
||||||
</resources>
|
</goals>
|
||||||
<defaultGoal>compile</defaultGoal>
|
</execution>
|
||||||
</build>
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<fork>true</fork>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<!-- 打包war包使用 -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-war-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<warSourceExcludes>src/main/resources/**</warSourceExcludes>
|
||||||
|
<warName>mcms</warName>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
</plugins>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
<directory>src/main/webapp</directory>
|
||||||
|
<excludes>
|
||||||
|
<!--打包生产 -->
|
||||||
|
<!-- <exclude>static/</exclude> -->
|
||||||
|
<!-- <exclude>html/</exclude> -->
|
||||||
|
<!-- <exclude>upload/</exclude> -->
|
||||||
|
<!-- <exclude>templets/</exclude> -->
|
||||||
|
</excludes>
|
||||||
|
</resource>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/resources</directory>
|
||||||
|
</resource>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/java</directory>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
<defaultGoal>compile</defaultGoal>
|
||||||
|
</build>
|
||||||
</project>
|
</project>
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue