From 5c19f1dd7b9daf963245c33435fd0790aaac4f19 Mon Sep 17 00:00:00 2001
From: guqing <i@guqing.email>
Date: Fri, 24 Jun 2022 14:21:46 +0800
Subject: [PATCH] refactor: apple extension model

---
 .../java/io/github/guqing/template/Apple.java    | 16 ++++++++++++----
 src/main/resources/extensions/apple.yaml         |  9 +++++++++
 src/main/resources/extensions/roleTemplate.yaml  |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/extensions/apple.yaml

diff --git a/src/main/java/io/github/guqing/template/Apple.java b/src/main/java/io/github/guqing/template/Apple.java
index dbb7654..1de78c4 100644
--- a/src/main/java/io/github/guqing/template/Apple.java
+++ b/src/main/java/io/github/guqing/template/Apple.java
@@ -16,11 +16,19 @@ import run.halo.app.extension.GVK;
 @EqualsAndHashCode(callSuper = true)
 public class Apple extends AbstractExtension {
 
-    @Schema(required = true, minLength = 1)
-    private String varieties;
+    private AppleSpec spec;
 
-    private String color;
+    @Data
+    public static class AppleSpec {
 
-    private String size;
+        @Schema(required = true, minLength = 1)
+        private String varieties;
+
+        private String color;
+
+        private String size;
+
+        private String producingArea;
+    }
 }
 
diff --git a/src/main/resources/extensions/apple.yaml b/src/main/resources/extensions/apple.yaml
new file mode 100644
index 0000000..8406faa
--- /dev/null
+++ b/src/main/resources/extensions/apple.yaml
@@ -0,0 +1,9 @@
+apiVersion: apple.guqing.xyz/v1alpha1
+kind: Apple
+metadata:
+  name: Fuji-apple
+spec:
+  varieties: Fuji
+  color: red
+  size: middle
+  producingArea: China
diff --git a/src/main/resources/extensions/roleTemplate.yaml b/src/main/resources/extensions/roleTemplate.yaml
index 24896d9..114b40a 100644
--- a/src/main/resources/extensions/roleTemplate.yaml
+++ b/src/main/resources/extensions/roleTemplate.yaml
@@ -19,7 +19,7 @@ metadata:
   labels:
     plugin.halo.run/role-template: "true"
   annotations:
-    plugin.halo.run/dependencies: [ "role-template-apple-view" ]
+    plugin.halo.run/dependencies: "[ 'role-template-apple-view' ]"
     plugin.halo.run/module: "Apple Management"
     plugin.halo.run/alias-name: "苹果管理"
 rules: