zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-09 04:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/leng_dev' into leng_dev

Browse Source
This commit is contained in:
冷冷 committed 2018-08-16 00:40:20 +08:00
2 parents 64f8e648ed a5a73fd064
commit 9a56d25a92
6 files changed
+2 -155
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-core/pom.xml
-1
View File
@@ -50,7 +50,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<!--jacksonJSR310规范-->
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/MqQueueConstant.java
-57
View File
@@ -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";
}
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannel.java
-45
View File
@@ -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;
}
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumSmsChannelTemplate.java
-50
View File
@@ -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;
}
pigx-common/pigx-common-swagger/pom.xml
-1
View File
@@ -45,7 +45,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<!--swagger 依赖-->
pom.xml
+2 -1
View File
@@ -44,7 +44,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<monitor.version>2.0.1</monitor.version>
<hutool.version>4.1.4</hutool.version>
<hutool.version>4.1.7</hutool.version>
<mbp.boot.version>2.3</mbp.boot.version>
<kaptcha.version>0.0.9</kaptcha.version>
<swagger.version>2.9.2</swagger.version>
@@ -87,6 +87,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<!--测试依赖-->
<dependency>