Merge branch 'dev'

# Conflicts:
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/CacheConfig.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/DebugConfig.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicJsonAutoConfiguration.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicMongoAutoConfiguration.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicRedisAutoConfiguration.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicSwaggerConfiguration.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/PageConfig.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ResourceConfig.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ResponseCodeConfig.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/SecurityConfig.java
#	magic-api/src/main/java/org/ssssssss/magicapi/spring/boot/starter/SwaggerConfig.java
#	magic-api/src/main/resources/META-INF/additional-spring-configuration-metadata.json
#	magic-api/src/main/resources/META-INF/spring.factories
#	pom.xml

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -48,7 +48,7 @@ magic-api 是一个基于Java的接口快速开发框架，编写接口将通过
 <dependency>
 	<groupId>org.ssssssss</groupId>
     <artifactId>magic-api-spring-boot-starter</artifactId>
-    <version>1.1.3</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ## 修改application.properties

magic-api-spring-boot-starter/pom.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <parent>
+        <groupId>org.ssssssss</groupId>
+        <artifactId>magic-api-parent</artifactId>
+        <version>1.2.0</version>
+    </parent>
+    <artifactId>magic-api-spring-boot-starter</artifactId>
+    <packaging>jar</packaging>
+    <name>magic-api-spring-boot-starter</name>
+    <description>magic-api-spring-boot-starter</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ssssssss</groupId>
+            <artifactId>magic-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ssssssss</groupId>
+            <artifactId>magic-script</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ssssssss</groupId>
+            <artifactId>magic-editor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>

magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ClusterConfig.java

@@ -0,0 +1,47 @@
+package org.ssssssss.magicapi.spring.boot.starter;
+
+/**
+ * 集群配置
+ * @since 1.2.0
+ */
+public class ClusterConfig {
+
+	/**
+	 * 是否启用，默认不启用
+	 */
+	private boolean enable = false;
+
+	/**
+	 * 实例ID，集群环境下，要保证每台机器不同。默认启动后随机生成uuid
+	 */
+	private String instanceId;
+
+	/**
+	 * redis 通道
+	 */
+	private String channel = "magic-api:notify:channel";
+
+	public String getInstanceId() {
+		return instanceId;
+	}
+
+	public void setInstanceId(String instanceId) {
+		this.instanceId = instanceId;
+	}
+
+	public boolean isEnable() {
+		return enable;
+	}
+
+	public void setEnable(boolean enable) {
+		this.enable = enable;
+	}
+
+	public String getChannel() {
+		return channel;
+	}
+
+	public void setChannel(String channel) {
+		this.channel = channel;
+	}
+}