From cddcf22a61489ee9c2dfee169d817ccd66f95430 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 02:23:43 +0800
Subject: [PATCH] 优化代码

---
 pom.xml |  257 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 161 insertions(+), 96 deletions(-)

diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index 3ec814b..fd82f73
--- a/pom.xml
+++ b/pom.xml
@@ -10,30 +10,26 @@
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>java110-bean</module>
-        <module>java110-config</module>
-        <module>java110-common</module>
-        <module>UserService</module>
-        <module>LogService</module>
-        <module>FeeService</module>
-        <module>eureka</module>
+        <module>java110-interface</module>
+        <module>java110-utils</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>WebService</module>
-        <module>java110-logAgent</module>
-        <module>zipkin</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>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>service-front</module>
+        <module>java110-generator</module>
+        <module>service-acct</module>
+        <module>service-oa</module>
+
     </modules>
 
     <parent>
@@ -47,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>
@@ -55,11 +50,11 @@
 
         <apache.common.lang3.version>3.4</apache.common.lang3.version>
         <mybatis.version>3.4.1</mybatis.version>
-        <log4j.version>1.2.17</log4j.version>
+        <log4j.version>2.13.2</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>
@@ -76,6 +71,8 @@
         <spring.version>5.0.8.RELEASE</spring.version>
         <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>
@@ -95,12 +92,15 @@
                 <version>${spring.version}</version>
             </dependency>
 
-
-
+            <dependency>
+                <groupId>com.belerweb</groupId>
+                <artifactId>pinyin4j</artifactId>
+                <version>${pinyin4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.28</version>
+                <version>1.2.69</version>
             </dependency>
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
@@ -129,7 +129,7 @@
 
             <dependency>
                 <groupId>com.java110</groupId>
-                <artifactId>java110-common</artifactId>
+                <artifactId>java110-utils</artifactId>
                 <version>${microcommunity.version}</version>
             </dependency>
             <dependency>
@@ -138,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>
@@ -157,20 +152,11 @@
             </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>
@@ -200,9 +186,37 @@
             </dependency>
 
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.17</version>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-web</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <!-- 妗ユ帴锛氬憡璇塖lf4j浣跨敤Log4j2 -->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <!-- 妗ユ帴锛氬憡璇塩ommons logging浣跨敤Log4j2 -->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-jcl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>log4j-over-slf4j</artifactId>
+                <version>1.7.30</version>
             </dependency>
 
             <!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
@@ -218,6 +232,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>
@@ -285,7 +304,7 @@
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
-                <version>1.9.3</version>
+                <version>1.9.4</version>
             </dependency>
 
 
@@ -318,17 +337,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>
@@ -336,30 +344,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>
@@ -374,15 +358,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>
@@ -433,16 +412,22 @@
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>aliyun-java-sdk-core</artifactId>
-                <version>4.0.3</version>
+                <version>4.4.6</version>
             </dependency>
 
-            <!--flowable宸ヤ綔娴佷緷璧�-->
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-ecs</artifactId>
+                <version>4.17.6</version>
+            </dependency>
+
+            <!--flowable宸ヤ綔娴佷緷璧�
             <dependency>
                 <groupId>org.flowable</groupId>
                 <artifactId>flowable-spring-boot-starter</artifactId>
                 <version>6.4.1</version>
             </dependency>
-
+            -->
             <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
             <dependency>
                 <groupId>org.jsoup</groupId>
@@ -450,6 +435,62 @@
                 <version>1.11.3</version>
             </dependency>
 
+            <!-- 寮曞叆poi锛岃В鏋恮orkbook瑙嗗浘 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>3.17</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml-schemas</artifactId>
+                <version>3.17</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>3.17</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.activiti</groupId>
+                <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>
+                <artifactId>tencentcloud-sdk-java</artifactId>
+                <!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
+                <!-- 璇峰埌https://search.maven.org/search?q=tencentcloud-sdk-java鏌ヨ鏈�鏂扮増鏈� -->
+                <version>3.0.112</version>
+            </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>
         </dependencies>
 
     </dependencyManagement>
@@ -458,7 +499,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -487,9 +527,8 @@
     <build>
         <plugins>
             <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -498,7 +537,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