Signed-off-by: Eric Zhao <sczyh16@gmail.com>master
@@ -239,7 +239,7 @@ public class ParamFlowRuleController { | |||||
} | } | ||||
private <R> Result<R> unsupportedVersion() { | private <R> Result<R> unsupportedVersion() { | ||||
return Result.ofFail(4041, "Sentinel client version not supported for parameter flow control"); | |||||
return Result.ofFail(4041, "Sentinel client not supported for parameter flow control (unsupported version or dependency absent)"); | |||||
} | } | ||||
private final SentinelVersion version020 = new SentinelVersion().setMinorVersion(2); | private final SentinelVersion version020 = new SentinelVersion().setMinorVersion(2); | ||||
@@ -38,7 +38,7 @@ | |||||
<div ng-if="!flowRuleDialog.showAdvanceButton"> | <div ng-if="!flowRuleDialog.showAdvanceButton"> | ||||
<div class="form-group"> | <div class="form-group"> | ||||
<label class="col-sm-2 control-label">流控模式</label> | |||||
<label class="col-sm-2 control-label" title="调用关系流控模式">流控模式</label> | |||||
<div class="col-sm-9"> | <div class="col-sm-9"> | ||||
<div class="form-control highlight-border" align="center"> | <div class="form-control highlight-border" align="center"> | ||||
<input type="radio" name="strategy" value="0" ng-model='currentRule.strategy' /> 直接 | <input type="radio" name="strategy" value="0" ng-model='currentRule.strategy' /> 直接 | ||||
@@ -63,7 +63,7 @@ | |||||
</div> | </div> | ||||
<div ng-if="currentRule.grade==1 && !flowRuleDialog.showAdvanceButton"> | <div ng-if="currentRule.grade==1 && !flowRuleDialog.showAdvanceButton"> | ||||
<div class="form-group"> | <div class="form-group"> | ||||
<label class="col-sm-2 control-label">流控方式</label> | |||||
<label class="col-sm-2 control-label">流控效果</label> | |||||
<div class="col-sm-9"> | <div class="col-sm-9"> | ||||
<div class="form-control highlight-border" align="center"> | <div class="form-control highlight-border" align="center"> | ||||
<input type="radio" name="controlBehavior" value="0" checked ng-model='currentRule.controlBehavior' /> 快速失败 | <input type="radio" name="controlBehavior" value="0" checked ng-model='currentRule.controlBehavior' /> 快速失败 | ||||
@@ -46,7 +46,7 @@ | |||||
单机阈值 | 单机阈值 | ||||
</td> | </td> | ||||
<td style="width: 10%;"> | <td style="width: 10%;"> | ||||
流控方式 | |||||
流控效果 | |||||
</td> | </td> | ||||
<!--<td style="width: 8%;">--> | <!--<td style="width: 8%;">--> | ||||
<!--状态--> | <!--状态--> | ||||
@@ -15,9 +15,9 @@ | |||||
<i class="fa fa-sort-amount-desc" aria-hidden="true" ng-show="isDescOrder"></i> | <i class="fa fa-sort-amount-desc" aria-hidden="true" ng-show="isDescOrder"></i> | ||||
{{metricTypeDesc}} 实时监控 | {{metricTypeDesc}} 实时监控 | ||||
</span> | </span> | ||||
<button class="btn btn-danger" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setDescOrder()" | |||||
<button class="btn btn-outline-primary" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setDescOrder()" | |||||
ng-if="!isDescOrder">降序</button> | ng-if="!isDescOrder">降序</button> | ||||
<button class="btn btn-danger" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setAscOrder()" | |||||
<button class="btn btn-outline-primary" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setAscOrder()" | |||||
ng-if="isDescOrder">升序</button> | ng-if="isDescOrder">升序</button> | ||||
<input class="form-control witdh-200" placeholder="关键字" ng-model="serviceQuery" ng-change="searchService()" style="margin-right: 20px;"> | <input class="form-control witdh-200" placeholder="关键字" ng-model="serviceQuery" ng-change="searchService()" style="margin-right: 20px;"> | ||||