diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js index d2eac6da..204c5c01 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js @@ -47,7 +47,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia $scope.editRule = function (rule) { $scope.currentRule = angular.copy(rule); $scope.degradeRuleDialog = { - title: '编辑降级规则', + title: '编辑熔断规则', type: 'edit', confirmBtnText: '保存' }; @@ -71,7 +71,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia statIntervalMs: 1000, }; $scope.degradeRuleDialog = { - title: '新增降级规则', + title: '新增熔断规则', type: 'add', confirmBtnText: '新增' }; @@ -111,11 +111,11 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia $scope.deleteRule = function (rule) { $scope.currentRule = rule; $scope.confirmDialog = { - title: '删除降级规则', + title: '删除熔断规则', type: 'delete_rule', - attentionTitle: '请确认是否删除如下降级规则', + attentionTitle: '请确认是否删除如下熔断规则', attention: '资源名: ' + rule.resource + - ', 降级模式: ' + parseDegradeMode(rule.grade) + ', 阈值: ' + rule.count, + ', 熔断策略: ' + parseDegradeMode(rule.grade) + ', 阈值: ' + rule.count, confirmBtnText: '删除', }; confirmDialog = ngDialog.open({ @@ -173,7 +173,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia function queryAppMachines() { MachineService.getAppMachines($scope.app).success( function (data) { - if (data.code == 0) { + if (data.code === 0) { // $scope.machines = data.data; if (data.data) { $scope.machines = []; diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js index 2a14eb1e..cc583428 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js @@ -140,7 +140,7 @@ app.controller('IdentityCtl', ['$scope', '$stateParams', 'IdentityService', }; degradeRuleDialogScope.degradeRuleDialog = { - title: '新增降级规则', + title: '新增熔断规则', type: 'add', confirmBtnText: '新增', saveAndContinueBtnText: '新增并继续添加' diff --git a/sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html b/sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html index a7212629..40f68d3a 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html +++ b/sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html @@ -60,7 +60,7 @@
  • -   降级规则 +   熔断规则
  • diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html b/sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html index c2b67528..9d0c817c 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html +++ b/sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html @@ -4,7 +4,7 @@
    +   新增熔断规则
    @@ -15,7 +15,7 @@
    - 降级规则 + 熔断规则 @@ -34,7 +34,7 @@ 资源名 - 降级策略 + 熔断策略 阈值 diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html b/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html index e68fb6b4..957d2ce2 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html +++ b/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html @@ -27,7 +27,7 @@
     QPS   -  线程数 +  并发线程数
    diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html b/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html index 1dcf6e92..80e832d8 100755 --- a/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html +++ b/sentinel-dashboard/src/main/webapp/resources/app/views/identity.html @@ -43,7 +43,7 @@ 通过QPS 拒绝QPS - 线程数 + 并发数 平均RT 分钟通过 分钟拒绝 @@ -73,7 +73,7 @@ +  熔断