Merge branch 'master' into dev

# Conflicts:
#	ace-modules/ace-admin-api/target/classes/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.class
#	ace-modules/ace-admin-api/target/classes/com/github/wxiaoqi/security/admin/vo/AuthorityMenuTree.class
#	ace-modules/ace-admin-api/target/classes/com/github/wxiaoqi/security/admin/vo/MenuTree.class
#	ace-modules/ace-generator/target/classes/application.yml
#	ace-modules/ace-generator/target/classes/com/github/wxiaoqi/security/generator/service/GeneratorService.class
#	ace-modules/ace-generator/target/classes/generator.properties
#	ace-modules/ace-generator/target/classes/mapper/GeneratorMapper.xml
#	ace-modules/ace-generator/target/classes/template/controller.java.vm
#	ace-modules/ace-generator/target/classes/template/entity.java.vm
#	ace-modules/ace-generator/target/classes/template/mapper.java.vm
#	ace-modules/ace-generator/target/classes/template/mapper.xml.vm

ace-auth/ace-auth-client/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>ace-auth</artifactId>
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-rscp-SNAPSHOT</version>
-        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ace-auth/ace-auth-common/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>ace-auth</artifactId>
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-rscp-SNAPSHOT</version>
-        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ace-auth/ace-auth-server/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>ace-auth</artifactId>
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-rscp-SNAPSHOT</version>
-        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ace-common/pom.xml

@@ -6,22 +6,11 @@
         <artifactId>ace-security</artifactId>
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-rscp-SNAPSHOT</version>
-        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ace-common</artifactId>
     <version>2.0-rscp-SNAPSHOT</version>
-    <repositories>
-        <repository>
-            <id>mvn-repo</id>
-            <url>https://raw.github.com/wxiaoqi/ace-cache/master</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>
@@ -181,11 +170,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>

ace-control/ace-monitor/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>ace-control</artifactId>
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-rscp-SNAPSHOT</version>
-        <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

ace-control/ace-monitor/target/classes/application.yml

-spring:
-  application:
-    name: ace-monitor
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-
-server:
-  port: 8764 #启动端口
-#
-#eureka:
-#     instance:
-#        preferIpAddress: true
-#        statusPageUrlPath: /actuator/info
-#        healthCheckUrlPath: /actuator/health
-#     client:
-#        registerWithEureka: true
-#        fetchRegistry: true
-#        serviceUrl:
-#          defaultZone: http://localhost:8761/eureka/
-
-

ace-gate/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>ace-security</artifactId>
         <groupId>com.github.wxiaoqi</groupId>
         <version>2.0-rscp-SNAPSHOT</version>
-        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>