release 0.5.0 (#930)

* set branch protection * rat exclude ".asf.yaml" * add master-0.2.0 to branch protection * Exclude the".flattened-pom.xml" file into the source package (#799) * Update copyright year (#801) * fix NPE in ServiceTestUtil.java (#804) * polish dockerfile for 0.3.0 (#805) * update dockerfile and enable autotest * fix test script * fix zookeeper version * fix rat * develop-for-dubbo-3.x branch merge to develop branch (#808) * [3.0]Add mesh rule route (#789) * add mesh rule route * add mesh rule check * For #756 (#791) * [ISSUE #760]Application discover support (#807) * application discover support * fix checkstyle * fix ci * remove useless pom import,modify Chinese comment * fix UT bug Co-authored-by: haoyann <[email protected]> Co-authored-by: Aaron-boom <[email protected]> * Fix generic invoke fail (#810) * fix generic invoke fail * fix ci * Nacos support application discover (#812) * Fix generic can't invoke repeatedly (#814) * Reduce nacos mapping service storage (#817) * optimize some code for RegistryServerSync (#822) * Fix circular reference (#823) * Fix service version spell (#824) * For #756 (#815) * For #756 * for 830 (#832) * for 830 * For 830 * For 830 * For 830 * For 830 * For 830 * [Feature] Dubbo Admin provides service mock ability. (#838) * commit the API * develop the front page. * add edit logic * develop the front page and test. * ui change * change the config key and group * change rule enable to config center. * update GlobalMockRule update logic. * remove the GlobalMockRule * [feature admin mock] move the diver dependency out of the project. * [feature admin mock] remove the contributor name and date in javadoc. * [feature admin mock] optimize the delete mock rule step. * [feature admin mock] fix the dialog cannot be closed when delete successfully. * [feature admin mock] add the support for h2 database. * [feature admin mock] rollback to zookeeper registry. * [feature admin mock] fix properties. * [feature admin mock] change mock-admin-api maven version. * [feature admin mock] fix the feedback and add the parameters in docker-compose. * [feature admin mock] fix the ci problem. * [feature admin mock] fix the ci problem. * [feature admin mock] removed unused import. * [feature admin mock] add license. * GovernanceConfiguration use dubbo instead DynamicConfiguration (#840) * GovernanceConfiguration use dubbo instead DynamicConfiguration * remove useless change * for release 0.4.0 (#850) * [ISSUE #856] update README.md (#857) * 修复更新，删除service类型的条件路由异常的问题 (#861) * Fix flaky (#883) * fix flaky test * Delete dubbo-admin-server/.nondex directory Co-authored-by: Ubuntu <rootadmin@vm001.qmx3d0w2ozeuflvliyjbpujvhf.bx.internal.cloudapp.net> * support jdk11 #862 (#886) * support jdk11 #862 * support jdk11 #862 Co-authored-by: 卫龙 <[email protected]> * fix #895 (#896) Co-authored-by: 卫龙 <[email protected]> * fix #893 (#894) fix #893 Co-authored-by: 卫龙 <[email protected]> * Update index.html (#899) 原cdn.bootcss.com域名失效，需要切换到新域名cdn.bootcdn.net 官网申明：https://www.bootcdn.cn * support swagger.enable (#902) * support swagger.enable * enable swagger by default Co-authored-by: 璟源 <[email protected]> * support dubbo 3.0.8 (#903) * [Fix bug](#908) (#910) * ZookeeperMetaDataCollector init method add zk digest acl support (#911) * Fix notice and opt registry source (#913) * update year * fix search * add relation support * disable swagger * Bump fastjson from 1.2.67 to 1.2.83 (#907) Bumps [fastjson](https://github.com/alibaba/fastjson) from 1.2.67 to 1.2.83. - [Release notes](https://github.com/alibaba/fastjson/releases) - [Commits](alibaba/fastjson@1.2.67...1.2.83) --- updated-dependencies: - dependency-name: com.alibaba:fastjson dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add seriialization & timeout (#914) * update year * fix search * add relation support * disable swagger * fix interface * fix interface * 解决重复点功能，浏览器控制台报错问题，如点击：服务查询-搜索按钮 (#916) * Fix error when host is null (#920) * 解决重复点功能，浏览器控制台报错问题，如点击：服务查询-搜索按钮 * 解决可能产生的空指针问题，导致 '消费者'标签无法显示数据 * 解决在服务测试，方法执行成功后。动态生成的consumer元数据，host取值为空的问题情况（dubbo version 3.0.8） * Update ServiceDetail.vue (#921) * Up develop (#926) * release 0.5.0 Co-authored-by: wuwen <[email protected]> Co-authored-by: Huang YunKun <[email protected]> Co-authored-by: haoyann <[email protected]> Co-authored-by: Aaron-boom <[email protected]> Co-authored-by: Wang Chengming <[email protected]> Co-authored-by: brotherlu-xcq <[email protected]> Co-authored-by: Robert LU <[email protected]> Co-authored-by: ymybxx <[email protected]> Co-authored-by: plzdoo <[email protected]> Co-authored-by: Ubuntu <rootadmin@vm001.qmx3d0w2ozeuflvliyjbpujvhf.bx.internal.cloudapp.net> Co-authored-by: chenjjl <[email protected]> Co-authored-by: 卫龙 <[email protected]> Co-authored-by: VirensCn <[email protected]> Co-authored-by: itmajing <[email protected]> Co-authored-by: 璟源 <[email protected]> Co-authored-by: sherl0ckLiu <[email protected]> Co-authored-by: sage.xue <[email protected]> Co-authored-by: Albumen Kevin <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cnjxzhao <[email protected]>
apache · Oct 9, 2022 · dabf81b · dabf81b
1 parent e2da767
commit dabf81b
Show file tree

Hide file tree

Showing 43 changed files with 572 additions and 64 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache Dubbo Admin
-Copyright 2018-2021 The Apache Software Foundation
+Copyright 2018-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
@@ -22,7 +22,11 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
 
 - [Vue.js](https://vuejs.org) and [Vue Cli](https://cli.vuejs.org/)
 - [dubbo-admin-ui/README.md](dubbo-admin-ui/README.md) for more detail
-- Set npm **proxy mirror**: if you have network issue, you can set npm proxy mirror to speedup npm install: add `registry =https://registry.npm.taobao.org` to ~/.npmrc
+- Set npm **proxy mirror**:
+
+  if you have network issue, you can set npm proxy mirror to speedup npm install:
+
+  add `registry=https://registry.npmmirror.com` to ~/.npmrc
 
 ### admin Server
 
@@ -35,10 +39,9 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
 1. Clone source code on develop branch `git clone https://github.com/apache/dubbo-admin.git`
 2. Specify registry address in `dubbo-admin-server/src/main/resources/application.properties`
 3. Build
-
-    > - `mvn clean package -Dmaven.test.skip=true`  
+    - `mvn clean package -Dmaven.test.skip=true`
 4. Start 
-    * `mvn --projects dubbo-admin-server spring-boot:run`  
+    * `mvn --projects dubbo-admin-server spring-boot:run`
     OR
     * `cd dubbo-admin-distribution/target`;   `java -jar dubbo-admin-0.1.jar`
 5. Visit `http://localhost:8080`
@@ -47,10 +50,15 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
 
 ### Development Setup
 * Run admin server project
-   backend is a standard spring boot project, you can run it in any java IDE
+
+  backend is a standard spring boot project, you can run it in any java IDE
+
 * Run admin ui project
+
   run with `npm run dev`.
+
 * visit web page
+
   visit `http://localhost:8081`, frontend supports hot reload.
 
 ### Swagger support

diff --git a/README_ZH.md b/README_ZH.md
@@ -20,7 +20,11 @@
 
 - 使用[Vue.js](https://vuejs.org)作为javascript框架
 - [dubbo-admin-ui/README.md](dubbo-admin-ui/README.md)中有更详细的介绍
-- 设置 npm **代理镜像** : 如果遇到了网络问题，可以设置npm代理镜像来加速npm install的过程：在~/.npmrc中增加 `registry =https://registry.npm.taobao.org`
+- 设置 npm **代理镜像** :
+
+    如果遇到了网络问题，可以设置npm代理镜像来加速npm install的过程：
+
+    在~/.npmrc中增加 `registry=https://registry.npmmirror.com`
 
 ### 后端部分
 
@@ -33,21 +37,25 @@
 1. 下载代码: `git clone https://github.com/apache/dubbo-admin.git`
 2. 在 `dubbo-admin-server/src/main/resources/application.properties`中指定注册中心地址
 3. 构建
-
-    > - `mvn clean package -Dmaven.test.skip=true`  
+    - `mvn clean package -Dmaven.test.skip=true`
 4. 启动 
-   * `mvn --projects dubbo-admin-server spring-boot:run`   
-   或者   
-   * `cd dubbo-admin-distribution/target; java -jar dubbo-admin-0.1.jar`
+    * `mvn --projects dubbo-admin-server spring-boot:run`
+    或者
+    * `cd dubbo-admin-distribution/target; java -jar dubbo-admin-0.1.jar`
 5. 访问 `http://localhost:8080`
 ---
 
 ### 开发环境配置
 * 运行`dubbo admin server`
-   `dubbo admin server`是一个标准的spring boot项目, 可以在任何java IDE中运行它
+
+  `dubbo admin server`是一个标准的spring boot项目, 可以在任何java IDE中运行它
+
 * 运行`dubbo admin ui`
+
   `dubbo admin ui`由npm管理和构建，在开发环境中，可以单独运行: `npm run dev`
+
 * 页面访问
+
   访问 `http://localhost:8081`, 由于前后端分开部署，前端支持热加载，任何页面的修改都可以实时反馈，不需要重启应用。
 
 ### Swagger 支持

diff --git a/docker/0.4.0/Dockerfile b/docker/0.4.0/Dockerfile
@@ -0,0 +1,30 @@
+# 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.
+
+FROM maven:3-openjdk-8
+RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.4.0.zip && unzip -q 0.4.0.zip -d /source
+WORKDIR /source/dubbo-admin-0.4.0
+RUN mvn --batch-mode clean package -Dmaven.test.skip=true
+
+FROM openjdk:8-jre
+LABEL maintainer="[email protected]"
+RUN apt-get update && apt-get install -y tini
+COPY --from=0 /source/dubbo-admin-0.4.0/dubbo-admin-distribution/target/dubbo-admin-0.4.0.jar /app.jar
+COPY --from=0 /source/dubbo-admin-0.4.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+
+ENV JAVA_OPTS ""
+
+ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
+EXPOSE 8080
diff --git a/docker/0.4.0/Dockerfile.test b/docker/0.4.0/Dockerfile.test
@@ -0,0 +1,23 @@
+# 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.
+
+FROM ubuntu:trusty
+RUN apt-get update && apt-get install -yq curl && apt-get clean
+
+WORKDIR /app
+
+ADD test.sh /app/test.sh
+
+CMD ["bash", "test.sh"]
diff --git a/docker/0.4.0/docker-compose.test.yml b/docker/0.4.0/docker-compose.test.yml
@@ -0,0 +1,33 @@
+# 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.
+
+zookeeper:
+  image: zookeeper:3.5
+admin:
+  build: .
+  dockerfile: Dockerfile
+  links:
+    - zookeeper
+  environment:
+    - admin.registry.address=zookeeper://zookeeper:2181
+    - admin.config-center=zookeeper://zookeeper:2181
+    - admin.metadata-report.address=zookeeper://zookeeper:2181
+  ports: 
+    - 8080
+sut:
+  build: .
+  dockerfile: Dockerfile.test
+  links:
+    - admin
diff --git a/docker/0.4.0/test.sh b/docker/0.4.0/test.sh
@@ -0,0 +1,34 @@
+# 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.
+
+LOOP_SIZE=60
+i=0
+
+while [[ $i -lt LOOP_SIZE ]]; do
+	status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080)
+
+  if [[ "$status_code" -eq 200 ]] ; then
+    echo "Tests passed!"
+    exit 0
+  else
+    curl -v http://admin:8080
+    echo "status is incorrect, waiting for next turn"
+  fi
+	sleep 5
+	i=$i+1
+done
+
+echo "Tests failed!"
+exit 1
diff --git a/docker/0.5.0/Dockerfile b/docker/0.5.0/Dockerfile
@@ -0,0 +1,30 @@
+# 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.
+
+FROM maven:3-openjdk-8
+RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.5.0.zip && unzip -q 0.5.0.zip -d /source
+WORKDIR /source/dubbo-admin-0.5.0
+RUN mvn --batch-mode clean package -Dmaven.test.skip=true
+
+FROM openjdk:8-jre
+LABEL maintainer="[email protected]"
+RUN apt-get update && apt-get install -y tini
+COPY --from=0 /source/dubbo-admin-0.5.0/dubbo-admin-distribution/target/dubbo-admin-0.5.0.jar /app.jar
+COPY --from=0 /source/dubbo-admin-0.5.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+
+ENV JAVA_OPTS ""
+
+ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
+EXPOSE 8080
diff --git a/docker/0.5.0/Dockerfile.test b/docker/0.5.0/Dockerfile.test
@@ -0,0 +1,23 @@
+# 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.
+
+FROM ubuntu:trusty
+RUN apt-get update && apt-get install -yq curl && apt-get clean
+
+WORKDIR /app
+
+ADD test.sh /app/test.sh
+
+CMD ["bash", "test.sh"]
diff --git a/docker/0.5.0/docker-compose.test.yml b/docker/0.5.0/docker-compose.test.yml
@@ -0,0 +1,33 @@
+# 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.
+
+zookeeper:
+  image: zookeeper:3.5
+admin:
+  build: .
+  dockerfile: Dockerfile
+  links:
+    - zookeeper
+  environment:
+    - admin.registry.address=zookeeper://zookeeper:2181
+    - admin.config-center=zookeeper://zookeeper:2181
+    - admin.metadata-report.address=zookeeper://zookeeper:2181
+  ports: 
+    - 8080
+sut:
+  build: .
+  dockerfile: Dockerfile.test
+  links:
+    - admin
diff --git a/docker/0.5.0/test.sh b/docker/0.5.0/test.sh
@@ -0,0 +1,34 @@
+# 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.
+
+LOOP_SIZE=60
+i=0
+
+while [[ $i -lt LOOP_SIZE ]]; do
+	status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080)
+
+  if [[ "$status_code" -eq 200 ]] ; then
+    echo "Tests passed!"
+    exit 0
+  else
+    curl -v http://admin:8080
+    echo "status is incorrect, waiting for next turn"
+  fi
+	sleep 5
+	i=$i+1
+done
+
+echo "Tests failed!"
+exit 1
diff --git a/dubbo-admin-distribution/pom.xml b/dubbo-admin-distribution/pom.xml
@@ -53,6 +53,8 @@
                             <tasks>
                                 <copy file="../dubbo-admin-server/target/dubbo-admin-server-${project.version}.jar"
                                       tofile="target/dubbo-admin-${project.version}.jar"/>
+                                <copy file="../dubbo-admin-server/target/classes/application.properties"
+                                      tofile="src/bin/config/application.properties"/>
                             </tasks>
                         </configuration>
                         <goals>

diff --git a/dubbo-admin-distribution/src/NOTICE b/dubbo-admin-distribution/src/NOTICE
@@ -1,5 +1,5 @@
 Apache Dubbo Admin
-Copyright 2018-2021 The Apache Software Foundation
+Copyright 2018-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -100,7 +100,7 @@ dubbo NOTICE
 
 ========================================================================
 Apache Dubbo
-Copyright 2018-2021 The Apache Software Foundation
+Copyright 2018-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/dubbo-admin-distribution/src/bin/config/application.properties b/dubbo-admin-distribution/src/bin/config/application.properties
@@ -57,6 +57,11 @@ server.compression.enabled=true
 server.compression.mime-types=text/css,text/javascript,application/javascript
 server.compression.min-response-size=10240
 
+#token timeout, default is one hour
+admin.check.tokenTimeoutMilli=3600000
+#Jwt signingKey
+admin.check.signSecret=86295dd0c4ef69a1036b0b0c15158d77
+
 #dubbo config
 dubbo.application.name=dubbo-admin
 dubbo.registry.address=${admin.registry.address}
@@ -68,7 +73,7 @@ dubbo.registry.address=${admin.registry.address}
 #spring.datasource.password=mysql
 
 # h2
-spring.datasource.url=jdbc:h2:mem:~/dubbo-admin;
+spring.datasource.url=jdbc:h2:mem:~/dubbo-admin;MODE=MYSQL;
 spring.datasource.username=sa
 spring.datasource.password=