From bcc17f20197a0cabd210a03946b858241a5e3ed5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 14 三月 2022 17:24:07 +0800
Subject: [PATCH] 优化 acct 时区

---
 pom.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3d68f8..ce26444 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
         <module>java110-generator</module>
         <module>service-acct</module>
         <module>service-oa</module>
+        <module>service-dev</module>
 
     </modules>
 
@@ -49,7 +50,7 @@
 
         <apache.common.lang3.version>3.4</apache.common.lang3.version>
         <mybatis.version>3.4.1</mybatis.version>
-        <log4j.version>2.13.2</log4j.version>
+        <log4j.version>2.17.0</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>
@@ -99,7 +100,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.69</version>
+                <version>1.2.79</version>
             </dependency>
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
@@ -212,6 +213,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>
@@ -490,6 +496,12 @@
                 <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>
         </dependencies>
 
     </dependencyManagement>

--
Gitblit v1.8.0