Merge remote-tracking branch 'origin/master'

hzims-service/assets/pom.xml

@@ -30,11 +30,6 @@
             <artifactId>blade-starter-oss-all</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.5.6</version>
-        </dependency>
-        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
@@ -51,17 +46,14 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>assets-api</artifactId>
-            <version>${hzims.project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>ticket-api</artifactId>
-            <version>${hzims.project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xuxueli</groupId>
@@ -70,14 +62,13 @@
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>message-api</artifactId>
-            <version>${hzims.project.version}</version>
             <scope>compile</scope>
         </dependency>
 
     </dependencies>
 
     <build>
-        <finalName>${project.name}-${project.version}</finalName>
+        <finalName>hzims-${project.name}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>com.spotify</groupId>

hzims-service/equipment/pom.xml

@@ -72,7 +72,6 @@
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>equipment-api</artifactId>
-            <version>${hzims.project.version}</version>
         </dependency>
 
         <dependency>
@@ -93,7 +92,6 @@
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>hzims-operational-api</artifactId>
-            <version>${hzims.project.version}</version>
             <scope>compile</scope>
         </dependency>
 

hzims-service/topvision/pom.xml

@@ -62,6 +62,7 @@
     </dependencies>
 
     <build>
+        <finalName>hzims-${project.name}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>com.spotify</groupId>
@@ -78,19 +79,6 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.mybatis.generator</groupId>
-                <artifactId>mybatis-generator-maven-plugin</artifactId>
-                <version>1.3.2</version>
-                <configuration>
-                    <verbose>true</verbose>
-                    <overwrite>true</overwrite>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

hzims-service/weather/pom.xml

@@ -27,7 +27,6 @@
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>hzims-biz-common</artifactId>
-            <version>${hzims.project.version}</version>
         </dependency>
 
         <dependency>
@@ -64,10 +63,7 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
+
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>