adjust port (#948)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fa3b460..291f0f9 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,3 @@
-The branch of 0.2.0 is master-0.2.0. If your PR is to solve the problem of 0.2.0, please submit the PR to it.
-Please do not create a Pull Request without creating an issue first.
-
## What is the purpose of the change
XXXXX
diff --git a/README.md b/README.md
index 8f83010..d9d16ff 100644
--- a/README.md
+++ b/README.md
@@ -69,18 +69,18 @@
Dubbo Admin should now has been successfully installed, run the following command:
```sh
-$ kubectl --namespace default port-forward service/dubbo-admin 8080:8080
+$ kubectl --namespace default port-forward service/dubbo-admin 38080:38080
```
Or, you can choose to follow the command instructions from the helm installation process, it should be similar to the following:
```sh
export POD_NAME=$(kubectl get pods --namespace default -l "app.kubernetes.io/name=dubbo-admin,app.kubernetes.io/instance=dubbo-admin" -o jsonpath="{.items[0].metadata.name}")
export CONTAINER_PORT=$(kubectl get pod --namespace default $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-echo "Visit http://127.0.0.1:8080 to use your application"
-kubectl --namespace default port-forward $POD_NAME 8080:$CONTAINER_PORT
+echo "Visit http://127.0.0.1:38080 to use your application"
+kubectl --namespace default port-forward $POD_NAME 38080:$CONTAINER_PORT
```
-Open browser and visit http://127.0.0.1:8080, default username and password are `root`
+Open browser and visit http://127.0.0.1:38080, default username and password are `root`
### 1.1.2 Run from helm chart repository
**1. Add helm chart repository (Currently not available)**
@@ -106,10 +106,10 @@
Dubbo Admin should now has been successfully installed, run the following command:
```sh
-$ kubectl --namespace default port-forward service/dubbo-admin 8080:8080
+$ kubectl --namespace default port-forward service/dubbo-admin 38080:38080
```
-Open browser and visit http://127.0.0.1:8080, default username and password are `root`
+Open browser and visit http://127.0.0.1:38080, default username and password are `root`
## 1.2 Run With Kubernetes
@@ -134,10 +134,10 @@
**3. Visit Admin**
```sh
-$ kubectl port-forward service dubbo-admin 8080:8080
+$ kubectl port-forward service dubbo-admin 38080:38080
```
-Open web browser and visit `http://localhost:8080`, default username and password are `root`
+Open web browser and visit `http://localhost:38080`, default username and password are `root`
## 1.3 Run With Docker
The prebuilt docker image is hosted at: https://hub.docker.com/repository/docker/apache/dubbo-admin
@@ -145,12 +145,12 @@
You can run the image directly by mounting a volume from the host that contains an `application.properties` file with the accessible registry and config-center addresses specified.
```sh
-$ docker run -it --rm -v /the/host/path/containing/properties:/config -p 8080:8080 apache/dubbo-admin
+$ docker run -it --rm -v /the/host/path/containing/properties:/config -p 38080:38080 apache/dubbo-admin
```
Replace `/the/host/path/containing/properties` with the actual host path (must be an absolute path) that points to a directory containing `application.properties`.
-Open web browser and visit `http://localhost:8080`, default username and password are `root`
+Open web browser and visit `http://localhost:38080`, default username and password are `root`
## 1.4 Compile From Source
1. Clone source code on `develop` branch `git clone https://github.com/apache/dubbo-admin.git`
@@ -161,7 +161,7 @@
* `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`, default username and password are `root`
+5. Visit `http://localhost:38080`, default username and password are `root`
# 2. Want To Contribute
@@ -190,11 +190,11 @@
* Run admin ui project
- run with `npm run dev`.
+ at directory `dubbo-admin-ui`, run with `./node/npm run dev`.
* visit web page
- visit `http://localhost:8080`, frontend supports hot reload.
+ visit `http://localhost:38082`, frontend supports hot reload.
# 3 License
diff --git a/README_ZH.md b/README_ZH.md
index d702df4..b4deca5 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -68,18 +68,18 @@
Dubbo Admin 现在应该已经成功安装，运行以下命令获得访问地址:
```sh
-$ kubectl --namespace default port-forward service/dubbo-admin 8080:8080
+$ kubectl --namespace default port-forward service/dubbo-admin 38080:38080
```
或者，你可以参考执行 helm 安装后给出的提示命令，类似如下:
```sh
export POD_NAME=$(kubectl get pods --namespace default -l "app.kubernetes.io/name=dubbo-admin,app.kubernetes.io/instance=dubbo-admin" -o jsonpath="{.items[0].metadata.name}")
export CONTAINER_PORT=$(kubectl get pod --namespace default $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-echo "Visit http://127.0.0.1:8080 to use your application"
-kubectl --namespace default port-forward $POD_NAME 8080:$CONTAINER_PORT
+echo "Visit http://127.0.0.1:38080 to use your application"
+kubectl --namespace default port-forward $POD_NAME 38080:$CONTAINER_PORT
```
-打开浏览器并访问 http://127.0.0.1:8080，默认的 username 和 password 是 `root`
+打开浏览器并访问 http://127.0.0.1:38080，默认的 username 和 password 是 `root`
### 1.1.2 基于 Chart 仓库运行 Admin
@@ -106,10 +106,10 @@
Dubbo Admin 现在应该已经成功安装，运行以下命令获得访问地址:
```sh
-$ kubectl --namespace default port-forward service/dubbo-admin 8080:8080
+$ kubectl --namespace default port-forward service/dubbo-admin 38080:38080
```
-打开浏览器并访问 http://127.0.0.1:8080，默认的 username 和 password 是 `root`
+打开浏览器并访问 http://127.0.0.1:38080，默认的 username 和 password 是 `root`
## 1.2 使用 Kubernetes 运行
@@ -135,10 +135,10 @@
**3. 访问 Admin**
```sh
-$ kubectl port-forward service dubbo-admin 8080:8080
+$ kubectl port-forward service dubbo-admin 38080:38080
```
-打开浏览器并访问 `http://localhost:8080`， 默认 username 和 password 是 `root`
+打开浏览器并访问 `http://localhost:38080`， 默认 username 和 password 是 `root`
## 1.3 使用 Docker 运行
预先定义的 Admin 镜像托管在： https://hub.docker.com/repository/docker/apache/dubbo-admin
@@ -146,12 +146,12 @@
可以直接运行镜像来部署 Admin，并通过绑定宿主机上的 `application.properties` 文件定制镜像默认参数，如注册中心、配置中心地址等。
```sh
-$ docker run -it --rm -v /the/host/path/containing/properties:/config -p 8080:8080 apache/dubbo-admin
+$ docker run -it --rm -v /the/host/path/containing/properties:/config -p 38080:38080 apache/dubbo-admin
```
将 `/the/host/path/containing/properties` 替换为宿主机上包含 `application.properties` 文件的实际路径（必须是一个有效目录的绝对路径）。
-打开浏览器并访问 `http://localhost:8080`, 默认 username 和 password 是 `root`
+打开浏览器并访问 `http://localhost:38080`, 默认 username 和 password 是 `root`
## 1.4 通过源码打包运行
@@ -163,7 +163,7 @@
* `mvn --projects dubbo-admin-server spring-boot:run`
或者
* `cd dubbo-admin-distribution/target; java -jar dubbo-admin-${project.version}.jar`
-5. 访问 `http://localhost:8080`
+5. 访问 `http://localhost:38080`
# 2 参与项目贡献
@@ -185,18 +185,18 @@
* [application.properties配置说明](https://github.com/apache/dubbo-admin/wiki/Dubbo-Admin%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E)
### 2.2.1 开发环境配置
-* 运行`dubbo admin server`
+* 运行`dubbo-admin-server`
- `dubbo admin server`是一个标准的spring boot项目, 可以在任何java IDE中运行它
+ `dubbo-admin-server`是一个标准的spring boot项目, 可以在任何java IDE中运行它
-* 运行`dubbo admin ui`
+* 运行`dubbo-admin-ui`
- `dubbo admin ui`由npm管理和构建，在开发环境中，可以单独运行: `npm run dev`
+ `dubbo-admin-ui`由npm管理和构建，在`dubbo-admin-ui`目录中，可以单独运行: `./node/npm run dev`
* 页面访问
- 访问 `http://localhost:8080`, 由于前后端分开部署，前端支持热加载，任何页面的修改都可以实时反馈，不需要重启应用。
+ 访问 `http://localhost:38082`, 由于前后端分开部署，前端支持热加载，任何页面的修改都可以实时反馈，不需要重启应用。
### 2.2.2 Swagger 支持
-部署完成后，可以访问 http://localhost:8080/swagger-ui.html 来查看所有的restful api
+部署完成后，可以访问 http://localhost:38080/swagger-ui.html 来查看所有的restful api
diff --git a/deploy/helm/dubbo-admin/templates/NOTES.txt b/deploy/helm/dubbo-admin/templates/NOTES.txt
index ca484a3..693bd37 100644
--- a/deploy/helm/dubbo-admin/templates/NOTES.txt
+++ b/deploy/helm/dubbo-admin/templates/NOTES.txt
@@ -17,6 +17,6 @@
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "dubbo-admin.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+ echo "Visit http://127.0.0.1:38080 to use your application"
+ kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 38080:$CONTAINER_PORT
{{- end }}
diff --git a/deploy/helm/dubbo-admin/templates/deployment.yaml b/deploy/helm/dubbo-admin/templates/deployment.yaml
index d9eaa80..960f78c 100644
--- a/deploy/helm/dubbo-admin/templates/deployment.yaml
+++ b/deploy/helm/dubbo-admin/templates/deployment.yaml
@@ -19,7 +19,7 @@
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- - containerPort: 8080
+ - containerPort: 38080
protocol: TCP
name: http
volumeMounts:
diff --git a/deploy/helm/dubbo-admin/values.yaml b/deploy/helm/dubbo-admin/values.yaml
index 7a1d7df..0a43bf9 100644
--- a/deploy/helm/dubbo-admin/values.yaml
+++ b/deploy/helm/dubbo-admin/values.yaml
@@ -39,7 +39,7 @@
service:
type: ClusterIP
- port: 8080
+ port: 38080
ingress:
enabled: false
diff --git a/deploy/k8s/deployment.yaml b/deploy/k8s/deployment.yaml
index 0cddb9d..2b8f572 100644
--- a/deploy/k8s/deployment.yaml
+++ b/deploy/k8s/deployment.yaml
@@ -18,7 +18,7 @@
- image: apache/dubbo-admin:latest
name: dubbo-admin
ports:
- - containerPort: 8080
+ - containerPort: 38080
volumeMounts:
- mountPath: /config
name: application-properties
diff --git a/deploy/k8s/service.yaml b/deploy/k8s/service.yaml
index a3e8252..bdcc445 100644
--- a/deploy/k8s/service.yaml
+++ b/deploy/k8s/service.yaml
@@ -7,5 +7,6 @@
app: dubbo-admin
ports:
- protocol: TCP
- port: 8080
- targetPort: 8080
\ No newline at end of file
+ port: 38080
+ targetPort: 38080
+
diff --git a/docker/stack.yml b/docker/stack.yml
index 0392bc1..7168206 100644
--- a/docker/stack.yml
+++ b/docker/stack.yml
@@ -25,7 +25,7 @@
depends_on:
- zookeeper
ports:
- - 8080:8080
+ - 38080:38080
# the db driver path
volumes:
- "/mnt/opt-libs:/opt-libs"
diff --git a/dubbo-admin-distribution/src/bin/config/application.properties b/dubbo-admin-distribution/src/bin/config/application.properties
index 618a2b0..0e3ff31 100644
--- a/dubbo-admin-distribution/src/bin/config/application.properties
+++ b/dubbo-admin-distribution/src/bin/config/application.properties
@@ -15,6 +15,10 @@
# limitations under the License.
#
+server.port=38080
+dubbo.protocol.port=30880
+dubbo.application.qos-port=32222
+
# centers in dubbo2.7, if you want to add parameters, please add them to the url
admin.registry.address=zookeeper://127.0.0.1:2181
admin.config-center=zookeeper://127.0.0.1:2181
diff --git a/dubbo-admin-server/src/main/resources/application.properties b/dubbo-admin-server/src/main/resources/application.properties
index 618a2b0..0e3ff31 100644
--- a/dubbo-admin-server/src/main/resources/application.properties
+++ b/dubbo-admin-server/src/main/resources/application.properties
@@ -15,6 +15,10 @@
# limitations under the License.
#
+server.port=38080
+dubbo.protocol.port=30880
+dubbo.application.qos-port=32222
+
# centers in dubbo2.7, if you want to add parameters, please add them to the url
admin.registry.address=zookeeper://127.0.0.1:2181
admin.config-center=zookeeper://127.0.0.1:2181
diff --git a/dubbo-admin-test/pom.xml b/dubbo-admin-test/pom.xml
index 6193514..d7b9e8a 100644
--- a/dubbo-admin-test/pom.xml
+++ b/dubbo-admin-test/pom.xml
@@ -224,7 +224,7 @@
<run>
<dependsOn>zookeeper</dependsOn>
<ports>
- <port>${dubbo-admin.port}:8080</port>
+ <port>${dubbo-admin.port}:38080</port>
</ports>
<env>
<admin.registry.address>zookeeper://zookeeper:2181
diff --git a/dubbo-admin-ui/vue.config.js b/dubbo-admin-ui/vue.config.js
index b4b6fa2..6aff3de 100644
--- a/dubbo-admin-ui/vue.config.js
+++ b/dubbo-admin-ui/vue.config.js
@@ -21,7 +21,7 @@
outputDir: "target/dist",
lintOnSave: "warning",
devServer: {
- port: 8082,
+ port: 38082,
historyApiFallback: {
rewrites: [
{from: /.*/, to: path.posix.join('/', 'index.html')},
@@ -30,7 +30,7 @@
publicPath: '/',
proxy: {
'/': {
- target: 'http://localhost:8080/',
+ target: 'http://localhost:38080/',
changeOrigin: true,
pathRewrite: {
'^/': '/'
