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 | 211 +++++++++++++++++++++++-----------------------------
1 files changed, 95 insertions(+), 116 deletions(-)
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index d62efda..ce26444
--- a/pom.xml
+++ b/pom.xml
@@ -10,32 +10,26 @@
<version>1.0-SNAPSHOT</version>
<modules>
<module>java110-bean</module>
- <module>java110-config</module>
+ <module>java110-interface</module>
<module>java110-utils</module>
- <module>UserService</module>
- <module>LogService</module>
- <module>FeeService</module>
- <module>eureka</module>
<module>java110-core</module>
<module>java110-service</module>
- <module>CodeService</module>
- <module>StoreService</module>
- <module>RuleService</module>
- <module>java110-event</module>
- <module>OrderService</module>
- <module>java110-cacheAgent</module>
- <module>java110-logAgent</module>
- <module>ShopService</module>
- <module>CommentService</module>
- <module>Api</module>
- <module>CommunityService</module>
- <module>java110-code-generator</module>
<module>java110-db</module>
- <module>JobService</module>
- <module>CommonService</module>
- <module>ReportService</module>
- <module>HardwareAdapationService</module>
- <module>FrontService</module>
+ <module>service-user</module>
+ <module>service-fee</module>
+ <module>service-eureka</module>
+ <module>service-store</module>
+ <module>service-order</module>
+ <module>service-api</module>
+ <module>service-community</module>
+ <module>service-job</module>
+ <module>service-common</module>
+ <module>service-report</module>
+ <module>java110-generator</module>
+ <module>service-acct</module>
+ <module>service-oa</module>
+ <module>service-dev</module>
+
</modules>
<parent>
@@ -49,7 +43,6 @@
<maven.compile.target>1.8</maven.compile.target>
<sourceEncoding>UTF-8</sourceEncoding>
<spring-boot>2.0.4.RELEASE</spring-boot>
- <shiro.version>1.2.4</shiro.version>
<mybatis.version>3.3.0</mybatis.version>
<microcommunity.version>1.0-SNAPSHOT</microcommunity.version>
<dubbo.version>2.5.4-SNAPSHOT</dubbo.version>
@@ -57,11 +50,11 @@
<apache.common.lang3.version>3.4</apache.common.lang3.version>
<mybatis.version>3.4.1</mybatis.version>
- <log4j.version>2.11.0</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>
- <mysql.version>5.1.39</mysql.version>
+ <mysql.version>8.0.16</mysql.version>
<commons-pool2.version>2.2</commons-pool2.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.3.3</commons-fileupload.version>
@@ -79,6 +72,7 @@
<zookeeper.version>3.4.14</zookeeper.version>
<swagger.version>2.5.0</swagger.version>
<pinyin4j.version>2.5.0</pinyin4j.version>
+ <oss.aliyun>2.8.2</oss.aliyun>
</properties>
<dependencyManagement>
@@ -106,7 +100,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.28</version>
+ <version>1.2.79</version>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
@@ -144,11 +138,6 @@
<version>${microcommunity.version}</version>
</dependency>
- <dependency>
- <groupId>com.java110</groupId>
- <artifactId>java110-event</artifactId>
- <version>${microcommunity.version}</version>
- </dependency>
<dependency>
<groupId>com.java110</groupId>
@@ -163,33 +152,14 @@
</dependency>
<dependency>
<groupId>com.java110</groupId>
- <artifactId>java110-config</artifactId>
+ <artifactId>java110-interface</artifactId>
<version>${microcommunity.version}</version>
</dependency>
- <dependency>
- <groupId>com.java110</groupId>
- <artifactId>java110-cacheAgent</artifactId>
- <version>${microcommunity.version}</version>
- </dependency>
- <dependency>
- <groupId>com.java110</groupId>
- <artifactId>java110-logAgent</artifactId>
- <version>${microcommunity.version}</version>
- </dependency>
+
<dependency>
<groupId>com.java110</groupId>
<artifactId>java110-db</artifactId>
- <version>${microcommunity.version}</version>
- </dependency>
- <dependency>
- <groupId>com.java110</groupId>
- <artifactId>java110-front</artifactId>
- <version>${microcommunity.version}</version>
- </dependency>
- <dependency>
- <groupId>com.java110</groupId>
- <artifactId>ReportComponent</artifactId>
<version>${microcommunity.version}</version>
</dependency>
<!-- logback 鏃ュ織缁勪欢鏀寔 -->
@@ -214,12 +184,6 @@
<artifactId>logback-classic</artifactId>
<version>${logback.vaersion}</version>
</dependency>
-
-<!-- <dependency>-->
-<!-- <groupId>log4j</groupId>-->
-<!-- <artifactId>log4j</artifactId>-->
-<!-- <version>1.2.17</version>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -249,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>
@@ -268,6 +237,11 @@
<version>3.0.9.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.49</version>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -335,7 +309,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
+ <version>1.9.4</version>
</dependency>
@@ -368,17 +342,6 @@
<version>${httpclient.verion}</version>
</dependency>
- <!--<dependency>
- <groupId>io.shardingsphere</groupId>
- <artifactId>sharding-jdbc</artifactId>
- <version>3.0.0.M3</version>
- </dependency>-->
-
- <!--<dependency>
- <groupId>io.shardingsphere</groupId>
- <artifactId>sharding-jdbc-core</artifactId>
- <version>3.1.0</version>
- </dependency>-->
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -386,30 +349,6 @@
<version>4.0.0-RC1</version>
</dependency>
-
- <!-- https://mvnrepository.com/artifact/org.apache.axis2/axis2
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis</artifactId>
- <version>${axis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>${axis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>${axis.version}</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${axis.version}</version>
- </dependency>
- -->
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -424,15 +363,10 @@
</dependency>
- <!-- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.3.0</version>
- </dependency>-->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
@@ -483,7 +417,13 @@
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
- <version>4.0.3</version>
+ <version>4.4.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-ecs</artifactId>
+ <version>4.17.6</version>
</dependency>
<!--flowable宸ヤ綔娴佷緷璧�
@@ -524,6 +464,23 @@
<artifactId>activiti-spring</artifactId>
<version>6.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-bpmn-layout</artifactId>
+ <version>6.0.0.RC1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-spring-boot-starter-basic</artifactId>
+ <version>6.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.tencentcloudapi</groupId>
@@ -533,18 +490,18 @@
<version>3.0.112</version>
</dependency>
- <!--<dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-modeler</artifactId>
- <version>5.22.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-bpmn-model</artifactId>
- </exclusion>
- </exclusions>
- </dependency>-->
+ <!-- https://mvnrepository.com/artifact/com.aliyun.oss/aliyun-sdk-oss -->
+ <dependency>
+ <groupId>com.aliyun.oss</groupId>
+ <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>
@@ -553,7 +510,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -577,8 +533,6 @@
</dependency>
-
-
</dependencies>
<build>
@@ -586,7 +540,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -595,7 +548,33 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+ <distributionManagement>
+ <repository>
+ <!--鍙戣鐗堟湰-->
+ <id>releases</id>
+ <url>http://maven.homecommunity.cn:8081/repository/maven-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <!--蹇収鐗堟湰-->
+ <id>snapshots</id>
+ <url>http://maven.homecommunity.cn:8081/repository/maven-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
--
Gitblit v1.8.0