浏览代码

项目初始化

lixing 4 年之前
父节点
当前提交
c0757e2e6f
共有 7 个文件被更改,包括 51 次插入36 次删除
  1. 2 2
      fm-calendar/pom.xml
  2. 2 2
      fm-device/pom.xml
  3. 26 21
      fm-person/pom.xml
  4. 2 2
      fm-qrcode/pom.xml
  5. 2 2
      fm-scheduling/pom.xml
  6. 2 2
      fm-supplier/pom.xml
  7. 15 5
      pom.xml

+ 2 - 2
fm-calendar/pom.xml

@@ -3,9 +3,9 @@
          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>
-        <artifactId>integrated-platform</artifactId>
+        <artifactId>fm-cloud</artifactId>
         <groupId>com.persagy</groupId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-calendar</artifactId>

+ 2 - 2
fm-device/pom.xml

@@ -3,9 +3,9 @@
          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>
-        <artifactId>integrated-platform</artifactId>
+        <artifactId>fm-cloud</artifactId>
         <groupId>com.persagy</groupId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-device</artifactId>

+ 26 - 21
fm-person/pom.xml

@@ -2,12 +2,15 @@
 <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">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>fm-cloud</artifactId>
         <groupId>com.persagy</groupId>
         <version>3.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>fm-person</artifactId>
     <version>3.0.0</version>
     <packaging>jar</packaging>
@@ -24,11 +27,11 @@
             <version>${platform.version}</version>
         </dependency>
 
-        <!-- 日志 -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>integrated-log-spring-boot-starter</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; 日志 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.persagy</groupId>-->
+<!--            <artifactId>integrated-log-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
 
         <!-- feign -->
         <dependency>
@@ -44,26 +47,20 @@
             <version>${platform.version}</version>
         </dependency>
 
-        <!-- web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
-        <!-- prometheus -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; prometheus &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.micrometer</groupId>-->
+<!--            <artifactId>micrometer-registry-prometheus</artifactId>-->
+<!--        </dependency>-->
 
         <!-- lombok -->
         <dependency>
@@ -71,6 +68,14 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- lang -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.5</version>
+        </dependency>
+
     </dependencies>
 
 

+ 2 - 2
fm-qrcode/pom.xml

@@ -3,9 +3,9 @@
          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>
-        <artifactId>integrated-platform</artifactId>
+        <artifactId>fm-cloud</artifactId>
         <groupId>com.persagy</groupId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-qrcode</artifactId>

+ 2 - 2
fm-scheduling/pom.xml

@@ -3,9 +3,9 @@
          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>
-        <artifactId>integrated-platform</artifactId>
+        <artifactId>fm-cloud</artifactId>
         <groupId>com.persagy</groupId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-scheduling</artifactId>

+ 2 - 2
fm-supplier/pom.xml

@@ -3,9 +3,9 @@
          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>
-        <artifactId>integrated-platform</artifactId>
+        <artifactId>fm-cloud</artifactId>
         <groupId>com.persagy</groupId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-supplier</artifactId>

+ 15 - 5
pom.xml

@@ -9,6 +9,7 @@
         <groupId>com.persagy</groupId>
         <artifactId>fm-parent</artifactId>
         <version>3.0.0</version>
+        <relativePath></relativePath>
     </parent>
 
     <packaging>pom</packaging>
@@ -25,21 +26,30 @@
         <module>fm-supplier</module>
     </modules>
 
+    <properties>
+        <fm-server.version>3.0.0</fm-server.version>
+        <fm-common.version>3.0.0</fm-common.version>
+    </properties>
+    <repositories>
+        <repository>
+            <id>integrated</id>
+            <name>releases Repository</name>
+            <url>http://47.93.132.139:8081/nexus/content/repositories/integrated/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <!-- 项目启动 -->
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>fm-server</artifactId>
+            <version>${fm-server.version}</version>
         </dependency>
         <!-- fm 工具包 -->
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>fm-common</artifactId>
-        </dependency>
-        <!-- 集成框架工具包 -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>integrated-common-core</artifactId>
+            <version>${fm-common.version}</version>
         </dependency>
     </dependencies>
 </project>