From 4192ca8ff189d338b5a512b0f74a8b414b0f95e7 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 3 Aug 2018 22:07:30 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=20=E7=A7=BB=E9=99=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=88=96=E6=96=87=E4=BB=B6,=E7=B2=BE=E7=AE=80=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-core/pom.xml | 6 -- .../main/resources/META-INF/spring.provides | 2 +- .../pigx/admin/api/dto/RouteConfig.java | 58 ------------------- pom.xml | 5 +- 4 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RouteConfig.java diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index b53f71804..4c33f512b 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -41,12 +41,6 @@ hutool-all ${hutool.version} - - - com.alibaba - fastjson - ${fastjson.version} - org.springframework.boot diff --git a/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.provides b/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.provides index 934bb2d25..c94a9d9f0 100644 --- a/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.provides +++ b/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: hutool-all, spring-cloud-starter-openfeign, feign-okhttp, fastjson, spring-boot-starter-data-redis, jackson-datatype-jsr310 +provides: hutool-all, spring-cloud-starter-openfeign, feign-okhttp, spring-boot-starter-data-redis, jackson-datatype-jsr310 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RouteConfig.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RouteConfig.java deleted file mode 100644 index 67d7bc0bf..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RouteConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pigx.admin.api.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Map; - -/** - * @author lengleng - * @date 2017/11/7 - */ -@Data -public class RouteConfig implements Serializable { - - @com.alibaba.fastjson.annotation.JSONField(name = "path") - private String path; - @com.alibaba.fastjson.annotation.JSONField(name = "component") - private String component; - @com.alibaba.fastjson.annotation.JSONField(name = "name") - private String name; - @com.alibaba.fastjson.annotation.JSONField(name = "components") - private String components; - @com.alibaba.fastjson.annotation.JSONField(name = "redirect") - private String redirect; - @com.alibaba.fastjson.annotation.JSONField(name = "props") - private String props; - @com.alibaba.fastjson.annotation.JSONField(name = "alias") - private String alias; - @com.alibaba.fastjson.annotation.JSONField(name = "children") - private String children; - @com.alibaba.fastjson.annotation.JSONField(name = "beforeEnter") - private String beforeEnter; - @com.alibaba.fastjson.annotation.JSONField(name = "meta") - private Map meta; - @com.alibaba.fastjson.annotation.JSONField(name = "caseSensitive") - private Boolean caseSensitive; - @com.alibaba.fastjson.annotation.JSONField(name = "pathToRegexpOptions") - private String pathToRegexpOptions; -} diff --git a/pom.xml b/pom.xml index 26f4d6fa5..b133e8250 100644 --- a/pom.xml +++ b/pom.xml @@ -43,11 +43,9 @@ UTF-8 1.8 1.8 - 1.16.20 2.0.1 - 4.0.4 + 4.1.4 2.3 - 1.2.47 0.0.9 2.9.2 2.0.0 @@ -88,7 +86,6 @@ org.projectlombok lombok - ${lombok.version}