From 32c590108d4286e7ef9e0081da0a856276ba7f51 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Thu, 28 Jun 2018 21:48:50 +0800
Subject: [PATCH] merge

---
 .../src/main/resources/rsa_private_key.pem    |  0
 .../src/main/resources/rsa_public_key.pem     |  0
 ...oot_module_pro.sql => boot_module_ddl.sql} |  0
 pom.xml                                       | 42 ++++++++-----------
 4 files changed, 17 insertions(+), 25 deletions(-)
 rename {boot-web => boot-service}/src/main/resources/rsa_private_key.pem (100%)
 rename {boot-web => boot-service}/src/main/resources/rsa_public_key.pem (100%)
 rename boot-web/src/main/resources/{boot_module_pro.sql => boot_module_ddl.sql} (100%)

diff --git a/boot-web/src/main/resources/rsa_private_key.pem b/boot-service/src/main/resources/rsa_private_key.pem
similarity index 100%
rename from boot-web/src/main/resources/rsa_private_key.pem
rename to boot-service/src/main/resources/rsa_private_key.pem
diff --git a/boot-web/src/main/resources/rsa_public_key.pem b/boot-service/src/main/resources/rsa_public_key.pem
similarity index 100%
rename from boot-web/src/main/resources/rsa_public_key.pem
rename to boot-service/src/main/resources/rsa_public_key.pem
diff --git a/boot-web/src/main/resources/boot_module_pro.sql b/boot-web/src/main/resources/boot_module_ddl.sql
similarity index 100%
rename from boot-web/src/main/resources/boot_module_pro.sql
rename to boot-web/src/main/resources/boot_module_ddl.sql
diff --git a/pom.xml b/pom.xml
index 128e904..983a825 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,23 @@
         <version>1.5.7.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
+    <repositories>
+        <repository><!-- 阿里云maven仓库 -->
+            <id>nexus</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </pluginRepository>
+    </pluginRepositories>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -112,29 +129,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>repository</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository><!-- 阿里云maven仓库 -->
-                    <id>nexus</id>
-                    <name>aliyun nexus</name>
-                    <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>nexus</id>
-                    <name>aliyun nexus</name>
-                    <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file