diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index f14ae37..d086299 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -125,6 +125,7 @@ public class BlockSoftSwitchEnumUtil { SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), SERVER_WEB_SERVICE_RECORDING_XML(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240004,"记录请求Body"), + SERVER_WEB_SERVICE_CALL_RESTFUL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240005,"转换WebService请求 调用Restful请求"), // CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"), @@ -700,6 +701,41 @@ public class BlockSoftSwitchEnumUtil { } /** + * webservice调用请求方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WEBSERVICE_REQUEST_METHOD{ + POST(1,"POST"), + PUT(2,"PUT"); + + private int value; + private String description; + + WEBSERVICE_REQUEST_METHOD(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * ftp传输编码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java index 21f56a3..ab85b8f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.util; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; /** @@ -308,4 +309,30 @@ public interface BaseRedis { */ void removeList(String key,long count,Object value); + /** + * 根据key获取不同redis的信息,key 可选参数如下: + * server: 有关Redis服务器的常规信息 + * clients: 客户端连接部分 + * memory: 内存消耗相关信息 + * persistence: RDB和AOF相关信息 + * stats: 一般统计 + * replication: 主、副本复制信息 + * cpu: cpu消耗统计信息 + * commandstats: redis命令统计 + * cluster: "Redis集群“ 信息 + * keyspace : 与数据库相关的统计信息 + * @param key + * @return + */ + Properties getRedisConnectionInfo(String key); + + /** + * 获取key的类型 + * NONE("none"), STRING("string"), LIST("list"), SET("set"), ZSET("zset"), HASH("hash"), + * @since 2.2 + * STREAM("stream"); + * @param key + * @return + */ + String getKeyType(String key); } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java index 37a8e11..0ddb778 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -44,4 +44,7 @@ public class BsSuitCaseWebService extends BaseBean { @ApiParam(value = "Service Function Name(方法名称)") private String serviceFunctionName; + @Column(name = "CALL_RESTFUL_URL") + @ApiParam(value = "CALL RESTFUL URL(调用restful接口的地址)") + private String callRestfulUrl; }