支付组件

mec-auth/pom.xml

@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.microsvc.toolkit.common</groupId>
 			<artifactId>microsvc-common-webportal</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 		<!-- 引用Mybatis 和 Mysql驱动开始 -->
 		<dependency>

mec-biz/pom.xml

@@ -17,17 +17,6 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.microsvc.toolkit.middleware</groupId>
-			<artifactId>microsvc-middleware-payment</artifactId>
-			<version>${microsvc.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>mybatis-plus-annotation</artifactId>
-					<groupId>com.baomidou</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
 			<groupId>com.ym</groupId>
 			<artifactId>common-core</artifactId>
 		</dependency>
@@ -67,21 +56,35 @@
 			<artifactId>thumbnailator</artifactId>
 			<version>0.4.11</version>
 		</dependency>
-
+		<dependency>
+			<groupId>com.microsvc.toolkit.middleware</groupId>
+			<artifactId>microsvc-middleware-payment</artifactId>
+			<version>${microsvc.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>mybatis-plus-annotation</artifactId>
+					<groupId>com.baomidou</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>com.microsvc.toolkit.middleware</groupId>
 			<artifactId>microsvc-middleware-live</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsvc.toolkit.common</groupId>
 			<artifactId>microsvc-common-response</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsvc.toolkit.middleware</groupId>
 			<artifactId>microsvc-middleware-rtc</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 
 		<!--修复依赖冲突-->
@@ -92,22 +95,22 @@
 		<dependency>
 			<groupId>com.microsvc.toolkit.config</groupId>
 			<artifactId>microsvc-config-validator</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
         <dependency>
             <groupId>com.microsvc.toolkit.config</groupId>
             <artifactId>microsvc-config-jwt</artifactId>
-            <version>${com.microsvc.toolkit.version}</version>
+            <version>${microsvc.version}</version>
         </dependency>
 		<dependency>
 			<groupId>com.microsvc.toolkit.middleware</groupId>
 			<artifactId>microsvc-middleware-im</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsvc.toolkit.middleware</groupId>
 			<artifactId>microsvc-middleware-oss</artifactId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 
 		<dependency>
@@ -132,7 +135,7 @@
 				</exclusion>
 			</exclusions>
 			<groupId>com.microsvc.toolkit.common</groupId>
-			<version>${com.microsvc.toolkit.version}</version>
+			<version>${microsvc.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.yonge.log</groupId>

pom.xml

@@ -25,7 +25,6 @@
 		<docker.host>http://127.0.0.1:2375</docker.host>
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
-		<com.microsvc.toolkit.version>1.0.8-RC1</com.microsvc.toolkit.version>
 		<cbs.version>1.0.26</cbs.version>
 		<microsvc.version>1.2.0</microsvc.version>
 	</properties>