From f80bf47bec9812766afd0d53be611dc130718c7f Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Wed, 12 Aug 2020 14:36:15 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E6=9B=B4=E6=96=B0pom?=
 =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6=EF=BC=8C=E7=A7=BB=E9=99=A4tomcat?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8undertow=202.=20=E5=88=A0=E9=99=A4Sw?=
 =?UTF-8?q?agger2=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 60 ++++++-------------
 .../com/dispose/swagger/Swagger2Config.java   | 53 ----------------
 2 files changed, 19 insertions(+), 94 deletions(-)
 delete mode 100644 src/main/java/com/dispose/swagger/Swagger2Config.java

diff --git a/pom.xml b/pom.xml
index bd6a0be8..52115273 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.cmcc.hy</groupId>
-        <artifactId>phoenix-boot</artifactId>
-        <version>0.0.4</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.9.RELEASE</version>
+<!--        <groupId>com.cmcc.hy</groupId>-->
+<!--        <artifactId>phoenix-boot</artifactId>-->
+<!--        <version>0.0.4</version>-->
         <relativePath/>
     </parent>
     <groupId>com.dispose</groupId>
@@ -15,6 +18,9 @@
     <name>phoenix_ddos_handle</name>
     <description>Demo project for Spring Boot</description>
     <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Greenwich.SR3</spring-cloud.version>
+        <undertow.version>2.1.3.Final</undertow.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -38,18 +44,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>tomcat-annotations-api</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>9.0.31</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
@@ -68,15 +62,17 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.58</version>
+            <version>1.2.73</version>
         </dependency>
         <dependency>
             <groupId>net.sf.json-lib</groupId>
@@ -89,12 +85,12 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.21</version>
         </dependency>
         <!--mybatis -->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -117,15 +113,13 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
+            <version>2.6</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
         </dependency>
 
         <dependency>
@@ -135,46 +129,30 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
+            <version>5.3.10</version>
         </dependency>
         <!-- 通用Mapper -->
         <dependency>
             <groupId>tk.mybatis</groupId>
             <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
         </dependency>
 
         <!-- 分页助手 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>com.cmcc</groupId>
             <artifactId>enc.dec</artifactId>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.protostuff</groupId>
-            <artifactId>protostuff-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.protostuff</groupId>
-            <artifactId>protostuff-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
diff --git a/src/main/java/com/dispose/swagger/Swagger2Config.java b/src/main/java/com/dispose/swagger/Swagger2Config.java
deleted file mode 100644
index 3e43b7e2..00000000
--- a/src/main/java/com/dispose/swagger/Swagger2Config.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.dispose.swagger;
-
-import com.dispose.config.MyConfig;
-import com.google.common.base.Predicates;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-
-/**
- * The type Swagger 2 config.
- *
- * @author <huangxin@cmhi.chinamoblie.com>
- */
-@Configuration
-@EnableSwagger2
-public class Swagger2Config {
-
-    @Resource
-    private MyConfig myConfig;
-
-    /**
-     * Api docket.
-     *
-     * @return the docket
-     */
-    @Bean
-    public Docket api() {
-        return new Docket(DocumentationType.SWAGGER_2).enable(Boolean.parseBoolean(myConfig.getSwaggerSwitch()))
-                    .select().apis(RequestHandlerSelectors.any()).paths(PathSelectors.any())
-                    // 错误路径不监控
-                    .paths(Predicates.not(PathSelectors.regex("/error.*")))
-                    // 对根下所有路径进行监控
-                    .paths(PathSelectors.regex("/.*"))
-                    .build().apiInfo(apiInfo());
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfo(
-                    "phoenix脚手架工程API示例", "展示所有API信息，方便测试", "API V1.0", "xxx", new Contact("phoenix",
-                    "http://git.komect.net/WLFHCZ/phoenix_share_framework.git", "phoenix@cmhi.chinamobile.com"),
-                    "CMCC.HY", "", Collections.emptyList());
-    }
-
-}