Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pom.xml

pom.xml

@@ -27,16 +27,8 @@
             <groupId>com.chinaunicom.ebtp</groupId>
             <artifactId>mall-ebtp-cloud-attachment-sdk</artifactId>
         </dependency>
-
-        <!-- xxl-job-core -->
-        <dependency>
-            <groupId>cn.chinaunicom.sdsi</groupId>
-            <artifactId>mall-xxljob-core</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-
-
-        <dependency>
+		
+		<dependency>
 			<groupId>com.chinaunicom.ebtp</groupId>
 			<artifactId>mall-ebtp-cloud-apollo-starter</artifactId>
 		</dependency>
@@ -101,6 +93,16 @@
             <scope>system</scope>
             <systemPath>${basedir}/lib/aspose-words-16.8.0-jdk16.jar</systemPath>
         </dependency>
+
+        <!--第三方jar包-->
+        <dependency>
+            <groupId>cryp.access</groupId>
+            <artifactId>accessToken</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/access_token1.1.jar</systemPath>
+        </dependency>
+
         <dependency>
             <groupId>cn.chinaunicom.sdsi</groupId>
             <artifactId>mall-xxljob-core</artifactId>
@@ -142,10 +144,6 @@
             <id>com.e-iceblue</id>
             <url>http://repo.e-iceblue.cn/repository/maven-public/</url>
         </repository>
-        <repository>
-            <id>maven-virtual</id>
-            <url>http://ccp.tianti.tg.unicom.local/artifactory/maven-virtual</url>
-        </repository>
 	</repositories>
 
     <build>