@@ -16,6 +16,7 @@ | |||||
package com.alibaba.csp.sentinel.dashboard.config; | package com.alibaba.csp.sentinel.dashboard.config; | ||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | ||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.NacosProperties; | |||||
import com.alibaba.csp.sentinel.datasource.Converter; | import com.alibaba.csp.sentinel.datasource.Converter; | ||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.alibaba.nacos.api.PropertyKeyConst; | import com.alibaba.nacos.api.PropertyKeyConst; | ||||
@@ -13,11 +13,11 @@ | |||||
* See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | ||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
package com.alibaba.csp.sentinel.dashboard.rule; | |||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||||
import com.alibaba.csp.sentinel.dashboard.common.NacosConstants; | import com.alibaba.csp.sentinel.dashboard.common.NacosConstants; | ||||
import com.alibaba.csp.sentinel.dashboard.config.NacosProperties; | |||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | ||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; | |||||
import com.alibaba.csp.sentinel.datasource.Converter; | import com.alibaba.csp.sentinel.datasource.Converter; | ||||
import com.alibaba.nacos.api.config.ConfigService; | import com.alibaba.nacos.api.config.ConfigService; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,11 +13,11 @@ | |||||
* See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | ||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
package com.alibaba.csp.sentinel.dashboard.rule; | |||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||||
import com.alibaba.csp.sentinel.dashboard.common.NacosConstants; | import com.alibaba.csp.sentinel.dashboard.common.NacosConstants; | ||||
import com.alibaba.csp.sentinel.dashboard.config.NacosProperties; | |||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | ||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; | |||||
import com.alibaba.csp.sentinel.datasource.Converter; | import com.alibaba.csp.sentinel.datasource.Converter; | ||||
import com.alibaba.csp.sentinel.util.AssertUtil; | import com.alibaba.csp.sentinel.util.AssertUtil; | ||||
import com.alibaba.nacos.api.config.ConfigService; | import com.alibaba.nacos.api.config.ConfigService; |
@@ -13,7 +13,7 @@ | |||||
* See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | ||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
package com.alibaba.csp.sentinel.dashboard.config; | |||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||||
import org.springframework.boot.context.properties.ConfigurationProperties; | import org.springframework.boot.context.properties.ConfigurationProperties; | ||||
@@ -15,13 +15,12 @@ | |||||
首页</a> | 首页</a> | ||||
</li> | </li> | ||||
<!-- li ng-class="{active: true}" ng-repeat="entry in apps | filter: { app: searchApp }">{{dropDown}} | |||||
<li ng-class="{active: true}" ng-repeat="entry in apps | filter: { app: searchApp }">{{dropDown}} | |||||
<a href="javascript:void(0);" ng-click="click($event)" collapse="{{collpaseall == 1}}" style="font-size: 16px;word-break: break-word;"> | <a href="javascript:void(0);" ng-click="click($event)" collapse="{{collpaseall == 1}}" style="font-size: 16px;word-break: break-word;"> | ||||
{{entry.app}} | {{entry.app}} | ||||
<span class="fa arrow"></span> | <span class="fa arrow"></span> | ||||
<span class="arrow">({{entry.healthyCount}}/{{entry.machines.length}})</span> | <span class="arrow">({{entry.healthyCount}}/{{entry.machines.length}})</span> | ||||
</a --> | |||||
<li ng-class="glyphicon-dashboard" ng-repeat="entry in apps | filter: { app: searchApp }"> | |||||
</a> | |||||
sentinel_dashboard | sentinel_dashboard | ||||
<!--<ul class="nav nav-second-level" collapse="{{entry.active}}" style="display: none;">--> | <!--<ul class="nav nav-second-level" collapse="{{entry.active}}" style="display: none;">--> | ||||
<ul class="nav nav-second-level" ng-show="entry.active"> | <ul class="nav nav-second-level" ng-show="entry.active"> | ||||