You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/09/26 08:56:28 UTC
[incubator-dubbo-ops] branch develop updated: update copyright
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new f628fea update copyright
f628fea is described below
commit f628fea82584c78d7a664298bffcfc98d774ea4f
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Wed Sep 26 16:56:17 2018 +0800
update copyright
---
.../admin/controller/LoadBalanceController.java | 14 +-
.../admin/controller/OverridesController.java | 22 ++
.../dubbo/admin/controller/RoutesController.java | 16 +-
.../dubbo/admin/controller/ServiceController.java | 14 +-
.../dubbo/admin/controller/WeightController.java | 14 +-
.../org/apache/dubbo/admin/domain/ServiceDO.java | 14 +-
.../apache/dubbo/admin/domain/ServiceDetailDO.java | 14 +-
.../org/apache/dubbo/admin/dto/BalancingDTO.java | 17 ++
.../java/org/apache/dubbo/admin/dto/RouteDTO.java | 14 +-
.../java/org/apache/dubbo/admin/dto/WeightDTO.java | 14 +-
.../java/org/apache/dubbo/admin/util/YamlUtil.java | 17 ++
.../mvc/governance/ServiceDetailController.java | 17 ++
.../src/components/AccessControl.vue | 14 +-
dubbo-admin-frontend/src/components/AceEditor.vue | 17 ++
dubbo-admin-frontend/src/components/Drawer.vue | 14 +-
.../src/components/DynamicConfig.vue | 331 ++++++++++++++++++++-
dubbo-admin-frontend/src/components/Footers.vue | 14 +-
.../src/components/LoadBalance.vue | 14 +-
.../src/components/RoutingRule.vue | 14 +-
.../src/components/ServiceDetail.vue | 14 +-
.../src/components/ServiceSearch.vue | 14 +-
dubbo-admin-frontend/src/components/Toolbar.vue | 14 +-
dubbo-admin-frontend/src/components/VWidget.vue | 14 +-
.../src/components/WeightAdjust.vue | 14 +-
dubbo-admin-frontend/src/components/http-common.js | 14 +-
dubbo-admin-frontend/src/router/index.js | 6 +
26 files changed, 553 insertions(+), 142 deletions(-)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
index 71b76c9..6544e2a 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/LoadBalanceController.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.controller;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
new file mode 100644
index 0000000..2bb1c4d
--- /dev/null
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.admin.controller;
+
+public class OverridesController {
+
+}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
index 445fb99..0e2751f 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/RoutesController.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.controller;
@@ -21,10 +21,8 @@ import org.apache.dubbo.admin.dto.RouteDTO;
import org.apache.dubbo.admin.governance.service.ProviderService;
import org.apache.dubbo.admin.governance.service.RouteService;
import org.apache.dubbo.admin.registry.common.domain.Route;
-import org.apache.dubbo.admin.util.YamlUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.yaml.snakeyaml.events.Event;
import java.util.List;
import java.util.Map;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
index 4bf3c2a..4c3730d 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.controller;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
index 8c1516c..42eda14 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/WeightController.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.controller;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDO.java
index 406b300..f69f461 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDO.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.domain;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDetailDO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDetailDO.java
index d590dbb..fbb6a76 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDetailDO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/domain/ServiceDetailDO.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.domain;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/BalancingDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/BalancingDTO.java
index 9ef12e0..ead2b39 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/BalancingDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/BalancingDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.dubbo.admin.dto;
/**
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/RouteDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/RouteDTO.java
index b3aad71..f8e0f29 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/RouteDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/RouteDTO.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.dto;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/WeightDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/WeightDTO.java
index 82024d2..46b53a7 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/WeightDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/dto/WeightDTO.java
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.dubbo.admin.dto;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java
index c3f9d08..006e1ee 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/util/YamlUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.dubbo.admin.util;
import org.yaml.snakeyaml.Yaml;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/web/mvc/governance/ServiceDetailController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/web/mvc/governance/ServiceDetailController.java
index e5cc04e..373ff48 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/web/mvc/governance/ServiceDetailController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/web/mvc/governance/ServiceDetailController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.dubbo.admin.web.mvc.governance;
import org.apache.dubbo.admin.registry.common.domain.Override;
diff --git a/dubbo-admin-frontend/src/components/AccessControl.vue b/dubbo-admin-frontend/src/components/AccessControl.vue
index 1f271b5..500dac5 100644
--- a/dubbo-admin-frontend/src/components/AccessControl.vue
+++ b/dubbo-admin-frontend/src/components/AccessControl.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/AceEditor.vue b/dubbo-admin-frontend/src/components/AceEditor.vue
index 8683034..bab63b7 100644
--- a/dubbo-admin-frontend/src/components/AceEditor.vue
+++ b/dubbo-admin-frontend/src/components/AceEditor.vue
@@ -1,3 +1,20 @@
+<!--
+ - Licensed to the Apache Software Foundation (ASF) under one or more
+ - contributor license agreements. See the NOTICE file distributed with
+ - this work for additional information regarding copyright ownership.
+ - The ASF licenses this file to You under the Apache License, Version 2.0
+ - (the "License"); you may not use this file except in compliance with
+ - the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
+ -->
+
<template>
<div :style="{height: myConfig.height + 'px', width: myConfig.width + 'px'}"></div>
</template>
diff --git a/dubbo-admin-frontend/src/components/Drawer.vue b/dubbo-admin-frontend/src/components/Drawer.vue
index 8c9728a..f463dba 100644
--- a/dubbo-admin-frontend/src/components/Drawer.vue
+++ b/dubbo-admin-frontend/src/components/Drawer.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/DynamicConfig.vue b/dubbo-admin-frontend/src/components/DynamicConfig.vue
index 75ea3fa..9b27fff 100644
--- a/dubbo-admin-frontend/src/components/DynamicConfig.vue
+++ b/dubbo-admin-frontend/src/components/DynamicConfig.vue
@@ -1,12 +1,329 @@
+<!--
+ - Licensed to the Apache Software Foundation (ASF) under one or more
+ - contributor license agreements. See the NOTICE file distributed with
+ - this work for additional information regarding copyright ownership.
+ - The ASF licenses this file to You under the Apache License, Version 2.0
+ - (the "License"); you may not use this file except in compliance with
+ - the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
+ -->
+
<template>
-
-</template>
+ <v-container grid-list-xl fluid >
+ <v-layout row wrap>
+ <v-flex xs12 >
+ <v-card flat color="transparent">
+ <v-card-text>
+ <v-layout row wrap >
+ <v-text-field label="Search dubbo service"
+ v-model="filter" clearable></v-text-field>
+ <v-btn @click="submit" color="primary" large>Search</v-btn>
+ </v-layout>
+ </v-card-text>
+ </v-card>
+ </v-flex>
+ </v-layout>
+
+ <v-flex lg12>
+ <v-card>
+ <v-toolbar flat color="transparent" class="elevation-0">
+ <v-toolbar-title><span class="headline">Search Result</span></v-toolbar-title>
+ <v-divider
+ class="mx-2"
+ inset
+ vertical
+ ></v-divider>
+ <v-spacer></v-spacer>
+ <v-btn outline color="primary" @click.stop="openDialog" class="mb-2">CREATE</v-btn>
+ </v-toolbar>
+
+ <v-card-text class="pa-0">
+ <v-data-table
+ :headers="headers"
+ :items="loadBalances"
+ hide-actions
+ class="elevation-0"
+ >
+ <template slot="items" slot-scope="props">
+ <td class="text-xs-left">{{ props.item.service }}</td>
+ <td class="text-xs-left">{{ props.item.method }}</td>
+ <td class="justify-center px-0">
+ <v-tooltip bottom v-for="op in operations" :key="op.id">
+ <v-icon small class="mr-2" slot="activator" @click="itemOperation(op.icon(props.item), props.item)">
+ {{op.icon(props.item)}}
+ </v-icon>
+ <span>{{op.tooltip(props.item)}}</span>
+ </v-tooltip>
+ </td>
+ </template>
+ </v-data-table>
+ </v-card-text>
+ </v-card>
+ </v-flex>
+
+ <v-dialog v-model="dialog" width="800px" persistent >
+ <v-card>
+ <v-card-title class="justify-center">
+ <span class="headline">Create New LoadBalance Rule</span>
+ </v-card-title>
+ <v-card-text >
+ <v-text-field
+ label="Service Unique ID"
+ hint="A service ID is service name"
+ required
+ v-model="service"
+ ></v-text-field>
+ <v-subheader class="pa-0 mt-3">RULE CONTENT</v-subheader>
+ <codemirror ref="myCm"
+ v-model="ruleText"
+ :options="cmOption">
+ </codemirror>
+
+ </v-card-text>
+ <v-card-actions>
+ <v-spacer></v-spacer>
+ <v-btn color="blue darken-1" flat @click.native="closeDialog">Close</v-btn>
+ <v-btn color="blue darken-1" flat @click.native="saveItem">Save</v-btn>
+ </v-card-actions>
+ </v-card>
+ </v-dialog>
+
+ <v-dialog v-model="warn" persistent max-width="500px">
+ <v-card>
+ <v-card-title class="headline">{{this.warnTitle}}</v-card-title>
+ <v-card-text >{{this.warnText}}</v-card-text>
+ <v-card-actions>
+ <v-spacer></v-spacer>
+ <v-btn color="green darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
+ <v-btn color="green darken-1" flat @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
+ </v-card-actions>
+ </v-card>
+ </v-dialog>
+ </v-container>
+
+</template>
<script>
- export default {
- }
-</script>
+ import { codemirror } from 'vue-codemirror'
+ import 'codemirror/lib/codemirror.css'
+ import 'codemirror/theme/paraiso-light.css'
+ import 'codemirror/mode/yaml/yaml.js'
+ import 'codemirror/addon/display/autorefresh.js'
+ import 'codemirror/addon/display/placeholder'
+ import yaml from 'js-yaml'
+ import {AXIOS} from './http-common'
+ export default {
+ components: {
+ codemirror
+ },
+ data: () => ({
+ dropdown_font: [ 'Service', 'App', 'IP' ],
+ ruleKeys: ['method', 'strategy'],
+ pattern: 'Service',
+ filter: '',
+ dialog: false,
+ warn: false,
+ application: '',
+ service: '',
+ warnTitle: '',
+ warnText: '',
+ warnStatus: {},
+ height: 0,
+ operations: [
+ {id: 0,
+ icon: function (item) {
+ return 'visibility'
+ },
+ tooltip: function (item) {
+ return 'View'
+ }},
+ {id: 1,
+ icon: function (item) {
+ return 'edit'
+ },
+ tooltip: function (item) {
+ return 'Edit'
+ }},
+ {id: 3,
+ icon: function (item) {
+ return 'delete'
+ },
+ tooltip: function (item) {
+ return 'Delete'
+ }}
+ ],
+ loadBalances: [
+ ],
+ template:
+ 'methodName: sayHello # 0 for all methods\n' +
+ 'strategy: # leastactive, random, roundrobin',
+ ruleText: '',
+ cmOption: {
+ theme: 'paraiso-light',
+ autoRefresh: true,
+ readOnly: false,
+ mode: 'text/x-yaml',
+ line: true
+ },
+ headers: [
+ {
+ text: 'Service Name',
+ value: 'service',
+ align: 'left'
+ },
+ {
+ text: 'Method',
+ value: 'method',
+ align: 'left'
-<style scoped>
+ },
+ {
+ text: 'Operation',
+ value: 'operation',
+ sortable: false
+ }
+ ]
+ }),
+ methods: {
+ submit: function () {
+ this.search(this.filter, true)
+ },
+ search: function (filter, rewrite) {
+ let params = {}
+ params.serviceName = filter
+ AXIOS.post('/balancing/search', params)
+ .then(response => {
+ this.loadBalances = response.data
+ if (rewrite) {
+ this.$router.push({path: 'loadbalance', query: {serviceName: filter}})
+ }
+ })
+ },
+ handleRule: function (route) {
+ let result = {}
+ for (let property in route) {
+ if (this.ruleKeys.includes(property)) {
+ result[property] = route[property]
+ }
+ }
+ return yaml.safeDump(result)
+ },
+ closeDialog: function () {
+ this.ruleText = this.template
+ this.service = ''
+ this.dialog = false
+ this.cmOption.readOnly = false
+ },
+ openDialog: function () {
+ this.dialog = true
+ },
+ openWarn: function (title, text) {
+ this.warnTitle = title
+ this.warnText = text
+ this.warn = true
+ },
+ closeWarn: function () {
+ this.warnTitle = ''
+ this.warnText = ''
+ this.warn = false
+ },
+ saveItem: function () {
+ let text = encodeURIComponent(this.ruleText) // contains illegal url character, need encode
+ let rule = {}
+ rule.serviceName = this.service
+ rule.rule = text
+ AXIOS.post('/balancing/create', rule)
+ .then(response => {
+ if (response.data) {
+ this.search(this.service, true)
+ }
+ })
+ },
+ itemOperation: function (icon, item) {
+ switch (icon) {
+ case 'visibility':
+ AXIOS.get('/balancing/detail?id=' + item.id)
+ .then(response => {
+ let balancing = response.data
+ let result = this.handleRule(balancing)
+ this.service = balancing.service
+ this.ruleText = result
+ this.cmOption.readOnly = true
+ this.dialog = true
+ })
+ break
+ case 'edit':
+ let edit = {}
+ edit.id = item.id
+ AXIOS.post('/balancing/edit', edit)
+ .then(response => {
+ let loadbalance = response.data
+ let result = this.handleRule(loadbalance)
+ this.service = loadbalance.service
+ this.ruleText = result
+ this.cmOption.readOnly = false
+ this.dialog = true
+ })
+ break
+ case 'delete':
+ this.openWarn(' Are you sure to Delete Routing Rule', 'serviceName: ' + item.service)
+ this.warnStatus.operation = 'delete'
+ this.warnStatus.id = item.id
+ }
+ },
+ setHeight: function () {
+ this.height = window.innerHeight * 0.5
+ },
+ deleteItem: function (warnStatus) {
+ if (warnStatus.operation === 'delete') {
+ let id = {}
+ id.id = warnStatus.id
+ AXIOS.post('/balancing/delete', id)
+ .then(response => {
+ this.warn = false
+ this.search(this.filter, false)
+ })
+ } else if (warnStatus.operation === 'block') {
+ let status = {}
+ status.enabled = warnStatus.enabled
+ status.id = warnStatus.id
+ AXIOS.post('/routes/changeStatus', status)
+ .then(response => {
+ this.warn = false
+ this.search(this.filter, false)
+ })
+ }
+ }
+ },
+ computed: {
+ codemirror () {
+ return this.$refs.myCm.codemirror
+ }
+ },
+ created () {
+ this.setHeight()
+ },
+ mounted: function () {
+ this.ruleText = this.template
+ let query = this.$route.query
+ let service = ''
+ Object.keys(query).forEach(function (key) {
+ if (key === 'serviceName') {
+ service = query[key]
+ }
+ })
+ if (service !== '') {
+ this.filter = service
+ this.search(service, false)
+ }
+ }
-</style>
+ }
+</script>
diff --git a/dubbo-admin-frontend/src/components/Footers.vue b/dubbo-admin-frontend/src/components/Footers.vue
index d36efd3..4c7a18f 100644
--- a/dubbo-admin-frontend/src/components/Footers.vue
+++ b/dubbo-admin-frontend/src/components/Footers.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/LoadBalance.vue b/dubbo-admin-frontend/src/components/LoadBalance.vue
index 8397419..9b27fff 100644
--- a/dubbo-admin-frontend/src/components/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/LoadBalance.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/RoutingRule.vue b/dubbo-admin-frontend/src/components/RoutingRule.vue
index 0803bf6..2bf50ff 100644
--- a/dubbo-admin-frontend/src/components/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/RoutingRule.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/ServiceDetail.vue b/dubbo-admin-frontend/src/components/ServiceDetail.vue
index ce3cfa8..9138594 100644
--- a/dubbo-admin-frontend/src/components/ServiceDetail.vue
+++ b/dubbo-admin-frontend/src/components/ServiceDetail.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/ServiceSearch.vue b/dubbo-admin-frontend/src/components/ServiceSearch.vue
index 73dca5f..a407e74 100644
--- a/dubbo-admin-frontend/src/components/ServiceSearch.vue
+++ b/dubbo-admin-frontend/src/components/ServiceSearch.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/Toolbar.vue b/dubbo-admin-frontend/src/components/Toolbar.vue
index 5943ffb..9c7713d 100644
--- a/dubbo-admin-frontend/src/components/Toolbar.vue
+++ b/dubbo-admin-frontend/src/components/Toolbar.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/VWidget.vue b/dubbo-admin-frontend/src/components/VWidget.vue
index c87977a..bdba14c 100644
--- a/dubbo-admin-frontend/src/components/VWidget.vue
+++ b/dubbo-admin-frontend/src/components/VWidget.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/WeightAdjust.vue b/dubbo-admin-frontend/src/components/WeightAdjust.vue
index 63cafd6..4cfa632 100644
--- a/dubbo-admin-frontend/src/components/WeightAdjust.vue
+++ b/dubbo-admin-frontend/src/components/WeightAdjust.vue
@@ -4,15 +4,15 @@
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- - he License. You may obtain a copy of the License at
+ - the License. You may obtain a copy of the License at
-
- - http://www.apache.org/licenses/LICENSE-2.0
+ - http://www.apache.org/licenses/LICENSE-2.0
-
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ - Unless required by applicable law or agreed to in writing, software
+ - distributed under the License is distributed on an "AS IS" BASIS,
+ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ - See the License for the specific language governing permissions and
+ - limitations under the License.
-->
<template>
diff --git a/dubbo-admin-frontend/src/components/http-common.js b/dubbo-admin-frontend/src/components/http-common.js
index fb93215..c9d86cd 100644
--- a/dubbo-admin-frontend/src/components/http-common.js
+++ b/dubbo-admin-frontend/src/components/http-common.js
@@ -4,15 +4,15 @@
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * he License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import axios from 'axios'
diff --git a/dubbo-admin-frontend/src/router/index.js b/dubbo-admin-frontend/src/router/index.js
index 6cf8f67..6fbf0cf 100644
--- a/dubbo-admin-frontend/src/router/index.js
+++ b/dubbo-admin-frontend/src/router/index.js
@@ -23,6 +23,7 @@ import RoutingRule from '@/components/RoutingRule'
import AccessControl from '@/components/AccessControl'
import LoadBalance from '@/components/LoadBalance'
import WeightAdjust from '@/components/WeightAdjust'
+import DynamicConfig from '@/components/DynamicConfig'
Vue.use(Router)
@@ -57,6 +58,11 @@ export default new Router({
path: '/governance/weight',
name: 'WeightAdjust',
component: WeightAdjust
+ },
+ {
+ path: '/governance/config',
+ name: 'DynamicConfig',
+ component: DynamicConfig
}
]
})