From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 pom.xml |   45 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd82f73..503e43f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,11 @@
         <module>service-job</module>
         <module>service-common</module>
         <module>service-report</module>
-        <module>service-front</module>
-        <module>java110-generator</module>
         <module>service-acct</module>
         <module>service-oa</module>
+        <module>service-dev</module>
+        <module>springboot</module>
+        <module>java110-boot</module>
 
     </modules>
 
@@ -43,14 +44,14 @@
         <maven.compile.target>1.8</maven.compile.target>
         <sourceEncoding>UTF-8</sourceEncoding>
         <spring-boot>2.0.4.RELEASE</spring-boot>
-        <mybatis.version>3.3.0</mybatis.version>
+        <mybatis.version>3.5.6</mybatis.version>
         <microcommunity.version>1.0-SNAPSHOT</microcommunity.version>
         <dubbo.version>2.5.4-SNAPSHOT</dubbo.version>
-        <logback.vaersion>1.2.3</logback.vaersion>
+        <logback.vaersion>1.2.9</logback.vaersion>
 
         <apache.common.lang3.version>3.4</apache.common.lang3.version>
-        <mybatis.version>3.4.1</mybatis.version>
-        <log4j.version>2.13.2</log4j.version>
+        <mybatis.version>3.5.6</mybatis.version>
+        <log4j.version>2.17.1</log4j.version>
         <tomcat.servlet.version>6.0.37</tomcat.servlet.version>
         <druid.version>1.1.10</druid.version>
         <mybatis-spring.version>1.3.1</mybatis-spring.version>
@@ -63,7 +64,7 @@
         <commons-lang.version>2.5</commons-lang.version>
         <commons-beanutils.version>1.8.0</commons-beanutils.version>
         <slf4j.version>1.7.7</slf4j.version>
-        <logback.version>1.1.2</logback.version>
+        <logback.version>1.2.9</logback.version>
         <activemq.version>5.7.0</activemq.version>
         <xbean.version>3.18</xbean.version>
         <axis.version>1.4</axis.version>
@@ -100,7 +101,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.69</version>
+                <version>1.2.83</version>
             </dependency>
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
@@ -213,6 +214,11 @@
                 <version>${log4j.version}</version>
             </dependency>
             <!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
+<!--            <dependency>-->
+<!--                <groupId>io.github.openfeign</groupId>-->
+<!--                <artifactId>feign-okhttp</artifactId>-->
+<!--                <version>10.1.0</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>log4j-over-slf4j</artifactId>
@@ -432,7 +438,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.11.3</version>
+                <version>1.14.2</version>
             </dependency>
 
             <!-- 寮曞叆poi锛岃В鏋恮orkbook瑙嗗浘 -->
@@ -491,6 +497,27 @@
                 <artifactId>aliyun-sdk-oss</artifactId>
                 <version>${oss.aliyun}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.alipay.sdk</groupId>
+                <artifactId>alipay-sdk-java</artifactId>
+                <version>4.10.111.ALL</version>
+            </dependency>
+
+            <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.15</version>
+            </dependency>
+            <dependency>
+                <groupId>com.qcloud</groupId>
+                <artifactId>cos_api</artifactId>
+                <version>5.6.69</version>
+            </dependency>
+
+
+
         </dependencies>
 
     </dependencyManagement>

--
Gitblit v1.8.0