From b5c52620daaef41be6662ef8d571290748c9e933 Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Fri, 6 Dec 2019 14:06:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81API=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 37e5683ec4bd357b02aa9f0e562a57e249219bcd
---
 .../javafx/ctrl/OptionApiController.java      | 25 +++++++++++++++----
 .../javafx/manger/callable/ApiCallable.java   |  2 --
 src/main/resources/fxml/apiOption.fxml        |  1 +
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionApiController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionApiController.java
index 5b3c862d..b9fac975 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionApiController.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionApiController.java
@@ -396,7 +396,7 @@ public class OptionApiController {
                 return checkBoxTableCell;
             }
         });
-        columns.get(1).setCellValueFactory(new PropertyValueFactory("target"));
+        columns.get(1).setCellValueFactory(new PropertyValueFactory("module"));
         columns.get(1).setCellFactory(new Callback<TableColumn, TableCell>() {
             @Override
             public TableCell call(TableColumn param) {
@@ -411,7 +411,7 @@ public class OptionApiController {
                 return textFieldTableCell;
             }
         });
-        columns.get(2).setCellValueFactory(new PropertyValueFactory("method"));
+        columns.get(2).setCellValueFactory(new PropertyValueFactory("target"));
         columns.get(2).setCellFactory(new Callback<TableColumn, TableCell>() {
             @Override
             public TableCell call(TableColumn param) {
@@ -421,11 +421,12 @@ public class OptionApiController {
                         super.updateItem(item, empty);
                     }
                 };
+
                 textFieldTableCell.setEditable(false);
                 return textFieldTableCell;
             }
         });
-        columns.get(3).setCellValueFactory(new PropertyValueFactory("error"));
+        columns.get(3).setCellValueFactory(new PropertyValueFactory("method"));
         columns.get(3).setCellFactory(new Callback<TableColumn, TableCell>() {
             @Override
             public TableCell call(TableColumn param) {
@@ -439,7 +440,7 @@ public class OptionApiController {
                 return textFieldTableCell;
             }
         });
-        columns.get(4).setCellValueFactory(new PropertyValueFactory("request"));
+        columns.get(4).setCellValueFactory(new PropertyValueFactory("error"));
         columns.get(4).setCellFactory(new Callback<TableColumn, TableCell>() {
             @Override
             public TableCell call(TableColumn param) {
@@ -453,7 +454,7 @@ public class OptionApiController {
                 return textFieldTableCell;
             }
         });
-        columns.get(5).setCellValueFactory(new PropertyValueFactory("response"));
+        columns.get(5).setCellValueFactory(new PropertyValueFactory("request"));
         columns.get(5).setCellFactory(new Callback<TableColumn, TableCell>() {
             @Override
             public TableCell call(TableColumn param) {
@@ -467,6 +468,20 @@ public class OptionApiController {
                 return textFieldTableCell;
             }
         });
+        columns.get(6).setCellValueFactory(new PropertyValueFactory("response"));
+        columns.get(6).setCellFactory(new Callback<TableColumn, TableCell>() {
+            @Override
+            public TableCell call(TableColumn param) {
+                TextFieldTableCell textFieldTableCell = new TextFieldTableCell(new DefaultStringConverter()) {
+                    @Override
+                    public void updateItem(Object item, boolean empty) {
+                        super.updateItem(item, empty);
+                    }
+                };
+                textFieldTableCell.setEditable(false);
+                return textFieldTableCell;
+            }
+        });
         ObservableList<Api> ObservableList = FXCollections.observableArrayList();
         ObservableList.addAll(data);
         apis.setItems(ObservableList);
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/ApiCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/ApiCallable.java
index e2121183..10584d65 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/ApiCallable.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/ApiCallable.java
@@ -77,7 +77,6 @@ public class ApiCallable implements Callable {
                 File entity = new File(module, "ent");
                 entity.mkdirs();
 
-
                 try {
                     //region 生成request
                     JavaClassReader javaClassReader = new JavaClassReader(api.getRequestFile());
@@ -119,7 +118,6 @@ public class ApiCallable implements Callable {
                     e.printStackTrace();
                 }
 
-
                 try {
                     //region 生成response
                     JavaClassReader javaClassReader = new JavaClassReader(api.getResponseFile());
diff --git a/src/main/resources/fxml/apiOption.fxml b/src/main/resources/fxml/apiOption.fxml
index ac6f2abf..e4f323e4 100644
--- a/src/main/resources/fxml/apiOption.fxml
+++ b/src/main/resources/fxml/apiOption.fxml
@@ -46,6 +46,7 @@
                 <TableView fx:id="apis" prefHeight="270.0" prefWidth="700.0" BorderPane.alignment="CENTER">
                     <columns>
                         <TableColumn prefWidth="30.0" text="选择"/>
+                        <TableColumn prefWidth="80.0" text="模块"/>
                         <TableColumn prefWidth="80.0" text="对象"/>
                         <TableColumn prefWidth="80.0" text="方法"/>
                         <TableColumn prefWidth="80.0" text="信息"/>