Former-commit-id: 1e53f431ff8a6f715ba39aee9de401b209f4e990
master
王兵 5 years ago
parent 0c39560fd2
commit 4b3e30d449

@ -207,6 +207,12 @@ public class MainController {
Dialog.showApi(); Dialog.showApi();
} }
@FXML
public void generateDoc(ActionEvent actionEvent) {
Dialog.showDoc();
}
@FXML @FXML
public void generateAndroid(ActionEvent actionEvent) { public void generateAndroid(ActionEvent actionEvent) {
Dialog.showAndroid(); Dialog.showAndroid();

@ -0,0 +1,521 @@
package xyz.wbsite.dbtool.javafx.ctrl;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.util.Callback;
import javafx.util.converter.DefaultStringConverter;
import xyz.wbsite.dbtool.javafx.po.Api;
import xyz.wbsite.dbtool.javafx.po.ApiMethod;
import xyz.wbsite.dbtool.javafx.po.Doc;
import xyz.wbsite.dbtool.javafx.tool.ApiClassReader;
import xyz.wbsite.dbtool.javafx.tool.DocClassReader;
import xyz.wbsite.dbtool.javafx.tool.Tool;
import xyz.wbsite.dbtool.javafx.view.DBCheckBoxTableCell;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class OptionDocController {
@FXML
private TextField modulePath;
@FXML
private TextField docPath;
@FXML
private Button selectModulePath;
@FXML
private Button selectDocPath;
@FXML
private Button start;
@FXML
private Button cancel;
@FXML
private TableView apis;
@FXML
private CheckBox AjaxDoc;
@FXML
private CheckBox ApiDoc;
@FXML
private List<Doc> data = new ArrayList<>();
public Button getSelectModulePath() {
return selectModulePath;
}
public void setSelectModulePath(Button selectModulePath) {
this.selectModulePath = selectModulePath;
}
public Button getSelectDocPath() {
return selectDocPath;
}
public void setSelectDocPath(Button selectDocPath) {
this.selectDocPath = selectDocPath;
}
public List<Doc> getData() {
return data;
}
public void setData(List<Doc> data) {
this.data = data;
}
public TextField getModulePath() {
return modulePath;
}
public void setModulePath(TextField modulePath) {
this.modulePath = modulePath;
}
public TextField getDocPath() {
return docPath;
}
public void setDocPath(TextField docPath) {
this.docPath = docPath;
}
public Button getStart() {
return start;
}
public void setStart(Button start) {
this.start = start;
}
public Button getCancel() {
return cancel;
}
public void setCancel(Button cancel) {
this.cancel = cancel;
}
public TableView getApis() {
return apis;
}
public void setApis(TableView apis) {
this.apis = apis;
}
public CheckBox getAjaxDoc() {
return AjaxDoc;
}
public void setAjaxDoc(CheckBox ajaxDoc) {
AjaxDoc = ajaxDoc;
}
public CheckBox getApiDoc() {
return ApiDoc;
}
public void setApiDoc(CheckBox apiDoc) {
ApiDoc = apiDoc;
}
public void load() {
File moduleFile = new File(modulePath.getText());
data.clear();
if (moduleFile.exists()) {
List<File> actionPath = Tool.find(moduleFile, "action");
if (actionPath.size() == 0) {
return;
}
File ajaxPath = Tool.createPath(actionPath.get(0), "ajax");
for (File file : ajaxPath.listFiles()) {
String module = file.getName();
for (File tar : file.listFiles()) {
try {
String target = tar.getName().replaceAll("Ajax$", "").replaceAll(".java", "");
DocClassReader docClassReader = new DocClassReader(tar);
for (ApiMethod apiMethod : docClassReader.getMethodList()) {
Doc doc = new Doc();
doc.setType("Ajax");
doc.setModule(module);
doc.setTarget(target);
doc.setRequest(apiMethod.getRequest());
doc.setResponse(apiMethod.getResponse());
doc.setMethod(apiMethod.getMethod());
List<File> reqFiles = Tool.findRequest(moduleFile, apiMethod.getRequest() + ".java");
if (reqFiles.size() == 0) {
doc.setError(doc.getError() + "未找到请求");
} else if (reqFiles.size() > 1) {
doc.setError(doc.getError() + "找到多个请求");
} else {
doc.setRequestFile(reqFiles.get(0));
//查找依赖ent
List<String> entities = findEntities(reqFiles.get(0));
for (String entity : entities) {
doc.getDepEnt().add(entity);
}
//查找依赖req
List<String> reqss = findReq(reqFiles.get(0));
for (String string : reqss) {
doc.getDepReq().add(string);
}
}
List<File> rspfiles = Tool.findResponse(moduleFile, apiMethod.getResponse() + ".java");
if (rspfiles.size() == 0) {
doc.setError(doc.getError() + "未找到响应");
} else if (rspfiles.size() > 1) {
doc.setError(doc.getError() + "找到多个响应");
} else {
doc.setResponseFile(rspfiles.get(0));
//查找依赖ent
List<String> entities = findEntities(rspfiles.get(0));
for (String entity : entities) {
doc.getDepEnt().add(entity);
}
//查找依赖req
List<String> reqss = findReq(rspfiles.get(0));
for (String string : reqss) {
doc.getDepReq().add(string);
}
}
doc.setCheck(true);
data.add(doc);
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
File apiPath = Tool.createPath(actionPath.get(0), "api");
for (File file : apiPath.listFiles()) {
String module = file.getName();
for (File tar : file.listFiles()) {
try {
String target = tar.getName().replaceAll("Api$", "").replaceAll(".java", "");
DocClassReader docClassReader = new DocClassReader(tar);
for (ApiMethod apiMethod : docClassReader.getMethodList()) {
Doc doc = new Doc();
doc.setType("Api");
doc.setModule(module);
doc.setTarget(target);
doc.setRequest(apiMethod.getRequest());
doc.setResponse(apiMethod.getResponse());
doc.setMethod(apiMethod.getMethod());
List<File> reqFiles = Tool.findRequest(moduleFile, apiMethod.getRequest() + ".java");
if (reqFiles.size() == 0) {
doc.setError(doc.getError() + "未找到请求");
} else if (reqFiles.size() > 1) {
doc.setError(doc.getError() + "找到多个请求");
} else {
doc.setRequestFile(reqFiles.get(0));
//查找依赖ent
List<String> entities = findEntities(reqFiles.get(0));
for (String entity : entities) {
doc.getDepEnt().add(entity);
}
//查找依赖req
List<String> reqss = findReq(reqFiles.get(0));
for (String string : reqss) {
doc.getDepReq().add(string);
}
}
List<File> rspfiles = Tool.findResponse(moduleFile, apiMethod.getResponse() + ".java");
if (rspfiles.size() == 0) {
doc.setError(doc.getError() + "未找到响应");
} else if (rspfiles.size() > 1) {
doc.setError(doc.getError() + "找到多个响应");
} else {
doc.setResponseFile(rspfiles.get(0));
//查找依赖ent
List<String> entities = findEntities(rspfiles.get(0));
for (String entity : entities) {
doc.getDepEnt().add(entity);
}
//查找依赖req
List<String> reqss = findReq(rspfiles.get(0));
for (String string : reqss) {
doc.getDepReq().add(string);
}
}
doc.setCheck(true);
data.add(doc);
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
initData();
}
}
public List<String> findEntities(File file) {
ArrayList<String> strings = new ArrayList<>();
InputStreamReader read = null;//考虑到编码格式
try {
read = new InputStreamReader(new FileInputStream(file), "UTF-8");
BufferedReader bufferedReader = new BufferedReader(read);
String line = null;
while ((line = bufferedReader.readLine()) != null) {
//指定字符串判断处
if (line.contains(".ent.")) {
Pattern compile = Pattern.compile(".*\\.ent\\.(.*);");
Matcher matcher = compile.matcher(line);
if (matcher.find()) {
String group = matcher.group(1);
strings.add(group);
// System.out.println(group);
}
}
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return strings;
}
public List<String> findReq(File file) {
ArrayList<String> strings = new ArrayList<>();
InputStreamReader read = null;//考虑到编码格式
try {
read = new InputStreamReader(new FileInputStream(file), "UTF-8");
BufferedReader bufferedReader = new BufferedReader(read);
String line = null;
Pattern compile1 = Pattern.compile(".*private\\s([a-zA-Z_]*Request)\\s[a-zA-Z_]*Request;.*");
Pattern compile2 = Pattern.compile(".*private\\sList<([a-zA-Z_]*Request)>\\s[a-zA-Z_]*Requests;.*");
Pattern compile3 = Pattern.compile(".*private\\sList<([a-zA-Z_]*Request)>\\s[a-zA-Z_]*RequestList;.*");
while ((line = bufferedReader.readLine()) != null) {
//携带一个Request
if (line.matches(".*private\\s([a-zA-Z_]*Request)\\s[a-zA-Z_]*Request;.*")) {
Matcher matcher = compile1.matcher(line);
if (matcher.find()) {
String group = matcher.group(1);
strings.add(group);
System.out.println(group);
}
}
//携带一个List<*Request> *Requests;
if (line.matches(".*private\\sList<([a-zA-Z_]*Request)>\\s[a-zA-Z_]*Requests;.*")) {
Matcher matcher = compile2.matcher(line);
if (matcher.find()) {
String group = matcher.group(1);
strings.add(group);
System.out.println(group);
}
}
//携带一个List<*Request> *RequestList;
if (line.matches(".*private\\sList<([a-zA-Z_]*Request)>\\s[a-zA-Z_]*RequestList;.*")) {
Matcher matcher = compile3.matcher(line);
if (matcher.find()) {
String group = matcher.group(1);
strings.add(group);
System.out.println(group);
}
}
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return strings;
}
public void initData() {
apis.setEditable(true);
apis.setSortPolicy(new Callback<TableView, Boolean>() {
@Override
public Boolean call(TableView param) {
//禁止点击列头排序
return false;
}
});
ObservableList<TableColumn> columns = apis.getColumns();
columns.get(0).setCellValueFactory(new PropertyValueFactory("check"));
columns.get(0).setCellFactory(new Callback<TableColumn, TableCell>() {
@Override
public TableCell call(TableColumn param) {
final DBCheckBoxTableCell checkBoxTableCell = new DBCheckBoxTableCell();
DBCheckBoxTableCell.sCallback sCallback = checkBoxTableCell.new sCallback() {
@Override
public ObservableValue<Boolean> call(Integer param) {
super.call(param);
if (data.get(param).isCheck()) {
return new SimpleBooleanProperty(true);
} else {
return new SimpleBooleanProperty(false);
}
}
};
checkBoxTableCell.setSelectedStateCallback(sCallback);
checkBoxTableCell.setOnChangeListener(new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
int param1 = checkBoxTableCell.getParam();
Doc api = data.get(param1);
api.setCheck(newValue);
}
});
return checkBoxTableCell;
}
});
columns.get(1).setCellValueFactory(new PropertyValueFactory("type"));
columns.get(1).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;
}
});
columns.get(2).setCellValueFactory(new PropertyValueFactory("module"));
columns.get(2).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;
}
});
columns.get(3).setCellValueFactory(new PropertyValueFactory("target"));
columns.get(3).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;
}
});
columns.get(4).setCellValueFactory(new PropertyValueFactory("method"));
columns.get(4).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;
}
});
columns.get(5).setCellValueFactory(new PropertyValueFactory("error"));
columns.get(5).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;
}
});
columns.get(6).setCellValueFactory(new PropertyValueFactory("request"));
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;
}
});
columns.get(7).setCellValueFactory(new PropertyValueFactory("response"));
columns.get(7).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<Doc> ObservableList = FXCollections.observableArrayList();
ObservableList.addAll(data);
apis.setItems(ObservableList);
}
}

@ -3,12 +3,14 @@ package xyz.wbsite.dbtool.javafx.manger;
import org.springframework.boot.system.ApplicationHome; import org.springframework.boot.system.ApplicationHome;
import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable; import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable; import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.DocCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable; import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootServiceCallable; import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootServiceCallable;
import xyz.wbsite.dbtool.javafx.manger.callable.VueCallable; import xyz.wbsite.dbtool.javafx.manger.callable.VueCallable;
import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper; import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper;
import xyz.wbsite.dbtool.javafx.po.AndroidOption; import xyz.wbsite.dbtool.javafx.po.AndroidOption;
import xyz.wbsite.dbtool.javafx.po.Api; import xyz.wbsite.dbtool.javafx.po.Api;
import xyz.wbsite.dbtool.javafx.po.Doc;
import xyz.wbsite.dbtool.javafx.po.Field; import xyz.wbsite.dbtool.javafx.po.Field;
import xyz.wbsite.dbtool.javafx.po.FieldType; import xyz.wbsite.dbtool.javafx.po.FieldType;
import xyz.wbsite.dbtool.javafx.po.Module; import xyz.wbsite.dbtool.javafx.po.Module;
@ -408,6 +410,35 @@ public class ProjectManager {
} }
} }
public void generateDoc(File module, File api, List<Doc> apis) {
if (module.exists()) {
Dialog.showProgress("生成中...");
service.execute(new Runnable() {
@Override
public void run() {
boolean mkdirs = api.mkdirs();
DocCallable docCallable = new DocCallable(module, api, apis);
Future submit = service.submit(docCallable);
try {
Boolean b = (Boolean) submit.get();
if (!b) {
Dialog.showError("请确认目录结构是否存在或正确!");
}
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
e.printStackTrace();
}
Dialog.stopPopup();
Dialog.showSuccess("Api生成完毕.");
}
});
}
}
public void generate(final String path, AndroidOption option) { public void generate(final String path, AndroidOption option) {
Dialog.showProgress("生成中..."); Dialog.showProgress("生成中...");
new Thread() { new Thread() {

@ -0,0 +1,81 @@
package xyz.wbsite.dbtool.javafx.manger.callable;
import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager;
import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
import xyz.wbsite.dbtool.javafx.po.Doc;
import xyz.wbsite.dbtool.javafx.tool.RequestReader;
import xyz.wbsite.dbtool.javafx.tool.ResponseReader;
import xyz.wbsite.dbtool.javafx.tool.Tool;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
public class DocCallable implements Callable {
private File module;
private File docFile;
private List<Doc> ajaxDocList;
private List<Doc> apiDocList;
private Tool tool = new Tool();
File docModule;
private FreeMarkerManager freeMarkerManager;
public DocCallable(File module, File docFile, List<Doc> docList) {
this.module = module;
this.docFile = docFile;
this.ajaxDocList = docList;
this.apiDocList = docList;
this.freeMarkerManager = ManagerFactory.getFreeMarkerManager();
}
public Boolean call() throws Exception {
if (!docFile.exists()) {
docFile.mkdir();
} else {
Tool.clear(docFile);
}
List<Doc> ajaxList = new ArrayList<>();
List<Doc> apiList = new ArrayList<>();
for (Doc doc : ajaxDocList) {
if ("ajax".equals(doc.getType())) {
ajaxList.add(doc);
}
if ("api".equals(doc.getType())) {
apiList.add(doc);
}
}
if (ajaxList.size() > 0) {
File ajax = Tool.createPath(this.docFile, "ajax");
for (Doc doc : ajaxList) {
if (doc.isCheck()) {
RequestReader requestReader = new RequestReader(doc.getRequestFile());
// generateRequest(requestReader);
ResponseReader responseReader = new ResponseReader(doc.getResponseFile());
// generateResponse(responseReader);
}
}
}
if (apiList.size() > 0) {
File api = Tool.createPath(this.docFile, "api");
for (Doc doc : apiList) {
if (doc.isCheck()) {
RequestReader requestReader = new RequestReader(doc.getRequestFile());
// generateRequest(requestReader);
ResponseReader responseReader = new ResponseReader(doc.getResponseFile());
// generateResponse(responseReader);
}
}
}
System.out.println("finish");
return true;
}
}

@ -0,0 +1,122 @@
package xyz.wbsite.dbtool.javafx.po;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
public class Doc {
private boolean check;
private String type;
//目标请求对象
private String request;
//目标请求响应
private String response;
private String module;
private String target;
private String method;
private File requestFile;
private File responseFile;
private Set<String> depReq = new HashSet<>();
private Set<String> depEnt = new HashSet<>();
private String error = "";
public boolean isCheck() {
return check;
}
public void setCheck(boolean check) {
this.check = check;
}
public String getRequest() {
return request;
}
public void setRequest(String request) {
this.request = request;
}
public String getResponse() {
return response;
}
public void setResponse(String response) {
this.response = response;
}
public String getModule() {
return module;
}
public void setModule(String module) {
this.module = module;
}
public String getTarget() {
return target;
}
public void setTarget(String target) {
this.target = target;
}
public String getMethod() {
return method;
}
public void setMethod(String method) {
this.method = method;
}
public File getRequestFile() {
return requestFile;
}
public void setRequestFile(File requestFile) {
this.requestFile = requestFile;
}
public File getResponseFile() {
return responseFile;
}
public void setResponseFile(File responseFile) {
this.responseFile = responseFile;
}
public Set<String> getDepReq() {
return depReq;
}
public void setDepReq(Set<String> depReq) {
this.depReq = depReq;
}
public Set<String> getDepEnt() {
return depEnt;
}
public void setDepEnt(Set<String> depEnt) {
this.depEnt = depEnt;
}
public String getError() {
return error;
}
public void setError(String error) {
this.error = error;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}

@ -510,6 +510,141 @@ public class Dialog {
} }
} }
public static void showDoc() {
Stage stage = new Stage();
stage.initModality(Modality.APPLICATION_MODAL);
FXMLLoader dbdetailloader = new FXMLLoader(Application.class.getResource("../../../fxml/OptionDoc.fxml"));
try {
dbdetailloader.load();
Parent root = dbdetailloader.getRoot();
Scene scene = new Scene(root);
stage.setScene(scene);
stage.setTitle("Doc生成");
OptionDocController controller = dbdetailloader.getController();
TextField modulePath = controller.getModulePath();
TextField docPath = controller.getDocPath();
TableView apis = controller.getApis();
controller.getSelectModulePath().setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent event) {
DirectoryChooser directoryChooser = new DirectoryChooser();
Stage stage = new Stage();
stage.setAlwaysOnTop(true);
File file = directoryChooser.showDialog(stage);
if (file == null) {
return;
}
modulePath.setText(file.getAbsolutePath());
String projectName = "";
// 尝试查找Windows下的项目名称
String path = file.getAbsolutePath();
String pathReplace = Tool.replaceSeparator(path, "#");
Pattern compile = Pattern.compile("#([^#]*)#src#main#java#");
Matcher matcher = compile.matcher(pathReplace);
if (matcher.find()) {
projectName = matcher.group(1);
}
docPath.setText(new File(ProjectManager.getPath(), projectName + "-doc").getAbsolutePath());
}
});
controller.getSelectDocPath().setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent event) {
DirectoryChooser directoryChooser = new DirectoryChooser();
Stage stage = new Stage();
File file = directoryChooser.showDialog(stage);
if (file == null) {
return;
}
String text = modulePath.getText();
File moduleFile = new File(text);
docPath.setText(new File(file.getAbsolutePath(), moduleFile.getName() + "-doc").getAbsolutePath());
System.out.println(file.getAbsolutePath());
}
});
docPath.requestFocus();
modulePath.textProperty().addListener(new ChangeListener<String>() {
@Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
Dialog.showProgress("初始化面板");
Callable<Object> callable = Executors.callable(new Runnable() {
@Override
public void run() {
controller.load();
Dialog.stopPopup();
}
});
Executors.newSingleThreadExecutor().submit(callable);
}
});
ProjectManager dBmanger = ManagerFactory.getProjectManager();
File file = dBmanger.getPath();
File[] files = file.listFiles();
s:
for (File f : files) {
if (!f.getName().contains(".")) {
File modul = findAction(f);
if (modul == null) {
modulePath.setText("");
docPath.setText("");
} else {
modulePath.setText(f.getAbsolutePath());
docPath.setText(new File(ProjectManager.getPath(), f.getName() + "-doc").getAbsolutePath());
break s;
}
}
}
Button start = controller.getStart();
start.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent event) {
String module = controller.getModulePath().getText();
String api = controller.getDocPath().getText();
if (new File(module).exists()) {
Dialog.showProgress("生成中...");
dBmanger.generateDoc(new File(module), new File(api), controller.getData());
Dialog.stopPopup();
Platform.runLater(new Runnable() {
@Override
public void run() {
stage.close();
}
});
} else {
Dialog.showConfirmDialog("项目不存在!");
}
}
});
Button cancel = controller.getCancel();
cancel.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent event) {
stage.close();
}
});
stage.show();
} catch (IOException e) {
e.printStackTrace();
}
}
public static void showAndroid() { public static void showAndroid() {
FXMLLoader dbdetailloader = new FXMLLoader(Application.class.getResource("../../../fxml/androidOption.fxml")); FXMLLoader dbdetailloader = new FXMLLoader(Application.class.getResource("../../../fxml/androidOption.fxml"));
try { try {

@ -0,0 +1,67 @@
package xyz.wbsite.dbtool.javafx.tool;
import xyz.wbsite.dbtool.javafx.po.ApiMethod;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class DocClassReader {
private File javaClass;
private List<ApiMethod> methodList;
public DocClassReader(File javaClass) throws IOException {
this.javaClass = javaClass;
methodList = new ArrayList<>();
read();
}
private void read() throws IOException {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(javaClass), "utf-8"));
String line = null;
Pattern compile = Pattern.compile("\\s+public (.*Response)\\s+(.*)\\((.*Request) request.*\\) \\{");
while ((line = bufferedReader.readLine()) != null) {
Matcher matcher = compile.matcher(line);
if (matcher.find()) {
ApiMethod apiMethod = new ApiMethod();
apiMethod.setResponse(matcher.group(1));
apiMethod.setMethod(matcher.group(2));
apiMethod.setRequest(matcher.group(3));
methodList.add(apiMethod);
}
}
bufferedReader.close();
}
public File getJavaClass() {
return javaClass;
}
public void setJavaClass(File javaClass) {
this.javaClass = javaClass;
}
public List<ApiMethod> getMethodList() {
return methodList;
}
public void setMethodList(List<ApiMethod> methodList) {
this.methodList = methodList;
}
public static void main(String[] args) throws IOException {
DocClassReader javaClassReader = new DocClassReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\action\\api\\system\\DictApi.java"));
System.out.println();
}
}

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.OptionDocController"
maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0"
xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<top>
<GridPane prefHeight="65.0" prefWidth="601.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="295.0" minWidth="10.0" prefWidth="90.0"/>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="496.0" minWidth="10.0" prefWidth="425.0"/>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="496.0" minWidth="10.0" prefWidth="88.0"/>
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="38.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints maxHeight="33.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
</rowConstraints>
<children>
<Label maxHeight="-Infinity" maxWidth="-Infinity" text="模块路径" GridPane.halignment="CENTER"
GridPane.valignment="CENTER"/>
<Label text="生成路径" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER"/>
<TextField GridPane.columnIndex="1" fx:id="modulePath" promptText="...\**\module\"/>
<TextField GridPane.columnIndex="1" fx:id="docPath" GridPane.rowIndex="1"/>
<Button mnemonicParsing="false" fx:id="selectModulePath" text="选择路径" GridPane.columnIndex="2"
GridPane.halignment="CENTER"
GridPane.valignment="CENTER"/>
<Button mnemonicParsing="false" fx:id="selectDocPath" text="选择路径" GridPane.columnIndex="2"
GridPane.halignment="CENTER"
GridPane.rowIndex="1" GridPane.valignment="CENTER"/>
</children>
<opaqueInsets>
<Insets/>
</opaqueInsets>
</GridPane>
</top>
<opaqueInsets>
<Insets/>
</opaqueInsets>
<center>
<BorderPane>
<center>
<TableView fx:id="apis" prefHeight="270.0" prefWidth="700.0" BorderPane.alignment="CENTER">
<columns>
<TableColumn prefWidth="30.0" text="选择"/>
<TableColumn prefWidth="50.0" text="类型"/>
<TableColumn prefWidth="80.0" text="模块"/>
<TableColumn prefWidth="80.0" text="对象"/>
<TableColumn prefWidth="80.0" text="方法"/>
<TableColumn prefWidth="80.0" text="信息"/>
<TableColumn prefWidth="150.0" text="请求"/>
<TableColumn prefWidth="150.0" text="响应"/>
</columns>
</TableView>
</center>
<top>
<ToolBar prefHeight="30.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<items>
<CheckBox mnemonicParsing="false" fx:id="AjaxDoc" text="AjaxDoc" selected="true">
</CheckBox>
<CheckBox mnemonicParsing="false" fx:id="ApiDoc" text="ApiDoc" selected="true">
</CheckBox>
</items>
</ToolBar>
</top>
<BorderPane.margin>
<Insets top="20.0"/>
</BorderPane.margin>
</BorderPane>
</center>
<bottom>
<GridPane prefHeight="45.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
</rowConstraints>
<children>
<Button fx:id="start" mnemonicParsing="false" text="确认" GridPane.halignment="CENTER"
GridPane.valignment="CENTER"/>
<Button fx:id="cancel" mnemonicParsing="false" text="取消" GridPane.columnIndex="1"
GridPane.halignment="CENTER"
GridPane.valignment="CENTER"/>
</children>
</GridPane>
</bottom>
</BorderPane>

@ -37,6 +37,7 @@
<MenuItem mnemonicParsing="false" onAction="#generateVue" text="生成Vue"/> <MenuItem mnemonicParsing="false" onAction="#generateVue" text="生成Vue"/>
<MenuItem mnemonicParsing="false" onAction="#generateAndroid" text="生成Android"/> <MenuItem mnemonicParsing="false" onAction="#generateAndroid" text="生成Android"/>
<MenuItem mnemonicParsing="false" onAction="#generateService" text="生成Service"/> <MenuItem mnemonicParsing="false" onAction="#generateService" text="生成Service"/>
<MenuItem mnemonicParsing="false" onAction="#generateDoc" text="生成Doc"/>
</items> </items>
</Menu> </Menu>
<Menu mnemonicParsing="false" text="Help"> <Menu mnemonicParsing="false" text="Help">

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -35,36 +35,36 @@ public class DeptAjax {
@Autowired @Autowired
private DeptManager deptManager; private DeptManager deptManager;
public DeptCreateResponse create(DeptCreateRequest request, Token token) { public DeptCreateResponse create(DeptCreateRequest request) {
return deptManager.create(request, token); return deptManager.create(request, LocalData.getToken());
} }
public DeptDeleteResponse delete(DeptDeleteRequest request, Token token) { public DeptDeleteResponse delete(DeptDeleteRequest request) {
return deptManager.delete(request, token); return deptManager.delete(request, LocalData.getToken());
} }
public DeptUpdateResponse update(DeptUpdateRequest request, Token token) { public DeptUpdateResponse update(DeptUpdateRequest request) {
return deptManager.update(request, token); return deptManager.update(request, LocalData.getToken());
} }
public DeptFindResponse find(DeptFindRequest request, Token token) { public DeptFindResponse find(DeptFindRequest request) {
return deptManager.find(request, token); return deptManager.find(request, LocalData.getToken());
} }
public DeptGetResponse get(DeptGetRequest request, Token token) { public DeptGetResponse get(DeptGetRequest request) {
return deptManager.get(request, token); return deptManager.get(request, LocalData.getToken());
} }
public DeptTreeResponse tree(DeptTreeRequest request, Token token) { public DeptTreeResponse tree(DeptTreeRequest request) {
return deptManager.tree(request, token); return deptManager.tree(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(Dept.class)); return ResponseUtil.apply(new WExcel<>(Dept.class));
} }
public Object exports(DeptFindRequest request, Token token) { public Object exports(DeptFindRequest request) {
DeptFindResponse response = deptManager.find(request, token); DeptFindResponse response = deptManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -35,36 +35,36 @@ public class DictAjax {
@Autowired @Autowired
private DictManager dictManager; private DictManager dictManager;
public DictCreateResponse create(DictCreateRequest request, Token token) { public DictCreateResponse create(DictCreateRequest request) {
return dictManager.create(request, token); return dictManager.create(request, LocalData.getToken());
} }
public DictDeleteResponse delete(DictDeleteRequest request, Token token) { public DictDeleteResponse delete(DictDeleteRequest request) {
return dictManager.delete(request, token); return dictManager.delete(request, LocalData.getToken());
} }
public DictUpdateResponse update(DictUpdateRequest request, Token token) { public DictUpdateResponse update(DictUpdateRequest request) {
return dictManager.update(request, token); return dictManager.update(request, LocalData.getToken());
} }
public DictFindResponse find(DictFindRequest request, Token token) { public DictFindResponse find(DictFindRequest request) {
return dictManager.find(request, token); return dictManager.find(request, LocalData.getToken());
} }
public DictGetResponse get(DictGetRequest request, Token token) { public DictGetResponse get(DictGetRequest request) {
return dictManager.get(request, token); return dictManager.get(request, LocalData.getToken());
} }
public DictLoadResponse load(DictLoadRequest request, Token token) { public DictLoadResponse load(DictLoadRequest request) {
return dictManager.load(request, token); return dictManager.load(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(Dict.class)); return ResponseUtil.apply(new WExcel<>(Dict.class));
} }
public Object exports(DictFindRequest request, Token token) { public Object exports(DictFindRequest request) {
DictFindResponse response = dictManager.find(request, token); DictFindResponse response = dictManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -33,32 +33,32 @@ public class DictItemAjax {
@Autowired @Autowired
private DictItemManager dictItemManager; private DictItemManager dictItemManager;
public DictItemCreateResponse create(DictItemCreateRequest request, Token token) { public DictItemCreateResponse create(DictItemCreateRequest request) {
return dictItemManager.create(request, token); return dictItemManager.create(request, LocalData.getToken());
} }
public DictItemDeleteResponse delete(DictItemDeleteRequest request, Token token) { public DictItemDeleteResponse delete(DictItemDeleteRequest request) {
return dictItemManager.delete(request, token); return dictItemManager.delete(request, LocalData.getToken());
} }
public DictItemUpdateResponse update(DictItemUpdateRequest request, Token token) { public DictItemUpdateResponse update(DictItemUpdateRequest request) {
return dictItemManager.update(request, token); return dictItemManager.update(request, LocalData.getToken());
} }
public DictItemFindResponse find(DictItemFindRequest request, Token token) { public DictItemFindResponse find(DictItemFindRequest request) {
return dictItemManager.find(request, token); return dictItemManager.find(request, LocalData.getToken());
} }
public DictItemGetResponse get(DictItemGetRequest request, Token token) { public DictItemGetResponse get(DictItemGetRequest request) {
return dictItemManager.get(request, token); return dictItemManager.get(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(DictItem.class)); return ResponseUtil.apply(new WExcel<>(DictItem.class));
} }
public Object exports(DictItemFindRequest request, Token token) { public Object exports(DictItemFindRequest request) {
DictItemFindResponse response = dictItemManager.find(request, token); DictItemFindResponse response = dictItemManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -6,7 +6,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -37,28 +37,28 @@ public class FileAjax {
@Autowired @Autowired
private FileManager fileManager; private FileManager fileManager;
public FileCreateResponse create(FileCreateRequest request, Token token) { public FileCreateResponse create(FileCreateRequest request) {
return fileManager.create(request, token); return fileManager.create(request, LocalData.getToken());
} }
public FileDeleteResponse delete(FileDeleteRequest request, Token token) { public FileDeleteResponse delete(FileDeleteRequest request) {
return fileManager.delete(request, token); return fileManager.delete(request, LocalData.getToken());
} }
public FileFindResponse find(FileFindRequest request, Token token) { public FileFindResponse find(FileFindRequest request) {
return fileManager.find(request, token); return fileManager.find(request, LocalData.getToken());
} }
public FileGetResponse get(FileGetRequest request, Token token) { public FileGetResponse get(FileGetRequest request) {
return fileManager.get(request, token); return fileManager.get(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(File.class)); return ResponseUtil.apply(new WExcel<>(File.class));
} }
public Object exports(FileFindRequest request, Token token) { public Object exports(FileFindRequest request) {
FileFindResponse response = fileManager.find(request, token); FileFindResponse response = fileManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -33,32 +33,32 @@ public class LogErrAjax {
@Autowired @Autowired
private LogErrManager logErrManager; private LogErrManager logErrManager;
public LogErrCreateResponse create(LogErrCreateRequest request, Token token) { public LogErrCreateResponse create(LogErrCreateRequest request) {
return logErrManager.create(request, token); return logErrManager.create(request, LocalData.getToken());
} }
public LogErrDeleteResponse delete(LogErrDeleteRequest request, Token token) { public LogErrDeleteResponse delete(LogErrDeleteRequest request) {
return logErrManager.delete(request, token); return logErrManager.delete(request, LocalData.getToken());
} }
public LogErrUpdateResponse update(LogErrUpdateRequest request, Token token) { public LogErrUpdateResponse update(LogErrUpdateRequest request) {
return logErrManager.update(request, token); return logErrManager.update(request, LocalData.getToken());
} }
public LogErrFindResponse find(LogErrFindRequest request, Token token) { public LogErrFindResponse find(LogErrFindRequest request) {
return logErrManager.find(request, token); return logErrManager.find(request, LocalData.getToken());
} }
public LogErrGetResponse get(LogErrGetRequest request, Token token) { public LogErrGetResponse get(LogErrGetRequest request) {
return logErrManager.get(request, token); return logErrManager.get(request, LocalData.getToken());
} }
public Object template(){ public Object template(){
return ResponseUtil.apply(new WExcel<>(LogErr.class)); return ResponseUtil.apply(new WExcel<>(LogErr.class));
} }
public Object exports(LogErrFindRequest request, Token token) { public Object exports(LogErrFindRequest request) {
LogErrFindResponse response = logErrManager.find(request, token); LogErrFindResponse response = logErrManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -35,36 +35,36 @@ public class ResAjax {
@Autowired @Autowired
private ResManager resManager; private ResManager resManager;
public ResCreateResponse create(ResCreateRequest request, Token token) { public ResCreateResponse create(ResCreateRequest request) {
return resManager.create(request, token); return resManager.create(request, LocalData.getToken());
} }
public ResDeleteResponse delete(ResDeleteRequest request, Token token) { public ResDeleteResponse delete(ResDeleteRequest request) {
return resManager.delete(request, token); return resManager.delete(request, LocalData.getToken());
} }
public ResUpdateResponse update(ResUpdateRequest request, Token token) { public ResUpdateResponse update(ResUpdateRequest request) {
return resManager.update(request, token); return resManager.update(request, LocalData.getToken());
} }
public ResFindResponse find(ResFindRequest request, Token token) { public ResFindResponse find(ResFindRequest request) {
return resManager.find(request, token); return resManager.find(request, LocalData.getToken());
} }
public ResGetResponse get(ResGetRequest request, Token token) { public ResGetResponse get(ResGetRequest request) {
return resManager.get(request, token); return resManager.get(request, LocalData.getToken());
} }
public ResTreeResponse tree(ResTreeRequest request, Token token) { public ResTreeResponse tree(ResTreeRequest request) {
return resManager.tree(request, token); return resManager.tree(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(Res.class)); return ResponseUtil.apply(new WExcel<>(Res.class));
} }
public Object exports(ResFindRequest request, Token token) { public Object exports(ResFindRequest request) {
ResFindResponse response = resManager.find(request, token); ResFindResponse response = resManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -33,32 +33,32 @@ public class RoleAjax {
@Autowired @Autowired
private RoleManager roleManager; private RoleManager roleManager;
public RoleCreateResponse create(RoleCreateRequest request, Token token) { public RoleCreateResponse create(RoleCreateRequest request) {
return roleManager.create(request, token); return roleManager.create(request, LocalData.getToken());
} }
public RoleDeleteResponse delete(RoleDeleteRequest request, Token token) { public RoleDeleteResponse delete(RoleDeleteRequest request) {
return roleManager.delete(request, token); return roleManager.delete(request, LocalData.getToken());
} }
public RoleUpdateResponse update(RoleUpdateRequest request, Token token) { public RoleUpdateResponse update(RoleUpdateRequest request) {
return roleManager.update(request, token); return roleManager.update(request, LocalData.getToken());
} }
public RoleFindResponse find(RoleFindRequest request, Token token) { public RoleFindResponse find(RoleFindRequest request) {
return roleManager.find(request, token); return roleManager.find(request, LocalData.getToken());
} }
public RoleGetResponse get(RoleGetRequest request, Token token) { public RoleGetResponse get(RoleGetRequest request) {
return roleManager.get(request, token); return roleManager.get(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(Role.class)); return ResponseUtil.apply(new WExcel<>(Role.class));
} }
public Object exports(RoleFindRequest request, Token token) { public Object exports(RoleFindRequest request) {
RoleFindResponse response = roleManager.find(request, token); RoleFindResponse response = roleManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -1,7 +1,7 @@
package ${basePackage}.action.ajax.system; package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.module.system.mgr.RoleResManager; import ${basePackage}.module.system.mgr.RoleResManager;
import ${basePackage}.module.system.req.RoleResCheckRequest; import ${basePackage}.module.system.req.RoleResCheckRequest;
import ${basePackage}.module.system.req.RoleResCreateRequest; import ${basePackage}.module.system.req.RoleResCreateRequest;
@ -21,27 +21,27 @@ public class RoleResAjax {
@Autowired @Autowired
private RoleResManager roleResManager; private RoleResManager roleResManager;
public RoleResCreateResponse create(RoleResCreateRequest request, Token token) { public RoleResCreateResponse create(RoleResCreateRequest request) {
return roleResManager.create(request, token); return roleResManager.create(request, LocalData.getToken());
} }
public RoleResDeleteResponse delete(RoleResDeleteRequest request, Token token) { public RoleResDeleteResponse delete(RoleResDeleteRequest request) {
return roleResManager.delete(request, token); return roleResManager.delete(request, LocalData.getToken());
} }
public RoleResUpdateResponse update(RoleResUpdateRequest request, Token token) { public RoleResUpdateResponse update(RoleResUpdateRequest request) {
return roleResManager.update(request, token); return roleResManager.update(request, LocalData.getToken());
} }
public RoleResFindResponse find(RoleResFindRequest request, Token token) { public RoleResFindResponse find(RoleResFindRequest request) {
return roleResManager.find(request, token); return roleResManager.find(request, LocalData.getToken());
} }
public RoleResGetResponse get(RoleResGetRequest request, Token token) { public RoleResGetResponse get(RoleResGetRequest request) {
return roleResManager.get(request, token); return roleResManager.get(request, LocalData.getToken());
} }
public RoleResCheckResponse check(RoleResCheckRequest request, Token token) { public RoleResCheckResponse check(RoleResCheckRequest request) {
return roleResManager.check(request, token); return roleResManager.check(request, LocalData.getToken());
} }
} }

@ -2,7 +2,7 @@ package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.BaseResponse;
import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.excel.WExcel; import ${basePackage}.frame.excel.WExcel;
@ -35,36 +35,36 @@ public class TokensAjax {
@Autowired @Autowired
private TokensManager tokensManager; private TokensManager tokensManager;
public TokensCreateResponse create(TokensCreateRequest request, Token token) { public TokensCreateResponse create(TokensCreateRequest request) {
return tokensManager.create(request, token); return tokensManager.create(request, LocalData.getToken());
} }
public TokensDeleteResponse delete(TokensDeleteRequest request, Token token) { public TokensDeleteResponse delete(TokensDeleteRequest request) {
return tokensManager.delete(request, token); return tokensManager.delete(request, LocalData.getToken());
} }
public TokensUpdateResponse update(TokensUpdateRequest request, Token token) { public TokensUpdateResponse update(TokensUpdateRequest request) {
return tokensManager.update(request, token); return tokensManager.update(request, LocalData.getToken());
} }
public TokensFindResponse find(TokensFindRequest request, Token token) { public TokensFindResponse find(TokensFindRequest request) {
return tokensManager.find(request, token); return tokensManager.find(request, LocalData.getToken());
} }
public TokensGetResponse get(TokensGetRequest request, Token token) { public TokensGetResponse get(TokensGetRequest request) {
return tokensManager.get(request, token); return tokensManager.get(request, LocalData.getToken());
} }
public TokensLogoutResponse logout(TokensLogoutRequest request, Token token) { public TokensLogoutResponse logout(TokensLogoutRequest request) {
return tokensManager.logout(request, token); return tokensManager.logout(request, LocalData.getToken());
} }
public Object template() { public Object template() {
return ResponseUtil.apply(new WExcel<>(Tokens.class)); return ResponseUtil.apply(new WExcel<>(Tokens.class));
} }
public Object exports(TokensFindRequest request, Token token) { public Object exports(TokensFindRequest request) {
TokensFindResponse response = tokensManager.find(request, token); TokensFindResponse response = tokensManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -59,24 +59,24 @@ public class UserAjax {
@Autowired @Autowired
private UserManager userManager; private UserManager userManager;
public UserCreateResponse create(UserCreateRequest request, Token token) { public UserCreateResponse create(UserCreateRequest request) {
return userManager.create(request, token); return userManager.create(request, LocalData.getToken());
} }
public UserDeleteResponse delete(UserDeleteRequest request, Token token) { public UserDeleteResponse delete(UserDeleteRequest request) {
return userManager.delete(request, token); return userManager.delete(request, LocalData.getToken());
} }
public UserUpdateResponse update(UserUpdateRequest request, Token token) { public UserUpdateResponse update(UserUpdateRequest request) {
return userManager.update(request, token); return userManager.update(request, LocalData.getToken());
} }
public UserFindResponse find(UserFindRequest request, Token token) { public UserFindResponse find(UserFindRequest request) {
return userManager.find(request, token); return userManager.find(request, LocalData.getToken());
} }
public UserGetResponse get(UserGetRequest request, Token token) { public UserGetResponse get(UserGetRequest request) {
return userManager.get(request, token); return userManager.get(request, LocalData.getToken());
} }
public UserLoginResponse login(UserLoginRequest request, Token token, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { public UserLoginResponse login(UserLoginRequest request, Token token, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
@ -177,9 +177,10 @@ public class UserAjax {
return response; return response;
} }
public UserLogoutResponse logout(UserLogoutRequest request, Token token) { public UserLogoutResponse logout(UserLogoutRequest request) {
UserLogoutResponse response = new UserLogoutResponse(); UserLogoutResponse response = new UserLogoutResponse();
Token token = LocalData.getToken();
if (token != null) { if (token != null) {
TokensLogoutRequest tokensLogoutRequest = new TokensLogoutRequest(); TokensLogoutRequest tokensLogoutRequest = new TokensLogoutRequest();
tokensLogoutRequest.setToken(token.getToken()); tokensLogoutRequest.setToken(token.getToken());
@ -197,8 +198,8 @@ public class UserAjax {
return ResponseUtil.apply(new WExcel<>(User.class)); return ResponseUtil.apply(new WExcel<>(User.class));
} }
public Object exports(UserFindRequest request, Token token) { public Object exports(UserFindRequest request) {
UserFindResponse response = userManager.find(request, token); UserFindResponse response = userManager.find(request, LocalData.getToken());
if (response.hasError()) { if (response.hasError()) {
return response; return response;
} else if (response.getTotalCount() == 0) { } else if (response.getTotalCount() == 0) {

@ -1,7 +1,7 @@
package ${basePackage}.action.ajax.system; package ${basePackage}.action.ajax.system;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.LocalData;
import ${basePackage}.module.system.mgr.UserRoleManager; import ${basePackage}.module.system.mgr.UserRoleManager;
import ${basePackage}.module.system.req.UserRoleCreateRequest; import ${basePackage}.module.system.req.UserRoleCreateRequest;
import ${basePackage}.module.system.req.UserRoleDeleteRequest; import ${basePackage}.module.system.req.UserRoleDeleteRequest;
@ -19,23 +19,23 @@ public class UserRoleAjax {
@Autowired @Autowired
private UserRoleManager userRoleManager; private UserRoleManager userRoleManager;
public UserRoleCreateResponse create(UserRoleCreateRequest request, Token token) { public UserRoleCreateResponse create(UserRoleCreateRequest request) {
return userRoleManager.create(request, token); return userRoleManager.create(request, LocalData.getToken());
} }
public UserRoleDeleteResponse delete(UserRoleDeleteRequest request, Token token) { public UserRoleDeleteResponse delete(UserRoleDeleteRequest request) {
return userRoleManager.delete(request, token); return userRoleManager.delete(request, LocalData.getToken());
} }
public UserRoleUpdateResponse update(UserRoleUpdateRequest request, Token token) { public UserRoleUpdateResponse update(UserRoleUpdateRequest request) {
return userRoleManager.update(request, token); return userRoleManager.update(request, LocalData.getToken());
} }
public UserRoleFindResponse find(UserRoleFindRequest request, Token token) { public UserRoleFindResponse find(UserRoleFindRequest request) {
return userRoleManager.find(request, token); return userRoleManager.find(request, LocalData.getToken());
} }
public UserRoleGetResponse get(UserRoleGetRequest request, Token token) { public UserRoleGetResponse get(UserRoleGetRequest request) {
return userRoleManager.get(request, token); return userRoleManager.get(request, LocalData.getToken());
} }
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.