diff --git a/src/views/applications/DatabaseApp/DatabaseAppCreateUpdate.vue b/src/views/applications/DatabaseApp/DatabaseAppCreateUpdate.vue
index ed53d7f8d..e23d79849 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppCreateUpdate.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppCreateUpdate.vue
@@ -4,11 +4,14 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
+import { getDatabaseTypeFieldsMap } from '@/views/applications/DatabaseApp/const'
 export default {
   components: {
     GenericCreateUpdatePage
   },
   data() {
+    const appType = this.$route.query.type || 'mysql'
+    const fieldsMap = getDatabaseTypeFieldsMap(appType)
     return {
       fields: [
         [this.$t('common.Basic'), ['name', 'type', 'domain']],
@@ -29,7 +32,7 @@ export default {
           }
         },
         attrs: {
-          fields: ['host', 'port', 'database'],
+          fields: fieldsMap,
           fieldsMeta: {
             host: {
               type: 'input'
diff --git a/src/views/applications/DatabaseApp/const.js b/src/views/applications/DatabaseApp/const.js
new file mode 100644
index 000000000..06a036285
--- /dev/null
+++ b/src/views/applications/DatabaseApp/const.js
@@ -0,0 +1,10 @@
+import { ORACLE } from '../const'
+
+export function getDatabaseTypeFieldsMap(type) {
+  switch (type) {
+    case ORACLE:
+      return ['host', 'port', 'database', 'version']
+    default:
+      return ['host', 'port', 'database']
+  }
+}
diff --git a/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue b/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue
index a7fd802de..b68bff897 100644
--- a/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue
+++ b/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue
@@ -23,7 +23,8 @@ export default {
           this.$t('applications.port'),
           [
             'http_port', 'https_port', 'ssh_port', 'rdp_port',
-            'mysql_port', 'mariadb_port', 'postgresql_port', 'redis_port'
+            'mysql_port', 'mariadb_port', 'postgresql_port', 'redis_port',
+            'oracle_11g_port', 'oracle_12c_port'
           ]
         ],
         [this.$t('common.Other'), ['comment']]
diff --git a/src/views/settings/Terminal/Endpoint/EndpointList.vue b/src/views/settings/Terminal/Endpoint/EndpointList.vue
index e8b92b5af..62e2de8b6 100644
--- a/src/views/settings/Terminal/Endpoint/EndpointList.vue
+++ b/src/views/settings/Terminal/Endpoint/EndpointList.vue
@@ -23,6 +23,7 @@ export default {
           'http_port', 'https_port', 'ssh_port',
           'rdp_port', 'mysql_port', 'mariadb_port',
           'postgresql_port', 'redis_port',
+          'oracle_11g_port', 'oracle_12c_port',
           'date_created', 'comment', 'actions'
         ],
         columnsShow: {