修改配置

hx-service-api/basics-api/pom.xml

@@ -0,0 +1,19 @@
+<?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>
+        <artifactId>hx-service-api</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>basics-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

hx-service-api/pom.xml

@@ -31,6 +31,7 @@
         <module>storage-api</module>
         <module>storage-restructure-api</module>
         <module>service-flow-api</module>
+        <module>basics-api</module>
     </modules>
 
     <dependencyManagement>

hx-service/basics/pom.xml

@@ -0,0 +1,19 @@
+<?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>
+        <artifactId>hx-service</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>basics</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

hx-service/pom.xml

@@ -25,6 +25,7 @@
         <module>syringe-production</module>
         <module>storage</module>
         <module>storage-restructure</module>
+        <module>basics</module>
     </modules>
 
     <dependencyManagement>

hx-service/storage-restructure/src/main/java/com/fjhx/HxStorageApplication.java

@@ -1,25 +0,0 @@
-package com.fjhx;
-
-import org.springblade.common.constant.ApiConstant;
-import org.springblade.core.cloud.feign.EnableBladeFeign;
-import org.springblade.core.launch.BladeApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-/**
- * 仓管模块启动器
- */
-@EnableAsync
-@EnableBladeFeign
-@EnableDiscoveryClient
-@EnableCircuitBreaker
-@SpringBootApplication
-public class HxStorageApplication {
-
-    public static void main(String[] args) {
-        BladeApplication.run(ApiConstant.APP_NAME.STORAGE_APP_NAME, HxStorageApplication.class, args);
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/StorageRestructureApplication.java

@@ -0,0 +1,20 @@
+package com.fjhx;
+
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+/**
+ * 杰生重构模块启动器
+ */
+@EnableBladeFeign
+@SpringCloudApplication
+public class StorageRestructureApplication {
+
+    private static final String APP_NAME = "storage-restructure";
+
+    public static void main(String[] args) {
+        BladeApplication.run(APP_NAME, StorageRestructureApplication.class, args);
+    }
+
+}

hx-service/syringe-management/src/main/java/com/fjhx/IotManagementApplication.java → hx-service/syringe-management/src/main/java/com/fjhx/SyringeManagementApplication.java

@@ -9,12 +9,12 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-public class IotManagementApplication {
+public class SyringeManagementApplication {
 
     private static final String APP_NAME = "syringe-management";
 
     public static void main(String[] args) {
-        BladeApplication.run(APP_NAME, IotManagementApplication.class, args);
+        BladeApplication.run(APP_NAME, SyringeManagementApplication.class, args);
     }
 
 }

hx-service/syringe-management/src/main/resources/application-dev.yml

@@ -8,6 +8,6 @@ logging:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.iot_management.dev.url}
+    url: ${blade.datasource.syringe_management.dev.url}
-    username: ${blade.datasource.iot_management.dev.username}
+    username: ${blade.datasource.syringe_management.dev.username}
-    password: ${blade.datasource.iot_management.dev.password}
+    password: ${blade.datasource.syringe_management.dev.password}

hx-service/syringe-management/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ server:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.iot_management.prod.url}
+    url: ${blade.datasource.syringe_management.prod.url}
-    username: ${blade.datasource.iot_management.prod.username}
+    username: ${blade.datasource.syringe_management.prod.username}
-    password: ${blade.datasource.iot_management.prod.password}
+    password: ${blade.datasource.syringe_management.prod.password}
 

hx-service/syringe-management/src/main/resources/application-test.yml

@@ -6,6 +6,6 @@ server:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.iot_management.test.url}
+    url: ${blade.datasource.syringe_management.test.url}
-    username: ${blade.datasource.iot_management.test.username}
+    username: ${blade.datasource.syringe_management.test.username}
-    password: ${blade.datasource.iot_management.test.password}
+    password: ${blade.datasource.syringe_management.test.password}

hx-service/syringe-production/src/main/java/com/fjhx/IotProductionApplication.java → hx-service/syringe-production/src/main/java/com/fjhx/SyringeProductionApplication.java

@@ -9,12 +9,12 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-public class IotProductionApplication {
+public class SyringeProductionApplication {
 
     private static final String APP_NAME = "syringe-production";
 
     public static void main(String[] args) {
-        BladeApplication.run(APP_NAME, IotProductionApplication.class, args);
+        BladeApplication.run(APP_NAME, SyringeProductionApplication.class, args);
     }
 
 }

hx-service/syringe-production/src/main/resources/application-dev.yml

@@ -8,6 +8,6 @@ logging:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.iot_production.dev.url}
+    url: ${blade.datasource.syringe_production.dev.url}
-    username: ${blade.datasource.iot_production.dev.username}
+    username: ${blade.datasource.syringe_production.dev.username}
-    password: ${blade.datasource.iot_production.dev.password}
+    password: ${blade.datasource.syringe_production.dev.password}

hx-service/syringe-production/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ server:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.iot_production.prod.url}
+    url: ${blade.datasource.syringe_production.prod.url}
-    username: ${blade.datasource.iot_production.prod.username}
+    username: ${blade.datasource.syringe_production.prod.username}
-    password: ${blade.datasource.iot_production.prod.password}
+    password: ${blade.datasource.syringe_production.prod.password}
 

hx-service/syringe-production/src/main/resources/application-test.yml

@@ -6,6 +6,6 @@ server:
 spring:
   # 数据库
   datasource:
-    url: ${blade.datasource.iot_production.test.url}
+    url: ${blade.datasource.syringe_production.test.url}
-    username: ${blade.datasource.iot_production.test.username}
+    username: ${blade.datasource.syringe_production.test.username}
-    password: ${blade.datasource.iot_production.test.password}
+    password: ${blade.datasource.syringe_production.test.password}