From 42210ccf06806550eb451a0bff875b758248255c Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sat, 23 Apr 2022 15:23:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0=20Json=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B8=B8=E9=87=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

使用常量有助于防止弄混属性意义.
---
 src/main/kotlin/OracleServerExtension.kt | 10 +++++-----
 src/main/kotlin/Utils.kt                 | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/OracleServerExtension.kt b/src/main/kotlin/OracleServerExtension.kt
index dfc6414..32a1349 100644
--- a/src/main/kotlin/OracleServerExtension.kt
+++ b/src/main/kotlin/OracleServerExtension.kt
@@ -251,33 +251,33 @@ class OracleServerExtension(private val bot: BaseAbilityBot) : AbilityExtension
             .rowButton {
                 text("开机")
                 callbackData(upd.callbackQuery.callbackData.next("oc_server_power_query", jsonObjectOf {
-                    "power_action" += InstanceAction.START.actionValue
+                    JsonFields.PowerAction += InstanceAction.START.actionValue
                 }))
             }
             .newRow()
             .addButton {
                 text("重启（软重启）")
                 callbackData(upd.callbackQuery.callbackData.next("oc_server_power_query", jsonObjectOf {
-                    "power_action" += InstanceAction.SOFT_RESET.actionValue
+                    JsonFields.PowerAction += InstanceAction.SOFT_RESET.actionValue
                 }))
             }
             .addButton {
                 text("强制重启")
                 callbackData(upd.callbackQuery.callbackData.next("oc_server_power_query", jsonObjectOf {
-                    "power_action" += InstanceAction.RESET.actionValue
+                    JsonFields.PowerAction += InstanceAction.RESET.actionValue
                 }))
             }
             .newRow()
             .addButton {
                 text("关机（软关机）")
                 callbackData(upd.callbackQuery.callbackData.next("oc_server_power_query", jsonObjectOf {
-                    "power_action" += InstanceAction.SOFT_STOP.actionValue
+                    JsonFields.PowerAction += InstanceAction.SOFT_STOP.actionValue
                 }))
             }
             .addButton {
                 text("强制关机")
                 callbackData(upd.callbackQuery.callbackData.next("oc_server_power_query", jsonObjectOf {
-                    "power_action" += InstanceAction.STOP.actionValue
+                    JsonFields.PowerAction += InstanceAction.STOP.actionValue
                 }))
             }
             .then()
diff --git a/src/main/kotlin/Utils.kt b/src/main/kotlin/Utils.kt
index e9fdae2..1025be9 100644
--- a/src/main/kotlin/Utils.kt
+++ b/src/main/kotlin/Utils.kt
@@ -443,12 +443,32 @@ fun jsonObjectOf(jsonObject: JsonObject = JsonObject(), block: JsonObjectBuilder
 object JsonFields {
     /**
      * [OracleAccountProfile] 字段
+     * 类型为 [JsonObject]
      */
     const val AccountProfile = "account_profile"
 
     /**
      * [ServerInstance]
+     * 类型为 [JsonObject]
      */
     const val ServerInstance = "server_instance"
 
+    /**
+     * VCN 的 [OCID]
+     * 类型为 [String]
+     */
+    const val VcnId = "vcnId"
+
+    /**
+     * VCN 信息.
+     * 类型为 [JsonObject] => BMC.Vcn
+     */
+    const val VcnInfo = "vcn_info"
+
+    /**
+     * [InstanceAction] 的操作值
+     * 类型为 [String]
+     */
+    const val PowerAction = "power_action"
+
 }