From a80d672bb497b848bc0d25cb5f59a153099c7fa1 Mon Sep 17 00:00:00 2001 From: SanLi <2689170096@qq.com> Date: Thu, 25 Jun 2020 17:49:29 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=96=B0=E5=A2=9Eword=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screw/core/engine/EngineFileType.java | 16 ++++----------- .../freemarker/documentation_docx.ftl | 20 ------------------- ...tation_doc.ftl => documentation_excel.ftl} | 1 - .../freemarker/documentation_word.ftl | 20 +++++++++++++++++++ .../freemarker/documentation_xlsx.ftl | 20 ------------------- .../template/freemarker/documentation_xsl.ftl | 20 ------------------- ...entation_doc.vm => documentation_excel.vm} | 0 ...entation_docx.vm => documentation_word.vm} | 0 .../template/velocity/documentation_xlsx.vm | 17 ---------------- .../template/velocity/documentation_xsl.vm | 17 ---------------- 10 files changed, 24 insertions(+), 107 deletions(-) delete mode 100644 screw-core/src/main/resources/template/freemarker/documentation_docx.ftl rename screw-core/src/main/resources/template/freemarker/{documentation_doc.ftl => documentation_excel.ftl} (99%) create mode 100644 screw-core/src/main/resources/template/freemarker/documentation_word.ftl delete mode 100644 screw-core/src/main/resources/template/freemarker/documentation_xlsx.ftl delete mode 100644 screw-core/src/main/resources/template/freemarker/documentation_xsl.ftl rename screw-core/src/main/resources/template/velocity/{documentation_doc.vm => documentation_excel.vm} (100%) rename screw-core/src/main/resources/template/velocity/{documentation_docx.vm => documentation_word.vm} (100%) delete mode 100644 screw-core/src/main/resources/template/velocity/documentation_xlsx.vm delete mode 100644 screw-core/src/main/resources/template/velocity/documentation_xsl.vm diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/engine/EngineFileType.java b/screw-core/src/main/java/cn/smallbun/screw/core/engine/EngineFileType.java index bb74914..1e7d7a5 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/engine/EngineFileType.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/engine/EngineFileType.java @@ -35,21 +35,13 @@ public enum EngineFileType implements Serializable { */ HTML(".html", "documentation_html", "HTML文件"), /** - * DOC + * WORD */ - DOC(".doc", "documentation_doc", "WORD文件"), + WORD(".doc", "documentation_word", "WORD文件"), /** - * DOCX + * EXCEL */ - DOCX(".docx", "documentation_docx", "WORD文件"), - /** - * XSL - */ - XSL(".xsl", "documentation_xsl", "EXCEL文件"), - /** - * XLSX - */ - XLSX(".xlsx", "documentation_xlsx", "EXCEL文件"); + EXCEL(".xsl", "documentation_excel", "EXCEL文件"); /** * 文件后缀 diff --git a/screw-core/src/main/resources/template/freemarker/documentation_docx.ftl b/screw-core/src/main/resources/template/freemarker/documentation_docx.ftl deleted file mode 100644 index 6186890..0000000 --- a/screw-core/src/main/resources/template/freemarker/documentation_docx.ftl +++ /dev/null @@ -1,20 +0,0 @@ -<#-- - - screw-core - 简洁好用的数据库表结构文档生成工具 - Copyright © 2020 SanLi (qinggang.zuo@gmail.com) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - ---> ---> diff --git a/screw-core/src/main/resources/template/freemarker/documentation_doc.ftl b/screw-core/src/main/resources/template/freemarker/documentation_excel.ftl similarity index 99% rename from screw-core/src/main/resources/template/freemarker/documentation_doc.ftl rename to screw-core/src/main/resources/template/freemarker/documentation_excel.ftl index 6186890..7a86b8b 100644 --- a/screw-core/src/main/resources/template/freemarker/documentation_doc.ftl +++ b/screw-core/src/main/resources/template/freemarker/documentation_excel.ftl @@ -17,4 +17,3 @@ along with this program. If not, see . --> ---> diff --git a/screw-core/src/main/resources/template/freemarker/documentation_word.ftl b/screw-core/src/main/resources/template/freemarker/documentation_word.ftl new file mode 100644 index 0000000..25ce061 --- /dev/null +++ b/screw-core/src/main/resources/template/freemarker/documentation_word.ftl @@ -0,0 +1,20 @@ +<#-- + + screw-core - 简洁好用的数据库表结构文档生成工具 + Copyright © 2020 SanLi (qinggang.zuo@gmail.com) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . + +--> +${title!''}数据库名：${database!''}<#if (version)??>文档版本：${version!''}<#if (description)??>文档描述：${description!''}<#--表--><#list tables><#items as t>表${t.tableName!''}<#--页面设置-->编号名称数据类型长度小数位允许空值主键默认值说明<#--列--><#list t.columns><#items as c>${c?index+1}${c.columnName!''}${c.typeName!''}${c.columnSize!''}${c.decimalDigits!'0'}${c.nullable!''}${c.primaryKey!''}${c.columnDef!''}${c.remarks!''}${title!''}screwscrew20117100Microsoft Office Word011falsefalse116falsefalse16.00002052-11.1.0.9740 \ No newline at end of file diff --git a/screw-core/src/main/resources/template/freemarker/documentation_xlsx.ftl b/screw-core/src/main/resources/template/freemarker/documentation_xlsx.ftl deleted file mode 100644 index 6186890..0000000 --- a/screw-core/src/main/resources/template/freemarker/documentation_xlsx.ftl +++ /dev/null @@ -1,20 +0,0 @@ -<#-- - - screw-core - 简洁好用的数据库表结构文档生成工具 - Copyright © 2020 SanLi (qinggang.zuo@gmail.com) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - ---> ---> diff --git a/screw-core/src/main/resources/template/freemarker/documentation_xsl.ftl b/screw-core/src/main/resources/template/freemarker/documentation_xsl.ftl deleted file mode 100644 index 6186890..0000000 --- a/screw-core/src/main/resources/template/freemarker/documentation_xsl.ftl +++ /dev/null @@ -1,20 +0,0 @@ -<#-- - - screw-core - 简洁好用的数据库表结构文档生成工具 - Copyright © 2020 SanLi (qinggang.zuo@gmail.com) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - ---> ---> diff --git a/screw-core/src/main/resources/template/velocity/documentation_doc.vm b/screw-core/src/main/resources/template/velocity/documentation_excel.vm similarity index 100% rename from screw-core/src/main/resources/template/velocity/documentation_doc.vm rename to screw-core/src/main/resources/template/velocity/documentation_excel.vm diff --git a/screw-core/src/main/resources/template/velocity/documentation_docx.vm b/screw-core/src/main/resources/template/velocity/documentation_word.vm similarity index 100% rename from screw-core/src/main/resources/template/velocity/documentation_docx.vm rename to screw-core/src/main/resources/template/velocity/documentation_word.vm diff --git a/screw-core/src/main/resources/template/velocity/documentation_xlsx.vm b/screw-core/src/main/resources/template/velocity/documentation_xlsx.vm deleted file mode 100644 index 30191c0..0000000 --- a/screw-core/src/main/resources/template/velocity/documentation_xlsx.vm +++ /dev/null @@ -1,17 +0,0 @@ -#* - * screw-core - 简洁好用的数据库表结构文档生成工具 - * Copyright © 2020 SanLi (qinggang.zuo@gmail.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - *# diff --git a/screw-core/src/main/resources/template/velocity/documentation_xsl.vm b/screw-core/src/main/resources/template/velocity/documentation_xsl.vm deleted file mode 100644 index 30191c0..0000000 --- a/screw-core/src/main/resources/template/velocity/documentation_xsl.vm +++ /dev/null @@ -1,17 +0,0 @@ -#* - * screw-core - 简洁好用的数据库表结构文档生成工具 - * Copyright © 2020 SanLi (qinggang.zuo@gmail.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - *#