summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4457208)
Issue-Id: MSB-76
Change-Id: I14665c50b6c8994589e5e5671a85c263194946a9
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
release/
.vagrant
/archives/
release/
.vagrant
/archives/
private static final long serialVersionUID = 1L;
// 服务名
@ApiModelProperty(example = "test", required = true)
private static final long serialVersionUID = 1L;
// 服务名
@ApiModelProperty(example = "test", required = true)
- private String serviceName;
+ private String serviceName = "";
// 版本号
@ApiModelProperty(example = "v1", required = true)
private String version = "";
// 版本号
@ApiModelProperty(example = "v1", required = true)
private String version = "";
@ApiModelProperty(hidden = true)
private String path = "";
@ApiModelProperty(hidden = true)
private String path = "";
+ @ApiModelProperty(value = "enable ssl", allowableValues = "true,false", example = "false")
+ private boolean enable_ssl = false; // true:https:开启SSL加密, false:http
@ApiModelProperty(required = true)
@ApiModelProperty(required = true)
public void setNetwork_plane_type(String network_plane_type) {
this.network_plane_type = network_plane_type;
}
public void setNetwork_plane_type(String network_plane_type) {
this.network_plane_type = network_plane_type;
}
+
+ public boolean isEnable_ssl() {
+ return enable_ssl;
+ }
+
+ public void setEnable_ssl(boolean enable_ssl) {
+ this.enable_ssl = enable_ssl;
+ }
required = false) @QueryParam("createOrUpdate") @DefaultValue("true") boolean createOrUpdate,
@ApiParam(value = "is_manual",
required = false) @QueryParam("is_manual") @DefaultValue("false") boolean is_manual) {
required = false) @QueryParam("createOrUpdate") @DefaultValue("true") boolean createOrUpdate,
@ApiParam(value = "is_manual",
required = false) @QueryParam("is_manual") @DefaultValue("false") boolean is_manual) {
+ LOGGER.error("**** json string:" + microServiceInfo);
String ip = DiscoverUtil.getRealIp(request);
try {
String ip = DiscoverUtil.getRealIp(request);
try {
String ms_url = "", ms_version = "", ms_protocol = "", ms_status = "", ms_publish_port = "",
ms_is_manual = "", ms_visualRange = "1", ms_network_plane_type = "", ms_lb_policy = "",
String ms_url = "", ms_version = "", ms_protocol = "", ms_status = "", ms_publish_port = "",
ms_is_manual = "", ms_visualRange = "1", ms_network_plane_type = "", ms_lb_policy = "",
- ms_host = "", ms_path = "";
+ ms_host = "", ms_path = "", ms_enable_ssl = "";
List<KeyVaulePair> ms_metadata = new ArrayList<KeyVaulePair>();
List<String> nodeLabels = new ArrayList<String>();
List<KeyVaulePair> ms_metadata = new ArrayList<KeyVaulePair>();
List<String> nodeLabels = new ArrayList<String>();
ms_protocol = (baseMap.get("protocol") == null ? "" : baseMap.get("protocol"));
ms_status = (baseMap.get("status") == null ? "1" : baseMap.get("status"));
ms_protocol = (baseMap.get("protocol") == null ? "" : baseMap.get("protocol"));
ms_status = (baseMap.get("status") == null ? "1" : baseMap.get("status"));
+ if (baseMap.get("enable_ssl") != null) {
+ ms_enable_ssl = (baseMap.get("enable_ssl"));
+ }
if (baseMap.get("publish_port") != null) {
ms_publish_port = (baseMap.get("publish_port"));
}
if (baseMap.get("is_manual") != null) {
ms_is_manual = baseMap.get("is_manual");
if (baseMap.get("publish_port") != null) {
ms_publish_port = (baseMap.get("publish_port"));
}
if (baseMap.get("is_manual") != null) {
ms_is_manual = baseMap.get("is_manual");
}
if (baseMap.get("ha_role") != null) {
}
if (baseMap.get("ha_role") != null) {
microServiceInfo.setNamespace(namespace);
microServiceInfo.setHost(ms_host);
microServiceInfo.setPath(ms_path);
microServiceInfo.setNamespace(namespace);
microServiceInfo.setHost(ms_host);
microServiceInfo.setPath(ms_path);
+ microServiceInfo.setEnable_ssl(Boolean.parseBoolean(ms_enable_ssl));
baseMap.put("status", "1");
baseMap.put("is_manual", Boolean.toString(is_manual));
baseMap.put("status", "1");
baseMap.put("is_manual", Boolean.toString(is_manual));
+ baseMap.put("enable_ssl", Boolean.toString(microServiceInfo.isEnable_ssl()));
// TCP和UDP协议保存 nginx端口和负载均衡策略
if (StringUtils.isNotBlank(microServiceInfo.getPublish_port())) {
// TCP和UDP协议保存 nginx端口和负载均衡策略
if (StringUtils.isNotBlank(microServiceInfo.getPublish_port())) {
String ms_url = "", ms_version = "", ms_protocol = "", ms_status = "", ms_publish_port = "",
ms_is_manual = "", ms_visualRange = "1", ms_network_plane_type = "", ms_lb_policy = "",
String ms_url = "", ms_version = "", ms_protocol = "", ms_status = "", ms_publish_port = "",
ms_is_manual = "", ms_visualRange = "1", ms_network_plane_type = "", ms_lb_policy = "",
- ms_host = "", ms_path = "";
+ ms_host = "", ms_path = "", ms_enable_ssl = "";
List<KeyVaulePair> ms_metadata = new ArrayList<KeyVaulePair>();
List<String> nodeLabels = new ArrayList<String>();
List<KeyVaulePair> ms_metadata = new ArrayList<KeyVaulePair>();
List<String> nodeLabels = new ArrayList<String>();
ms_path = baseMap.get("path");
}
ms_path = baseMap.get("path");
}
+ if (baseMap.get("enable_ssl") != null) {
+ ms_publish_port = (baseMap.get("enable_ssl"));
+ }
+
microServiceInfo.setLb_policy(ms_lb_policy);
microServiceInfo.setHost(ms_host);
microServiceInfo.setPath(ms_path);
microServiceInfo.setLb_policy(ms_lb_policy);
microServiceInfo.setHost(ms_host);
microServiceInfo.setPath(ms_path);
+ microServiceInfo.setEnable_ssl(Boolean.parseBoolean(ms_enable_ssl));
microServiceInfo.setMetadata(ms_metadata);
microServiceInfo.setNamespace(namespace);
microServiceInfo.setMetadata(ms_metadata);
microServiceInfo.setNamespace(namespace);