opt: 适配yapi的type为数组的情况

Author: CiyLei

Plugin/src/com/ciy/plugin/modle/JsonSchemaBean.kt

@@ -3,7 +3,7 @@ package com.ciy.plugin.modle
 data class JsonSchemaBean(
     val title: String,
     val description: String,
-    val type: String,
+    val type: Any,
     val properties: Map<String, JsonSchemaBean>,
     val items: JsonSchemaBean,
     val required: List<String>

Plugin/src/com/ciy/plugin/ui/ShowErrorListDialog.form

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.ciy.plugin.ui.ShowErrorListDialog">
-  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
       <xy x="48" y="54" width="529" height="369"/>
@@ -11,7 +11,7 @@
       <grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -49,7 +49,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="e3588" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -66,18 +66,16 @@
               <text value="错误列表"/>
             </properties>
           </component>
-          <component id="4a49b" class="javax.swing.JList" binding="lsError">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
-            </constraints>
-            <properties>
-              <foreground color="-4518912"/>
-            </properties>
-          </component>
         </children>
       </grid>
+      <component id="11fb8" class="javax.swing.JTextArea" binding="taError">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="50"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>

Plugin/src/com/ciy/plugin/ui/ShowErrorListDialog.java

@@ -4,12 +4,13 @@
 import java.awt.event.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ShowErrorListDialog extends JDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JList lsError;
+    private JTextArea taError;
     private List<Throwable> errorList;
 
     public ShowErrorListDialog(List<Throwable> errorList) {
@@ -50,7 +51,7 @@ public void actionPerformed(ActionEvent e) {
             }
         }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 
-        lsError.setListData(errorList.toArray());
+        taError.setText(errorList.stream().map(it -> (it.toString() + "\n\n")).collect(Collectors.joining()));
     }
 
     private void onOK() {

Plugin/src/com/ciy/plugin/utils/ResponseModelGenerate.kt

@@ -117,8 +117,8 @@ object ResponseModelGenerate {
                 }
             }
             // 基本类型
-            "string", "integer", "boolean", "number", "String", "Integer", "Boolean", "Number" -> {
-                return PropertySpec.builder(name, getType(jsonSchema.type).copy(true)).initializer("null")
+            else -> {
+                return PropertySpec.builder(name, getType(jsonSchema.type.toString()).copy(true)).initializer("null")
                     .addKdoc(jsonSchema.description ?: "").mutable()
                     .build()
             }