From be3cdbf58572d5db8abce45f1e4761037cd4d01b Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Sat, 19 Oct 2024 17:10:42 +0800
Subject: [PATCH] refactor

---
 internal/applicant/applicant.go                      |  9 +++++----
 ui/src/components/certimate/AccessEdit.tsx           |  4 ++--
 .../components/certimate/AccessHuaweicloudForm.tsx   | 12 ++++++------
 ui/src/domain/access.ts                              |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/internal/applicant/applicant.go b/internal/applicant/applicant.go
index c941a13c..60209b90 100644
--- a/internal/applicant/applicant.go
+++ b/internal/applicant/applicant.go
@@ -1,8 +1,6 @@
 package applicant
 
 import (
-	"certimate/internal/domain"
-	"certimate/internal/utils/app"
 	"crypto"
 	"crypto/ecdsa"
 	"crypto/elliptic"
@@ -18,12 +16,15 @@ import (
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/registration"
 	"github.com/pocketbase/pocketbase/models"
+
+	"certimate/internal/domain"
+	"certimate/internal/utils/app"
 )
 
 const (
 	configTypeAliyun      = "aliyun"
 	configTypeTencent     = "tencent"
-	configTypeHuaweicloud = "huaweicloud"
+	configTypeHuaweiCloud = "huaweicloud"
 	configTypeAws         = "aws"
 	configTypeCloudflare  = "cloudflare"
 	configTypeNamesilo    = "namesilo"
@@ -125,7 +126,7 @@ func Get(record *models.Record) (Applicant, error) {
 		return NewAliyun(option), nil
 	case configTypeTencent:
 		return NewTencent(option), nil
-	case configTypeHuaweicloud:
+	case configTypeHuaweiCloud:
 		return NewHuaweiCloud(option), nil
 	case configTypeAws:
 		return NewAws(option), nil
diff --git a/ui/src/components/certimate/AccessEdit.tsx b/ui/src/components/certimate/AccessEdit.tsx
index b265b15f..c49bad72 100644
--- a/ui/src/components/certimate/AccessEdit.tsx
+++ b/ui/src/components/certimate/AccessEdit.tsx
@@ -8,7 +8,7 @@ import { ScrollArea } from "@/components/ui/scroll-area";
 import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from "@/components/ui/select";
 import AccessAliyunForm from "./AccessAliyunForm";
 import AccessTencentForm from "./AccessTencentForm";
-import AccessHuaweicloudForm from "./AccessHuaweicloudForm";
+import AccessHuaweiCloudForm from "./AccessHuaweicloudForm";
 import AccessQiniuForm from "./AccessQiniuForm";
 import AccessAwsForm from "./AccessAwsForm";
 import AccessCloudflareForm from "./AccessCloudflareForm";
@@ -61,7 +61,7 @@ const AccessEdit = ({ trigger, op, data, className }: AccessEditProps) => {
       break;
     case "huaweicloud":
       form = (
-        <AccessHuaweicloudForm
+        <AccessHuaweiCloudForm
           data={data}
           op={op}
           onAfterReq={() => {
diff --git a/ui/src/components/certimate/AccessHuaweicloudForm.tsx b/ui/src/components/certimate/AccessHuaweicloudForm.tsx
index 2295beb8..41e4b165 100644
--- a/ui/src/components/certimate/AccessHuaweicloudForm.tsx
+++ b/ui/src/components/certimate/AccessHuaweicloudForm.tsx
@@ -8,17 +8,17 @@ import { Input } from "@/components/ui/input";
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
 import { Button } from "@/components/ui/button";
 import { PbErrorData } from "@/domain/base";
-import { Access, accessFormType, HuaweicloudConfig, getUsageByConfigType } from "@/domain/access";
+import { Access, accessFormType, HuaweiCloudConfig, getUsageByConfigType } from "@/domain/access";
 import { save } from "@/repository/access";
 import { useConfig } from "@/providers/config";
 
-type AccessHuaweicloudFormProps = {
+type AccessHuaweiCloudFormProps = {
   op: "add" | "edit" | "copy";
   data?: Access;
   onAfterReq: () => void;
 };
 
-const AccessHuaweicloudForm = ({ data, op, onAfterReq }: AccessHuaweicloudFormProps) => {
+const AccessHuaweiCloudForm = ({ data, op, onAfterReq }: AccessHuaweiCloudFormProps) => {
   const { addAccess, updateAccess } = useConfig();
   const { t } = useTranslation();
   const formSchema = z.object({
@@ -42,12 +42,12 @@ const AccessHuaweicloudForm = ({ data, op, onAfterReq }: AccessHuaweicloudFormPr
       .max(64, t("common.errmsg.string_max", { max: 64 })),
   });
 
-  let config: HuaweicloudConfig = {
+  let config: HuaweiCloudConfig = {
     region: "cn-north-1",
     accessKeyId: "",
     secretAccessKey: "",
   };
-  if (data) config = data.config as HuaweicloudConfig;
+  if (data) config = data.config as HuaweiCloudConfig;
 
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
@@ -215,4 +215,4 @@ const AccessHuaweicloudForm = ({ data, op, onAfterReq }: AccessHuaweicloudFormPr
   );
 };
 
-export default AccessHuaweicloudForm;
+export default AccessHuaweiCloudForm;
diff --git a/ui/src/domain/access.ts b/ui/src/domain/access.ts
index b1ebda88..9462fad1 100644
--- a/ui/src/domain/access.ts
+++ b/ui/src/domain/access.ts
@@ -48,7 +48,7 @@ export type Access = {
   config:
     | AliyunConfig
     | TencentConfig
-    | HuaweicloudConfig
+    | HuaweiCloudConfig
     | QiniuConfig
     | AwsConfig
     | CloudflareConfig
@@ -73,7 +73,7 @@ export type TencentConfig = {
   secretKey: string;
 };
 
-export type HuaweicloudConfig = {
+export type HuaweiCloudConfig = {
   region: string;
   accessKeyId: string;
   secretAccessKey: string;