From a5a73fd064ad6f132acb9c14f8554124e2810597 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 15 Aug 2018 18:18:42 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-core/pom.xml | 1 - .../common/core/constant/MqQueueConstant.java | 57 ------------------- .../core/constant/enums/EnumSmsChannel.java | 45 --------------- .../enums/EnumSmsChannelTemplate.java | 50 ---------------- pigx-common/pigx-common-swagger/pom.xml | 1 - pom.xml | 3 +- 6 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/MqQueueConstant.java delete mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannel.java delete mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannelTemplate.java diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 4c33f512b..81c112062 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -50,7 +50,6 @@ javax.servlet javax.servlet-api - ${servlet-api.version} provided diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/MqQueueConstant.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/MqQueueConstant.java deleted file mode 100644 index 901b497ad..000000000 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/MqQueueConstant.java +++ /dev/null @@ -1,57 +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.common.core.constant; - -/** - * @author lengleng - * @date 2018/1/15 - * MQ 消息队列 - */ -public interface MqQueueConstant { - /** - * log rabbit队列名称 - */ - String LOG_QUEUE = "log"; - - /** - * 发送短信验证码队列 - */ - String MOBILE_CODE_QUEUE = "mobile_code_queue"; - - /** - * 短信服务状态队列 - */ - String MOBILE_SERVICE_STATUS_CHANGE = "mobile_service_status_change"; - - /** - * 钉钉服务状态队列 - */ - String DINGTALK_SERVICE_STATUS_CHANGE = "dingtalk_service_status_change"; - - /** - * zipkin 队列 - */ - String ZIPKIN_NAME_QUEUE = "zipkin"; - - /** - * 路由配置状态队列 - */ - String ROUTE_CONFIG_CHANGE = "route_config_change"; -} diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannel.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannel.java deleted file mode 100644 index a77c77b4a..000000000 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannel.java +++ /dev/null @@ -1,45 +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.common.core.constant.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author lengleng - * @date 2018/1/16 - * 短信通道枚举 - */ -@Getter -@AllArgsConstructor -public enum EnumSmsChannel { - /** - * 阿里大鱼短信通道 - */ - ALIYUN("ALIYUN_SMS", "阿里大鱼"); - /** - * 通道名称 - */ - private final String name; - /** - * 通道描述 - */ - private final String description; -} diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannelTemplate.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannelTemplate.java deleted file mode 100644 index cd767d9ed..000000000 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannelTemplate.java +++ /dev/null @@ -1,50 +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.common.core.constant.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author LiXunHuan - * @date 2018/1/16 - * 短信通道模板 - */ -@Getter -@AllArgsConstructor -public enum EnumSmsChannelTemplate { - /** - * 登录验证 - */ - LOGIN_NAME_LOGIN("loginCodeChannel", "登录验证"), - /** - * 服务异常提醒 - */ - SERVICE_STATUS_CHANGE("serviceStatusChange", "Pig4Cloud"); - - /** - * 模板名称 - */ - private final String template; - /** - * 模板签名 - */ - private final String signName; -} diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 1b7e63a15..89fdff780 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -45,7 +45,6 @@ javax.servlet javax.servlet-api - ${servlet-api.version} provided diff --git a/pom.xml b/pom.xml index 79d7ca212..1bbff72d2 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 1.8 1.8 2.0.1 - 4.1.4 + 4.1.7 2.3 0.0.9 2.9.2 @@ -87,6 +87,7 @@ org.projectlombok lombok + provided