- * 源码 https://github.com/YeDaxia/JApiDocs - * 文档 https://japidocs.agilestudio.cn/#/zh-cn/ - */ -public class JApiDocsGenerator { - - /** - * JApiDocs 生成器 - *
- * 如果报错，做如下检查： - * 1 javadoc @param 后是否有注释 - * 2 src.main.java 目录中非 .java 扩展名文件内容要 // 注释起来 - * 3 删除 config.setDocsPath 目录中的文件，再生成试试 - *
- * 如果生成的 api 文档不是预期的，作如下检查： - * 1 必须在 configRoute(Routes me) 中已该方式 me.add("/xx/yy", xx.class, "/"); 定义 Controller - * 2 在需要生成 api 的 Controller 中添加 @ApiDoc 注解 - * 3 如果要忽略某 action，在 action 上添加 @Ignore - */ - public static void main(String[] args) { - DocsConfig config = new DocsConfig(); - String root = PathKit.getRootClassPath().replace("target\\classes", ""); - String sourcePath = root + "src"; - config.setProjectPath(sourcePath); // root project path - config.setProjectName("QingLong"); // project name - config.setApiVersion("v1.0"); // api version - // 这是项目下的目录，生成完之后。前端人员可以直接访问，查看接口文档进行接口对接 - config.setDocsPath(root + "ApiDoc"); // api docs target path - config.setAutoGenerate(Boolean.FALSE); // auto generate - config.setMvcFramework("JFinal"); - Docs.buildHtmlDocs(config); // execute to generate - } -} \ No newline at end of file diff --git a/src/main/java/com/YunXiao/Model/BaseModel.java b/src/main/java/com/YunXiao/Model/BaseModel.java index 7124db65..e9108528 100644 --- a/src/main/java/com/YunXiao/Model/BaseModel.java +++ b/src/main/java/com/YunXiao/Model/BaseModel.java @@ -177,7 +177,7 @@ public class BaseModel { sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4)); Row row = sheet.createRow(0); Cell cell = row.createCell(0); - cell.setCellValue("基础数据同步结果 " + DateTime.now().year() + "-" + DateTime.now().getMonth() + "-" + DateTime.now().getDate()); + cell.setCellValue("基础数据同步结果 " + DateTime.now().year() + "-" + DateTime.now().month() + "-" + DateTime.now().dayOfMonth()); cell.setCellStyle(cellStyle); // 设置表头样式 @@ -258,7 +258,7 @@ public class BaseModel { resSheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4)); Row resRow = resSheet.createRow(0); Cell resCell = resRow.createCell(0); - resCell.setCellValue("资源数据同步结果 " + DateTime.now().year() + "-" + DateTime.now().getMonth() + "-" + DateTime.now().getDate()); + resCell.setCellValue("资源数据同步结果 " + DateTime.now().year() + "-" + DateTime.now().month() + "-" + DateTime.now().dayOfMonth()); resCell.setCellStyle(cellStyle); // 设置单元格高度和宽度 diff --git a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java index 6208070d..9fad6ccd 100644 --- a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java +++ b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java @@ -25,19 +25,18 @@ import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.tx.Tx; import com.jfinal.upload.UploadFile; -import io.github.yedaxia.apidocs.ApiDoc; import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.OutputStream; +import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.time.format.DateTimeFormatter; import java.util.*; -@ApiDoc @SuppressWarnings("unchecked") public class GtzzController extends Controller { //实例化model @@ -800,7 +799,8 @@ public class GtzzController extends Controller { byte[] buf = new byte[1024]; int len; response.reset(); // 非常重要 - URL u = new URL("file:///" + filePath); + URI uri = new URI("file:///" + filePath); + URL u = uri.toURL(); response.setContentType(u.openConnection().getContentType()); String fileName = "项目单位验收单.pdf"; if (step_code.equals("0307")) fileName = "市级验收单.pdf"; @@ -867,7 +867,8 @@ public class GtzzController extends Controller { byte[] buf = new byte[1024]; int len; response.reset(); // 非常重要 - URL u = new URL("file:///" + filePath); + URI uri = new URI("file:///" + filePath); + URL u = uri.toURL(); response.setContentType(u.openConnection().getContentType()); String fileName = "项目评审单.pdf"; response.setHeader("Content-Disposition", "inline; filename=" + fileName); diff --git a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java index 686f20ef..c0752528 100644 --- a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java @@ -326,7 +326,9 @@ public class CommonUtil { Process process = null; String ls_1; try { - process = Runtime.getRuntime().exec(cmd); + ProcessBuilder processBuilder = new ProcessBuilder(cmd); + process = processBuilder.start(); + BufferedReader bufferedReader1 = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8")); while ((ls_1 = bufferedReader1.readLine()) != null) log.info(ls_1);