Signed-off-by: Carpenter Lee <hooleeucas@163.com>master
@@ -120,7 +120,7 @@ | |||
<artifactId>spring-boot-maven-plugin</artifactId> | |||
<configuration> | |||
<fork>true</fork> | |||
<mainClass>com.taobao.csp.sentinel.dashboard.DashboardApplication</mainClass> | |||
<mainClass>com.alibaba.csp.sentinel.dashboard.DashboardApplication</mainClass> | |||
</configuration> | |||
<executions> | |||
<execution> | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard; | |||
package com.alibaba.csp.sentinel.dashboard; | |||
import com.alibaba.csp.sentinel.init.InitExecutor; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.client; | |||
package com.alibaba.csp.sentinel.dashboard.client; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.client; | |||
package com.alibaba.csp.sentinel.dashboard.client; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.client; | |||
package com.alibaba.csp.sentinel.dashboard.client; | |||
import java.io.UnsupportedEncodingException; | |||
import java.net.URI; | |||
@@ -32,6 +32,7 @@ import java.util.stream.Collectors; | |||
import com.alibaba.csp.sentinel.command.CommandConstants; | |||
import com.alibaba.csp.sentinel.config.SentinelConfig; | |||
import com.alibaba.csp.sentinel.command.vo.NodeVo; | |||
import com.alibaba.csp.sentinel.dashboard.util.AsyncUtils; | |||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule; | |||
import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; | |||
import com.alibaba.csp.sentinel.slots.system.SystemRule; | |||
@@ -39,18 +40,18 @@ import com.alibaba.csp.sentinel.util.AssertUtil; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.alibaba.fastjson.JSON; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterStateSimpleEntity; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.taobao.csp.sentinel.dashboard.util.RuleUtils; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterStateSimpleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.alibaba.csp.sentinel.dashboard.util.RuleUtils; | |||
import org.apache.http.HttpResponse; | |||
import org.apache.http.client.methods.HttpGet; | |||
import org.apache.http.client.utils.URIBuilder; | |||
@@ -65,8 +66,6 @@ import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.stereotype.Component; | |||
import static com.taobao.csp.sentinel.dashboard.util.AsyncUtils.*; | |||
/** | |||
* Communicate with Sentinel client. | |||
* | |||
@@ -327,7 +326,7 @@ public class SentinelApiClient { | |||
); | |||
} catch (Exception e) { | |||
logger.error("Error when fetching parameter flow rules", e); | |||
return newFailedFuture(e); | |||
return AsyncUtils.newFailedFuture(e); | |||
} | |||
} | |||
@@ -482,7 +481,7 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
String data = JSON.toJSONString( | |||
@@ -499,12 +498,12 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} else { | |||
logger.warn("Push parameter flow rules to client failed: " + e); | |||
return newFailedFuture(new RuntimeException(e)); | |||
return AsyncUtils.newFailedFuture(new RuntimeException(e)); | |||
} | |||
}); | |||
} catch (Exception ex) { | |||
logger.warn("Error when setting parameter flow rule", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
@@ -512,7 +511,7 @@ public class SentinelApiClient { | |||
public CompletableFuture<ClusterStateSimpleEntity> fetchClusterMode(String app, String ip, int port) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -522,13 +521,13 @@ public class SentinelApiClient { | |||
.thenApply(r -> JSON.parseObject(r, ClusterStateSimpleEntity.class)); | |||
} catch (Exception ex) { | |||
logger.warn("Error when fetching cluster mode", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<Void> modifyClusterMode(String app, String ip, int port, int mode) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -541,18 +540,18 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} else { | |||
logger.warn("Error when modifying cluster mode: " + e); | |||
return newFailedFuture(new RuntimeException(e)); | |||
return AsyncUtils.newFailedFuture(new RuntimeException(e)); | |||
} | |||
}); | |||
} catch (Exception ex) { | |||
logger.warn("Error when modifying cluster mode", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<ClusterClientInfoVO> fetchClusterClientInfoAndConfig(String app, String ip, int port) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -562,13 +561,13 @@ public class SentinelApiClient { | |||
.thenApply(r -> JSON.parseObject(r, ClusterClientInfoVO.class)); | |||
} catch (Exception ex) { | |||
logger.warn("Error when fetching cluster client config", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<Void> modifyClusterClientConfig(String app, String ip, int port, ClusterClientConfig config) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -581,18 +580,18 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} else { | |||
logger.warn("Error when modifying cluster client config: " + e); | |||
return newFailedFuture(new RuntimeException(e)); | |||
return AsyncUtils.newFailedFuture(new RuntimeException(e)); | |||
} | |||
}); | |||
} catch (Exception ex) { | |||
logger.warn("Error when modifying cluster client config", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<Void> modifyClusterServerFlowConfig(String app, String ip, int port, ServerFlowConfig config) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -605,18 +604,18 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} else { | |||
logger.warn("Error when modifying cluster server flow config: " + e); | |||
return newFailedFuture(new RuntimeException(e)); | |||
return AsyncUtils.newFailedFuture(new RuntimeException(e)); | |||
} | |||
}); | |||
} catch (Exception ex) { | |||
logger.warn("Error when modifying cluster server flow config", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<Void> modifyClusterServerTransportConfig(String app, String ip, int port, ServerTransportConfig config) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -630,18 +629,18 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} else { | |||
logger.warn("Error when modifying cluster server transport config: " + e); | |||
return newFailedFuture(new RuntimeException(e)); | |||
return AsyncUtils.newFailedFuture(new RuntimeException(e)); | |||
} | |||
}); | |||
} catch (Exception ex) { | |||
logger.warn("Error when modifying cluster server transport config", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<Void> modifyClusterServerNamespaceSet(String app, String ip, int port, Set<String> set) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -654,18 +653,18 @@ public class SentinelApiClient { | |||
return CompletableFuture.completedFuture(null); | |||
} else { | |||
logger.warn("Error when modifying cluster server NamespaceSet: " + e); | |||
return newFailedFuture(new RuntimeException(e)); | |||
return AsyncUtils.newFailedFuture(new RuntimeException(e)); | |||
} | |||
}); | |||
} catch (Exception ex) { | |||
logger.warn("Error when modifying cluster server NamespaceSet", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
public CompletableFuture<ClusterServerStateVO> fetchClusterServerBasicInfo(String app, String ip, int port) { | |||
if (StringUtil.isBlank(ip) || port <= 0) { | |||
return newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); | |||
} | |||
try { | |||
URIBuilder uriBuilder = new URIBuilder(); | |||
@@ -675,7 +674,7 @@ public class SentinelApiClient { | |||
.thenApply(r -> JSON.parseObject(r, ClusterServerStateVO.class)); | |||
} catch (Exception ex) { | |||
logger.warn("Error when fetching cluster sever all config and basic info", ex); | |||
return newFailedFuture(ex); | |||
return AsyncUtils.newFailedFuture(ex); | |||
} | |||
} | |||
} |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.config; | |||
package com.alibaba.csp.sentinel.dashboard.config; | |||
import javax.servlet.Filter; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.ArrayList; | |||
import java.util.Collections; | |||
@@ -22,11 +22,11 @@ import java.util.List; | |||
import javax.servlet.http.HttpServletRequest; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.domain.vo.MachineInfoVo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.domain.vo.MachineInfoVo; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.http.MediaType; | |||
import org.springframework.stereotype.Controller; |
@@ -13,19 +13,19 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Date; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.slots.block.RuleConstant; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.repository.rule.RuleRepository; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,19 +13,19 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Date; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.slots.block.RuleConstant; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.repository.rule.InMemDegradeRuleStore; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemDegradeRuleStore; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Random; | |||
import java.util.concurrent.TimeUnit; |
@@ -13,18 +13,18 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Date; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,16 +13,16 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Date; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineDiscovery; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineDiscovery; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.ArrayList; | |||
import java.util.Collections; | |||
@@ -24,8 +24,8 @@ import java.util.Map; | |||
import java.util.TreeMap; | |||
import java.util.concurrent.ConcurrentHashMap; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.repository.metric.MetricsRepository; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.repository.metric.MetricsRepository; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
@@ -36,8 +36,8 @@ import org.springframework.web.bind.annotation.ResponseBody; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import com.taobao.csp.sentinel.dashboard.domain.vo.MetricVo; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.vo.MetricVo; | |||
/** | |||
* @author leyou |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Date; | |||
import java.util.List; | |||
@@ -21,18 +21,18 @@ import java.util.Optional; | |||
import java.util.concurrent.CompletableFuture; | |||
import java.util.concurrent.ExecutionException; | |||
import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.slots.block.RuleConstant; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.client.CommandNotFoundException; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.repository.rule.RuleRepository; | |||
import com.taobao.csp.sentinel.dashboard.util.VersionUtils; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; | |||
import com.alibaba.csp.sentinel.dashboard.util.VersionUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.List; | |||
import java.util.stream.Collectors; | |||
@@ -21,10 +21,10 @@ import java.util.stream.Collectors; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.alibaba.csp.sentinel.command.vo.NodeVo; | |||
import com.taobao.csp.sentinel.dashboard.domain.ResourceTreeNode; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.domain.vo.ResourceVo; | |||
import com.alibaba.csp.sentinel.dashboard.domain.ResourceTreeNode; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.domain.vo.ResourceVo; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,18 +13,18 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller; | |||
package com.alibaba.csp.sentinel.dashboard.controller; | |||
import java.util.Date; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.taobao.csp.sentinel.dashboard.repository.rule.InMemSystemRuleStore; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemSystemRuleStore; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,18 +13,18 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.controller.cluster; | |||
import java.util.Collections; | |||
import java.util.Set; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppFullAssignRequest; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppSingleServerAssignRequest; | |||
import com.taobao.csp.sentinel.dashboard.service.ClusterAssignService; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppFullAssignRequest; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppSingleServerAssignRequest; | |||
import com.alibaba.csp.sentinel.dashboard.service.ClusterAssignService; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,31 +13,31 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.controller.cluster; | |||
import java.util.List; | |||
import java.util.Optional; | |||
import java.util.concurrent.ExecutionException; | |||
import com.alibaba.csp.sentinel.cluster.ClusterStateManager; | |||
import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.alibaba.fastjson.JSON; | |||
import com.alibaba.fastjson.JSONObject; | |||
import com.taobao.csp.sentinel.dashboard.client.CommandNotFoundException; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterModifyRequest; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; | |||
import com.taobao.csp.sentinel.dashboard.service.ClusterConfigService; | |||
import com.taobao.csp.sentinel.dashboard.util.ClusterEntityUtils; | |||
import com.taobao.csp.sentinel.dashboard.util.VersionUtils; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterModifyRequest; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; | |||
import com.alibaba.csp.sentinel.dashboard.service.ClusterConfigService; | |||
import com.alibaba.csp.sentinel.dashboard.util.ClusterEntityUtils; | |||
import com.alibaba.csp.sentinel.dashboard.util.VersionUtils; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,18 +13,18 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.controller.v2; | |||
package com.alibaba.csp.sentinel.dashboard.controller.v2; | |||
import java.util.Date; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; | |||
import com.taobao.csp.sentinel.dashboard.rule.DynamicRuleProvider; | |||
import com.taobao.csp.sentinel.dashboard.rule.DynamicRulePublisher; | |||
import com.taobao.csp.sentinel.dashboard.domain.Result; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; | |||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; | |||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; | |||
import com.alibaba.csp.sentinel.dashboard.domain.Result; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,11 +13,11 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity; | |||
import java.util.Date; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo; | |||
/** | |||
* @author leyou |
@@ -13,11 +13,11 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity; | |||
import java.util.Date; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
/** | |||
* @author leyou |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule; | |||
import com.alibaba.csp.sentinel.util.AssertUtil; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import java.util.List; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; | |||
package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; | |||
import java.util.Date; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.discovery; | |||
package com.alibaba.csp.sentinel.dashboard.discovery; | |||
import java.util.HashSet; | |||
import java.util.Optional; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.discovery; | |||
package com.alibaba.csp.sentinel.dashboard.discovery; | |||
import java.util.List; | |||
import java.util.Set; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.discovery; | |||
package com.alibaba.csp.sentinel.dashboard.discovery; | |||
import java.util.List; | |||
import java.util.Set; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.discovery; | |||
package com.alibaba.csp.sentinel.dashboard.discovery; | |||
import java.util.Date; | |||
import java.util.Objects; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.discovery; | |||
package com.alibaba.csp.sentinel.dashboard.discovery; | |||
import java.util.ArrayList; | |||
import java.util.HashSet; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain; | |||
package com.alibaba.csp.sentinel.dashboard.domain; | |||
import java.util.ArrayList; | |||
import java.util.HashMap; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain; | |||
package com.alibaba.csp.sentinel.dashboard.domain; | |||
/** | |||
* @author leyou |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
import java.util.Set; | |||
@@ -13,12 +13,12 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
import java.util.List; | |||
import java.util.Set; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
/** | |||
* @author Eric Zhao |
@@ -13,11 +13,11 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
import java.util.Set; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
import java.util.HashSet; | |||
import java.util.Set; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster; | |||
import java.util.List; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.config; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.config; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.config; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.config; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.config; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.config; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.request; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; | |||
import java.util.Set; | |||
@@ -13,9 +13,9 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.request; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.request; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; | |||
/** | |||
* @author Eric Zhao |
@@ -13,12 +13,12 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.request; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; | |||
import java.util.Set; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
/** | |||
* @author Eric Zhao |
@@ -13,9 +13,9 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
/** | |||
* @author Eric Zhao |
@@ -13,14 +13,14 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
import java.util.List; | |||
import java.util.Set; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.cluster.state; | |||
package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; | |||
/** | |||
* @author Eric Zhao |
@@ -13,14 +13,14 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.vo; | |||
package com.alibaba.csp.sentinel.dashboard.domain.vo; | |||
import java.util.ArrayList; | |||
import java.util.Date; | |||
import java.util.List; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineDiscovery; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineDiscovery; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
/** | |||
* @author leyou |
@@ -13,13 +13,13 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.vo; | |||
package com.alibaba.csp.sentinel.dashboard.domain.vo; | |||
import java.util.ArrayList; | |||
import java.util.Collection; | |||
import java.util.List; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
/** | |||
* @author leyou |
@@ -13,14 +13,14 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.domain.vo; | |||
package com.alibaba.csp.sentinel.dashboard.domain.vo; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.command.vo.NodeVo; | |||
import com.taobao.csp.sentinel.dashboard.domain.ResourceTreeNode; | |||
import com.alibaba.csp.sentinel.dashboard.domain.ResourceTreeNode; | |||
/** | |||
* @author leyou |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.metric; | |||
package com.alibaba.csp.sentinel.dashboard.metric; | |||
import java.net.ConnectException; | |||
import java.net.SocketTimeoutException; | |||
@@ -36,14 +36,14 @@ import java.util.concurrent.atomic.AtomicLong; | |||
import com.alibaba.csp.sentinel.concurrent.NamedThreadFactory; | |||
import com.alibaba.csp.sentinel.config.SentinelConfig; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.node.metric.MetricNode; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.repository.metric.MetricsRepository; | |||
import com.taobao.csp.sentinel.dashboard.util.MachineUtils; | |||
import com.alibaba.csp.sentinel.dashboard.repository.metric.MetricsRepository; | |||
import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; | |||
import org.apache.http.HttpResponse; | |||
import org.apache.http.client.methods.HttpGet; | |||
import org.apache.http.concurrent.FutureCallback; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.metric; | |||
package com.alibaba.csp.sentinel.dashboard.repository.metric; | |||
import java.util.ArrayList; | |||
import java.util.HashMap; | |||
@@ -24,9 +24,9 @@ import java.util.Map.Entry; | |||
import java.util.concurrent.ConcurrentHashMap; | |||
import java.util.stream.Collectors; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; | |||
import org.springframework.stereotype.Component; | |||
/** |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.metric; | |||
package com.alibaba.csp.sentinel.dashboard.repository.metric; | |||
import java.util.List; | |||
@@ -13,11 +13,12 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.concurrent.atomic.AtomicLong; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; | |||
import org.springframework.stereotype.Component; | |||
/** |
@@ -13,11 +13,12 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.concurrent.atomic.AtomicLong; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; | |||
import org.springframework.stereotype.Component; | |||
/** |
@@ -13,13 +13,13 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.concurrent.atomic.AtomicLong; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.alibaba.csp.sentinel.slots.block.flow.ClusterFlowConfig; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import org.springframework.stereotype.Component; | |||
/** |
@@ -13,13 +13,13 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.concurrent.atomic.AtomicLong; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; | |||
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowClusterConfig; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; | |||
import org.springframework.stereotype.Component; | |||
/** |
@@ -13,11 +13,12 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.concurrent.atomic.AtomicLong; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; | |||
import org.springframework.stereotype.Component; | |||
/** |
@@ -13,18 +13,17 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.concurrent.ConcurrentHashMap; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.util.AssertUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
/** | |||
* @author leyou | |||
*/ |
@@ -13,11 +13,11 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.repository.rule; | |||
package com.alibaba.csp.sentinel.dashboard.repository.rule; | |||
import java.util.List; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
/** | |||
* Interface to store and find rules. |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule; | |||
package com.alibaba.csp.sentinel.dashboard.rule; | |||
/** | |||
* @author Eric Zhao |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule; | |||
package com.alibaba.csp.sentinel.dashboard.rule; | |||
/** | |||
* @author Eric Zhao |
@@ -13,19 +13,20 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule; | |||
package com.alibaba.csp.sentinel.dashboard.rule; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import java.util.stream.Collectors; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.util.MachineUtils; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Component; | |||
@@ -13,18 +13,18 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule; | |||
package com.alibaba.csp.sentinel.dashboard.rule; | |||
import java.util.List; | |||
import java.util.Set; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.taobao.csp.sentinel.dashboard.util.MachineUtils; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Component; | |||
@@ -13,13 +13,13 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.service; | |||
package com.alibaba.csp.sentinel.dashboard.service; | |||
import java.util.List; | |||
import java.util.Set; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
/** | |||
* @author Eric Zhao |
@@ -13,9 +13,8 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.service; | |||
package com.alibaba.csp.sentinel.dashboard.service; | |||
import java.util.Collections; | |||
import java.util.HashSet; | |||
import java.util.List; | |||
import java.util.Objects; | |||
@@ -29,14 +28,14 @@ import com.alibaba.csp.sentinel.cluster.ClusterStateManager; | |||
import com.alibaba.csp.sentinel.util.AssertUtil; | |||
import com.alibaba.csp.sentinel.util.function.Tuple2; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
import com.taobao.csp.sentinel.dashboard.util.MachineUtils; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; | |||
import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.beans.factory.annotation.Autowired; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.service; | |||
package com.alibaba.csp.sentinel.dashboard.service; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
@@ -22,23 +22,23 @@ import java.util.concurrent.CompletableFuture; | |||
import java.util.stream.Collectors; | |||
import com.alibaba.csp.sentinel.cluster.ClusterStateManager; | |||
import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; | |||
import com.alibaba.csp.sentinel.dashboard.util.AsyncUtils; | |||
import com.alibaba.csp.sentinel.dashboard.util.ClusterEntityUtils; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; | |||
import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.taobao.csp.sentinel.dashboard.util.AsyncUtils; | |||
import com.taobao.csp.sentinel.dashboard.util.ClusterEntityUtils; | |||
import com.taobao.csp.sentinel.dashboard.util.MachineUtils; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; | |||
import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Service; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.util; | |||
package com.alibaba.csp.sentinel.dashboard.util; | |||
import java.util.List; | |||
import java.util.Objects; |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.util; | |||
package com.alibaba.csp.sentinel.dashboard.util; | |||
import java.util.ArrayList; | |||
import java.util.HashMap; | |||
@@ -23,13 +23,13 @@ import java.util.Map; | |||
import com.alibaba.csp.sentinel.cluster.ClusterStateManager; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; | |||
import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; | |||
import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; | |||
/** | |||
* @author Eric Zhao |
@@ -13,15 +13,14 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.util; | |||
package com.alibaba.csp.sentinel.dashboard.util; | |||
import java.util.Optional; | |||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.alibaba.csp.sentinel.util.function.Tuple2; | |||
import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; | |||
/** | |||
* @author Eric Zhao | |||
*/ |
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.util; | |||
package com.alibaba.csp.sentinel.dashboard.util; | |||
import java.util.List; | |||
@@ -13,13 +13,13 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.util; | |||
package com.alibaba.csp.sentinel.dashboard.util; | |||
import java.util.Optional; | |||
import com.alibaba.csp.sentinel.util.StringUtil; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; | |||
/** | |||
* Util class for parsing version. |
@@ -1,4 +1,4 @@ | |||
package com.taobao.csp.sentinel.dashboard.discovery; | |||
package com.alibaba.csp.sentinel.dashboard.discovery; | |||
import java.util.ConcurrentModificationException; | |||
import java.util.Set; |
@@ -13,17 +13,17 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule.nacos; | |||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
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.util.StringUtil; | |||
import com.alibaba.nacos.api.config.ConfigService; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.rule.DynamicRuleProvider; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Component; | |||
@@ -13,16 +13,16 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule.nacos; | |||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||
import java.util.List; | |||
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.util.AssertUtil; | |||
import com.alibaba.nacos.api.config.ConfigService; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.taobao.csp.sentinel.dashboard.rule.DynamicRulePublisher; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Component; | |||
@@ -13,16 +13,16 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule.nacos; | |||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||
import java.util.List; | |||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import com.alibaba.csp.sentinel.datasource.Converter; | |||
import com.alibaba.fastjson.JSON; | |||
import com.alibaba.nacos.api.config.ConfigFactory; | |||
import com.alibaba.nacos.api.config.ConfigService; | |||
import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; | |||
import org.springframework.context.annotation.Bean; | |||
import org.springframework.context.annotation.Configuration; | |||
@@ -13,7 +13,7 @@ | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
package com.taobao.csp.sentinel.dashboard.rule.nacos; | |||
package com.alibaba.csp.sentinel.dashboard.rule.nacos; | |||
/** | |||
* @author Eric Zhao |