From 70ab0659a91aa47266f0909f9ddea2bb4c2cb113 Mon Sep 17 00:00:00 2001
From: zhaojing1987 <jing.zhao@websoft9.com>
Date: Wed, 20 May 2026 15:55:09 +0800
Subject: [PATCH 1/2] fix: align rocketmq proxy ports

---
 apps/rocketmq/.env               | 14 ++++++++++----
 apps/rocketmq/docker-compose.yml | 22 +++++++---------------
 apps/rocketmq/variables.json     |  3 ++-
 i18n/translation.json            |  8 ++++++++
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/apps/rocketmq/.env b/apps/rocketmq/.env
index 4b70be69a..3e61c1ecf 100644
--- a/apps/rocketmq/.env
+++ b/apps/rocketmq/.env
@@ -4,10 +4,16 @@ W9_REPO=apache/rocketmq
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_ID='rocketmq'
-W9_HTTP_PORT=8080
-W9_HTTP_PORT_SET='8080'
+W9_PROXY_REMOTING_PORT_SET='8080'
+W9_PROXY_GRPC_PORT_SET='8081'
 #W9_DASHBOARD_PORT_SET=8090
-W9_BROKER_PORT_SET='10909'
 W9_NETWORK=websoft9
-W9_URL='appname.example.com'
+W9_URL='internet_ip:$W9_PROXY_GRPC_PORT_SET'
 #### --------------------------------------------------------------------------------------- ####
+export W9_REPO=apache/rocketmq
+export W9_VERSION=5.3.1
+export W9_ID=rocketmq
+export W9_PROXY_REMOTING_PORT_SET=8080
+export W9_PROXY_GRPC_PORT_SET=8081
+export W9_NETWORK=websoft9
+export W9_URL=internet_ip:
diff --git a/apps/rocketmq/docker-compose.yml b/apps/rocketmq/docker-compose.yml
index a6c1be759..f802ff3e7 100644
--- a/apps/rocketmq/docker-compose.yml
+++ b/apps/rocketmq/docker-compose.yml
@@ -11,12 +11,13 @@ services:
     # ports:
     #   - 9876:9876
     command: sh mqnamesrv
+
   broker:
     image: ${W9_REPO}:${W9_VERSION}
     container_name: ${W9_ID}-broker
     restart: unless-stopped
-    ports:
-      - ${W9_BROKER_PORT_SET}:10909
+    # ports:
+      # - 10909:10909
       # - 10911:10911
       # - 10912:10912
     environment:
@@ -24,30 +25,21 @@ services:
     depends_on:
       - namesrv
     command: sh mqbroker
+
   proxy:
-    image: apache/rocketmq:5.2.0
+    image: ${W9_REPO}:${W9_VERSION}
     container_name: ${W9_ID}
     env_file: .env
     depends_on:
       - broker
       - namesrv
     ports:
-      - ${W9_HTTP_PORT_SET}:8080
-      # - 8081:8081
+      - ${W9_PROXY_REMOTING_PORT_SET}:8080
+      - ${W9_PROXY_GRPC_PORT_SET}:8081
     restart: unless-stopped
     environment:
       - NAMESRV_ADDR=${W9_ID}-nameserver:9876
     command: sh mqproxy
-  # dashboard:
-  #   image: apacherocketmq/rocketmq-dashboard:latest
-  #   container_name: ${W9_ID}-dashboard
-  #   depends_on:
-  #     - namesrv
-  #   ports:
-  #     - ${W9_DASHBOARD_PORT_SET}:8080
-  #   restart: unless-stopped
-  #   environment:
-  #     - JAVA_OPTS=-Drocketmq.namesrv.addr=${W9_ID}-rmqnamesrv:9876
       
 networks:
   default:
diff --git a/apps/rocketmq/variables.json b/apps/rocketmq/variables.json
index 133506b89..5fe8b4f8b 100644
--- a/apps/rocketmq/variables.json
+++ b/apps/rocketmq/variables.json
@@ -8,6 +8,7 @@
     {
       "dist": "community",
       "version": [
+        "5.3.2",
         "5.3.1",
         "latest"
       ]
@@ -19,4 +20,4 @@
     "disk": "1",
     "url": "https://rocketmq.apache.org/docs/"
   }
-}
+}
\ No newline at end of file
diff --git a/i18n/translation.json b/i18n/translation.json
index 9f6c8de4f..6472eb951 100644
--- a/i18n/translation.json
+++ b/i18n/translation.json
@@ -363,6 +363,14 @@
         "PROXY PORT",
         "代理端口"
     ],
+    "W9_PROXY_REMOTING_PORT_SET": [
+        "RocketMQ Proxy Remoting Port",
+        "RocketMQ Proxy Remoting 端口"
+    ],
+    "W9_PROXY_GRPC_PORT_SET": [
+        "RocketMQ Proxy gRPC Port",
+        "RocketMQ Proxy gRPC 端口"
+    ],
     "W9_LOGIN_ConnectURL": [
         "LOGIN OONNECT URL",
         "登陆连接地址"

From e6b8827fd49e2368019b9f80a0b1b98ceb0d2a6d Mon Sep 17 00:00:00 2001
From: zhaojing1987 <jing.zhao@websoft9.com>
Date: Wed, 20 May 2026 15:58:23 +0800
Subject: [PATCH 2/2] fix: remove stray rocketmq env exports

---
 apps/rocketmq/.env | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/apps/rocketmq/.env b/apps/rocketmq/.env
index 3e61c1ecf..b11021b48 100644
--- a/apps/rocketmq/.env
+++ b/apps/rocketmq/.env
@@ -10,10 +10,3 @@ W9_PROXY_GRPC_PORT_SET='8081'
 W9_NETWORK=websoft9
 W9_URL='internet_ip:$W9_PROXY_GRPC_PORT_SET'
 #### --------------------------------------------------------------------------------------- ####
-export W9_REPO=apache/rocketmq
-export W9_VERSION=5.3.1
-export W9_ID=rocketmq
-export W9_PROXY_REMOTING_PORT_SET=8080
-export W9_PROXY_GRPC_PORT_SET=8081
-export W9_NETWORK=websoft9
-export W9_URL=internet_ip: