diff --git a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
index a1a173928..643142a6b 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
@@ -46,6 +46,11 @@ export default {
             }
           }
         },
+        username: {
+          el: {
+            type: 'text'
+          }
+        },
         password: {
           component: UpdateToken
         },
@@ -69,6 +74,10 @@ export default {
       },
       url: `/api/v1/assets/gateways/`,
       hasDetailInMsg: false,
+      afterGetFormValue(formValue) {
+        formValue.username = formValue.username_display
+        return formValue
+      },
       getNextRoute(res, method) {
         const domain = res.domain
         const route = {
@@ -91,7 +100,6 @@ export default {
     }
   },
   mounted() {
-    console.log('---', this.object)
   },
   methods: {
   }
diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue
index 4f934720d..673113a0b 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayList.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue
@@ -55,21 +55,22 @@ export default {
     return {
       tableConfig: {
         url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}`,
-        columns: ['name', 'ip', 'port', 'protocol', 'username', 'comment', 'actions'],
+        columns: ['name', 'address', 'port', 'username_display', 'comment', 'actions'],
         columnsMeta: {
           name: {
             sortable: 'custom',
             formatter: DisplayFormatter
           },
-          ip: {
+          address: {
             width: '140px'
           },
           port: {
-            width: '60px'
-          },
-          protocol: {
-            sortable: 'custom',
-            width: '100px'
+            width: '120px',
+            label: this.$t('assets.SshPort'),
+            formatter: (row) => {
+              console.log('row', row)
+              return row.protocols ? row.protocols[0].port : '-'
+            }
           },
           actions: {
             formatterArgs: {