From 50d354f83e1b5ab305bc8f3a12f69ac60f432801 Mon Sep 17 00:00:00 2001 From: trainliang Date: Fri, 8 Jul 2022 11:21:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=AE=E5=BD=95=E4=BD=BF=E7=94=A8=E5=8F=98=E9=87=8F?= =?UTF-8?q?=EF=BC=9B=E5=8E=BB=E9=99=A4wen=E9=A1=B5=E9=9D=A2=E7=9A=84git?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 28 +++++++++++++++++++ front/src/layout/components/Navbar.vue | 2 +- .../gitee/gen/service/GeneratorService.java | 1 + readme-trainliang.md | 4 +++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 docker-compose.yaml create mode 100644 readme-trainliang.md diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..3b6eb46 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,28 @@ +version: '3.7' +services: + code-gen: + restart: always + container_name: code-gen + image: trainliang/codegen + # deploy: + # resources: + # limits: + # cpus: '0.9' + # memory: 500M + environment: + DATASOURCE_DRIVE: com.mysql.cj.jdbc.Driver + DATASOURCE_URL: jdbc:mysql://mysql:3306/code_gen?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + DATASOURCE_USERNAME: root + DATASOURCE_PASSWORD: root@123 + + ports: + - 6969:6969 +# volumes: +# # - /usr/share/fonts:/usr/share/fonts +# - /home/www:/hww +# - /www:/www +# - ./logs:/logs +networks: + default: + external: + name: online-network \ No newline at end of file diff --git a/front/src/layout/components/Navbar.vue b/front/src/layout/components/Navbar.vue index 47275cd..b92a6f3 100644 --- a/front/src/layout/components/Navbar.vue +++ b/front/src/layout/components/Navbar.vue @@ -5,7 +5,7 @@
- Git +
diff --git a/gen/src/main/java/com/gitee/gen/service/GeneratorService.java b/gen/src/main/java/com/gitee/gen/service/GeneratorService.java index bd07cf6..6e6c898 100644 --- a/gen/src/main/java/com/gitee/gen/service/GeneratorService.java +++ b/gen/src/main/java/com/gitee/gen/service/GeneratorService.java @@ -63,6 +63,7 @@ public class GeneratorService { if (StringUtils.isEmpty(folder)) { folder = template.getName(); } + folder =doGenerator(sqlContext, folder); String fileName = doGenerator(sqlContext, template.getFileName()); String content = doGenerator(sqlContext, template.getContent()); content = this.formatCode(fileName, content); diff --git a/readme-trainliang.md b/readme-trainliang.md new file mode 100644 index 0000000..f0dad3e --- /dev/null +++ b/readme-trainliang.md @@ -0,0 +1,4 @@ +# 打包发布 + +docker buildx build -t trainliang/codegen:latest --platform=linux/amd64,linux/arm64/v8 . --push +docker buildx build -t trainliang/codegen:1.5.8.1 --platform=linux/amd64,linux/arm64/v8 . --push \ No newline at end of file -- Gitee From 83bbc1fce2f5a4fd4d8c8d12573e627b72ab2df6 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 24 Aug 2022 14:06:20 +0800 Subject: [PATCH 2/3] 1.6.0 --- .dockerignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..e7b1f96 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ + +.gitee +db +log +script +templates +front/node_modules \ No newline at end of file -- Gitee From f9a9068fcfb46b15bfe2368975628522611fbc45 Mon Sep 17 00:00:00 2001 From: trainliang Date: Wed, 24 Aug 2022 17:20:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=A1=B9=E7=9B=AE=E6=A8=A1=E7=89=88=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/velocity/java.json | 4 ++++ front/src/views/generate/GenerateConfig/index.vue | 9 +++++++++ front/src/views/generate/result.vue | 3 ++- .../java/com/gitee/gen/common/GeneratorParam.java | 10 ++++++++++ .../com/gitee/gen/entity/DatasourceConfig.java | 12 +++++++++++- .../main/java/com/gitee/gen/gen/SQLContext.java | 12 ++++++++++++ .../com/gitee/gen/service/GeneratorService.java | 12 +++++++++++- .../resources/mybatis/DatasourceConfigMapper.xml | 15 +++++++++++++++ 8 files changed, 74 insertions(+), 3 deletions(-) diff --git a/front/public/velocity/java.json b/front/public/velocity/java.json index 76c2e6e..4cfcd01 100644 --- a/front/public/velocity/java.json +++ b/front/public/velocity/java.json @@ -50,6 +50,10 @@ "expression": "${context}", "text": "", "children": [ + { + "expression": "${context.projectModule}", + "text": "项目模块" + }, { "expression": "${context.author}", "text": "作者名" diff --git a/front/src/views/generate/GenerateConfig/index.vue b/front/src/views/generate/GenerateConfig/index.vue index e34234b..b46d158 100644 --- a/front/src/views/generate/GenerateConfig/index.vue +++ b/front/src/views/generate/GenerateConfig/index.vue @@ -31,6 +31,9 @@ + + + @@ -185,6 +188,9 @@ + + + @@ -257,6 +263,7 @@ export default { tableNames: [], templateConfigIdList: [], packageName: '', + projectModule: '', delPrefix: '', groupId: '', author: '' @@ -284,6 +291,7 @@ export default { oracleRole: '', schemaName: '', packageName: '', + projectModule: '', delPrefix: '', groupId: '', author: '' @@ -333,6 +341,7 @@ export default { this.groupId = item.groupId Object.assign(this.clientParam, { packageName: item.packageName, + projectModule: item.projectModule, delPrefix: item.delPrefix, groupId: item.groupId, author: item.author diff --git a/front/src/views/generate/result.vue b/front/src/views/generate/result.vue index eb721f8..9b5dc1c 100644 --- a/front/src/views/generate/result.vue +++ b/front/src/views/generate/result.vue @@ -80,7 +80,8 @@ export default { datasourceConfigId: '', tableNames: [], templateConfigIdList: [], - packageName: '' + packageName: '', + projectModule: '' }, treeData: [], filterText: '', diff --git a/gen/src/main/java/com/gitee/gen/common/GeneratorParam.java b/gen/src/main/java/com/gitee/gen/common/GeneratorParam.java index f2b9241..9911a18 100644 --- a/gen/src/main/java/com/gitee/gen/common/GeneratorParam.java +++ b/gen/src/main/java/com/gitee/gen/common/GeneratorParam.java @@ -14,6 +14,8 @@ public class GeneratorParam { private String packageName; + private String projectModule; + private String delPrefix; private String author; @@ -51,6 +53,13 @@ public class GeneratorParam { public void setPackageName(String packageName) { this.packageName = packageName; } + public String getProjectModule() { + return projectModule; + } + + public void setProjectModule(String projectModule) { + this.projectModule = projectModule; + } public String getDelPrefix() { return delPrefix; @@ -81,6 +90,7 @@ public class GeneratorParam { return "GeneratorParam{" + "datasourceConfigId=" + datasourceConfigId + ", tableNames=" + tableNames + + ", projectModule=" + projectModule + ", templateConfigIdList=" + templateConfigIdList + ", packageName='" + packageName + '\'' + ", delPrefix='" + delPrefix + '\'' + diff --git a/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java b/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java index ae381da..ca0116b 100644 --- a/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java +++ b/gen/src/main/java/com/gitee/gen/entity/DatasourceConfig.java @@ -33,6 +33,8 @@ public class DatasourceConfig { private Integer isDeleted; /** 包名*/ private String packageName; + /** 项目模版*/ + private String projectModule; /** 删除的前缀*/ private String delPrefix; /** 代码生成器模板组id*/ @@ -121,7 +123,13 @@ public class DatasourceConfig { public void setPackageName(String packageName) { this.packageName = packageName; } + public String getProjectModule() { + return projectModule; + } + public void setProjectModule(String projectModule) { + this.projectModule = projectModule; + } public String getDelPrefix() { return delPrefix; } @@ -186,6 +194,7 @@ public class DatasourceConfig { Objects.equals(password, that.password) && Objects.equals(isDeleted, that.isDeleted) && Objects.equals(packageName, that.packageName) && + Objects.equals(projectModule, that.projectModule) && Objects.equals(delPrefix, that.delPrefix) && Objects.equals(groupId, that.groupId) && Objects.equals(author, that.author) && @@ -194,7 +203,7 @@ public class DatasourceConfig { @Override public int hashCode() { - return Objects.hash(id, dbType, dbDesc, driverClass, dbName, host, port, username, password, isDeleted, packageName, delPrefix, groupId, author, dbGroupName); + return Objects.hash(id, dbType, dbDesc, driverClass, dbName, host, port, username, password, isDeleted, packageName,projectModule, delPrefix, groupId, author, dbGroupName); } @Override @@ -211,6 +220,7 @@ public class DatasourceConfig { ", password='" + password + '\'' + ", isDeleted=" + isDeleted + ", packageName='" + packageName + '\'' + + ", projectModule='" + projectModule + '\'' + ", delPrefix='" + delPrefix + '\'' + ", groupId='" + groupId + '\'' + ", author='" + author + '\'' + diff --git a/gen/src/main/java/com/gitee/gen/gen/SQLContext.java b/gen/src/main/java/com/gitee/gen/gen/SQLContext.java index cabef7c..8556bdf 100644 --- a/gen/src/main/java/com/gitee/gen/gen/SQLContext.java +++ b/gen/src/main/java/com/gitee/gen/gen/SQLContext.java @@ -30,6 +30,10 @@ public class SQLContext { * 包名 */ private String packageName; + /** + * 项目模块 + */ + private String projectModule; /** * 包的子路径 @@ -219,6 +223,14 @@ public class SQLContext { this.author = author; } + public String getProjectModule() { + return projectModule; + } + + public void setProjectModule(String projectModule) { + this.projectModule = projectModule; + } + public String getPackageSubPath() { return packageSubPath; } diff --git a/gen/src/main/java/com/gitee/gen/service/GeneratorService.java b/gen/src/main/java/com/gitee/gen/service/GeneratorService.java index 9667c28..2ba0d67 100644 --- a/gen/src/main/java/com/gitee/gen/service/GeneratorService.java +++ b/gen/src/main/java/com/gitee/gen/service/GeneratorService.java @@ -54,6 +54,7 @@ public class GeneratorService { List codeFileList = new ArrayList<>(); for (SQLContext sqlContext : contextList) { + setProjectModule(sqlContext, generatorParam.getProjectModule()); setPackageName(sqlContext, generatorParam.getPackageName()); setDelPrefix(sqlContext, generatorParam.getDelPrefix()); setAuthor(sqlContext, generatorParam.getAuthor()); @@ -94,7 +95,11 @@ public class GeneratorService { } return content; } - + private void setFolder(SQLContext sqlContext, String folder) { + if (StringUtils.hasText(folder)) { + sqlContext.setPackageSubPath(folder); + } + } /** * 返回SQL上下文列表 @@ -128,6 +133,11 @@ public class GeneratorService { sqlContext.setPackageName(packageName); } } + private void setProjectModule(SQLContext sqlContext, String projectModule) { + if (StringUtils.hasText(projectModule)) { + sqlContext.setProjectModule(projectModule); + } + } private void setDelPrefix(SQLContext sqlContext, String delPrefix) { if (StringUtils.hasText(delPrefix)) { diff --git a/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml b/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml index 0e96a7f..c07f766 100644 --- a/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml +++ b/gen/src/main/resources/mybatis/DatasourceConfigMapper.xml @@ -14,6 +14,7 @@ + @@ -34,6 +35,7 @@ , t.password , t.is_deleted , t.package_name + , t.project_module , t.del_prefix , t.group_id , t.author @@ -73,6 +75,7 @@ password, is_deleted, package_name, + project_module, del_prefix, group_id, author, @@ -90,6 +93,7 @@ #{password}, #{isDeleted}, #{packageName}, + #{projectModule}, #{delPrefix}, #{groupId}, #{author}, @@ -137,6 +141,9 @@ package_name, + + project_module, + del_prefix, @@ -184,6 +191,9 @@ #{packageName}, + + #{projectModule}, + #{delPrefix}, @@ -214,6 +224,7 @@ password=#{password}, is_deleted=#{isDeleted}, package_name=#{packageName}, + project_module=#{projectModule}, del_prefix=#{delPrefix}, group_id=#{groupId}, author=#{author}, @@ -260,6 +271,10 @@ package_name=#{packageName}, + + + project_module=#{projectModule}, + del_prefix=#{delPrefix}, -- Gitee