Skip to content

Commit dabf81b

Browse files
KeRan213539wuwen5htynknhaoyannAaron-boom
authored
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 <1064645534@qq.com> Co-authored-by: Aaron-boom <55744718+Aaron-boom@users.noreply.github.com> * 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: 卫龙 <weilong@yeteam.com> * fix #895 (#896) Co-authored-by: 卫龙 <weilong@yeteam.com> * fix #893 (#894) fix #893 Co-authored-by: 卫龙 <weilong@yeteam.com> * 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: 璟源 <jingyuan.mj@alibaba-inc.com> * 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] <support@github.com> 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 <wuwen.55@aliyun.com> Co-authored-by: Huang YunKun <htynkn@gmail.com> Co-authored-by: haoyann <1064645534@qq.com> Co-authored-by: Aaron-boom <55744718+Aaron-boom@users.noreply.github.com> Co-authored-by: Wang Chengming <634749869@qq.com> Co-authored-by: brotherlu-xcq <1285823170@qq.com> Co-authored-by: Robert LU <robberphex@gmail.com> Co-authored-by: ymybxx <775289630@qq.com> Co-authored-by: plzdoo <55066376+plzdoo@users.noreply.github.com> Co-authored-by: Ubuntu <rootadmin@vm001.qmx3d0w2ozeuflvliyjbpujvhf.bx.internal.cloudapp.net> Co-authored-by: chenjjl <50745778+chenjjl@users.noreply.github.com> Co-authored-by: 卫龙 <weilong@yeteam.com> Co-authored-by: VirensCn <595170292@qq.com> Co-authored-by: itmajing <itmajing@163.com> Co-authored-by: 璟源 <jingyuan.mj@alibaba-inc.com> Co-authored-by: sherl0ckLiu <108274057+sherl0ckLiu@users.noreply.github.com> Co-authored-by: sage.xue <job.xueqi@outlook.com> Co-authored-by: Albumen Kevin <jhq0812@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cnjxzhao <85160585+cnjxzhao@users.noreply.github.com>
1 parent e2da767 commit dabf81b

43 files changed

Lines changed: 572 additions & 64 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Dubbo Admin
2-
Copyright 2018-2021 The Apache Software Foundation
2+
Copyright 2018-2022 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

‎README.md‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
2222

2323
- [Vue.js](https://vuejs.org) and [Vue Cli](https://cli.vuejs.org/)
2424
- [dubbo-admin-ui/README.md](dubbo-admin-ui/README.md) for more detail
25-
- 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
25+
- Set npm **proxy mirror**:
26+
27+
if you have network issue, you can set npm proxy mirror to speedup npm install:
28+
29+
add `registry=https://registry.npmmirror.com` to ~/.npmrc
2630

2731
### admin Server
2832

@@ -35,10 +39,9 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
3539
1. Clone source code on develop branch `git clone https://github.com/apache/dubbo-admin.git`
3640
2. Specify registry address in `dubbo-admin-server/src/main/resources/application.properties`
3741
3. Build
38-
39-
> - `mvn clean package -Dmaven.test.skip=true`
42+
- `mvn clean package -Dmaven.test.skip=true`
4043
4. Start
41-
* `mvn --projects dubbo-admin-server spring-boot:run`
44+
* `mvn --projects dubbo-admin-server spring-boot:run`
4245
OR
4346
* `cd dubbo-admin-distribution/target`; `java -jar dubbo-admin-0.1.jar`
4447
5. Visit `http://localhost:8080`
@@ -47,10 +50,15 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
4750

4851
### Development Setup
4952
* Run admin server project
50-
backend is a standard spring boot project, you can run it in any java IDE
53+
54+
backend is a standard spring boot project, you can run it in any java IDE
55+
5156
* Run admin ui project
57+
5258
run with `npm run dev`.
59+
5360
* visit web page
61+
5462
visit `http://localhost:8081`, frontend supports hot reload.
5563

5664
### Swagger support

‎README_ZH.md‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020

2121
- 使用[Vue.js](https://vuejs.org)作为javascript框架
2222
- [dubbo-admin-ui/README.md](dubbo-admin-ui/README.md)中有更详细的介绍
23-
- 设置 npm **代理镜像** : 如果遇到了网络问题，可以设置npm代理镜像来加速npm install的过程：在~/.npmrc中增加 `registry =https://registry.npm.taobao.org`
23+
- 设置 npm **代理镜像** :
24+
25+
如果遇到了网络问题，可以设置npm代理镜像来加速npm install的过程：
26+
27+
在~/.npmrc中增加 `registry=https://registry.npmmirror.com`
2428

2529
### 后端部分
2630

@@ -33,21 +37,25 @@
3337
1. 下载代码: `git clone https://github.com/apache/dubbo-admin.git`
3438
2. 在 `dubbo-admin-server/src/main/resources/application.properties`中指定注册中心地址
3539
3. 构建
36-
37-
> - `mvn clean package -Dmaven.test.skip=true`
40+
- `mvn clean package -Dmaven.test.skip=true`
3841
4. 启动
39-
* `mvn --projects dubbo-admin-server spring-boot:run`
40-
或者
41-
* `cd dubbo-admin-distribution/target; java -jar dubbo-admin-0.1.jar`
42+
* `mvn --projects dubbo-admin-server spring-boot:run`
43+
或者
44+
* `cd dubbo-admin-distribution/target; java -jar dubbo-admin-0.1.jar`
4245
5. 访问 `http://localhost:8080`
4346
---
4447

4548
### 开发环境配置
4649
* 运行`dubbo admin server`
47-
`dubbo admin server`是一个标准的spring boot项目, 可以在任何java IDE中运行它
50+
51+
`dubbo admin server`是一个标准的spring boot项目, 可以在任何java IDE中运行它
52+
4853
* 运行`dubbo admin ui`
54+
4955
`dubbo admin ui`由npm管理和构建，在开发环境中，可以单独运行: `npm run dev`
56+
5057
* 页面访问
58+
5159
访问 `http://localhost:8081`, 由于前后端分开部署，前端支持热加载，任何页面的修改都可以实时反馈，不需要重启应用。
5260

5361
### Swagger 支持

‎docker/0.4.0/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
FROM maven:3-openjdk-8
17+
RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.4.0.zip && unzip -q 0.4.0.zip -d /source
18+
WORKDIR /source/dubbo-admin-0.4.0
19+
RUN mvn --batch-mode clean package -Dmaven.test.skip=true
20+
21+
FROM openjdk:8-jre
22+
LABEL maintainer="dev@dubbo.apache.org"
23+
RUN apt-get update && apt-get install -y tini
24+
COPY --from=0 /source/dubbo-admin-0.4.0/dubbo-admin-distribution/target/dubbo-admin-0.4.0.jar /app.jar
25+
COPY --from=0 /source/dubbo-admin-0.4.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
26+
27+
ENV JAVA_OPTS ""
28+
29+
ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
30+
EXPOSE 8080

‎docker/0.4.0/Dockerfile.test‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
FROM ubuntu:trusty
17+
RUN apt-get update && apt-get install -yq curl && apt-get clean
18+
19+
WORKDIR /app
20+
21+
ADD test.sh /app/test.sh
22+
23+
CMD ["bash", "test.sh"]

‎docker/0.4.0/docker-compose.test.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
zookeeper:
17+
image: zookeeper:3.5
18+
admin:
19+
build: .
20+
dockerfile: Dockerfile
21+
links:
22+
- zookeeper
23+
environment:
24+
- admin.registry.address=zookeeper://zookeeper:2181
25+
- admin.config-center=zookeeper://zookeeper:2181
26+
- admin.metadata-report.address=zookeeper://zookeeper:2181
27+
ports:
28+
- 8080
29+
sut:
30+
build: .
31+
dockerfile: Dockerfile.test
32+
links:
33+
- admin

‎docker/0.4.0/test.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
LOOP_SIZE=60
17+
i=0
18+
19+
while [[ $i -lt LOOP_SIZE ]]; do
20+
status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080)
21+
22+
if [[ "$status_code" -eq 200 ]] ; then
23+
echo "Tests passed!"
24+
exit 0
25+
else
26+
curl -v http://admin:8080
27+
echo "status is incorrect, waiting for next turn"
28+
fi
29+
sleep 5
30+
i=$i+1
31+
done
32+
33+
echo "Tests failed!"
34+
exit 1

‎docker/0.5.0/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
FROM maven:3-openjdk-8
17+
RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.5.0.zip && unzip -q 0.5.0.zip -d /source
18+
WORKDIR /source/dubbo-admin-0.5.0
19+
RUN mvn --batch-mode clean package -Dmaven.test.skip=true
20+
21+
FROM openjdk:8-jre
22+
LABEL maintainer="dev@dubbo.apache.org"
23+
RUN apt-get update && apt-get install -y tini
24+
COPY --from=0 /source/dubbo-admin-0.5.0/dubbo-admin-distribution/target/dubbo-admin-0.5.0.jar /app.jar
25+
COPY --from=0 /source/dubbo-admin-0.5.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
26+
27+
ENV JAVA_OPTS ""
28+
29+
ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
30+
EXPOSE 8080

‎docker/0.5.0/Dockerfile.test‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
FROM ubuntu:trusty
17+
RUN apt-get update && apt-get install -yq curl && apt-get clean
18+
19+
WORKDIR /app
20+
21+
ADD test.sh /app/test.sh
22+
23+
CMD ["bash", "test.sh"]

‎docker/0.5.0/docker-compose.test.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
zookeeper:
17+
image: zookeeper:3.5
18+
admin:
19+
build: .
20+
dockerfile: Dockerfile
21+
links:
22+
- zookeeper
23+
environment:
24+
- admin.registry.address=zookeeper://zookeeper:2181
25+
- admin.config-center=zookeeper://zookeeper:2181
26+
- admin.metadata-report.address=zookeeper://zookeeper:2181
27+
ports:
28+
- 8080
29+
sut:
30+
build: .
31+
dockerfile: Dockerfile.test
32+
links:
33+
- admin

0 commit comments

Comments
 (0)