From 46e20c389f63f08b77dbfb5ea997658f4d9de70c Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 17:49:50 +0800 Subject: [PATCH 01/12] =?UTF-8?q?r2=E5=A2=9E=E5=8A=A0test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/testController.java | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/main/java/testController.java diff --git a/src/main/java/testController.java b/src/main/java/testController.java new file mode 100644 index 0000000..4122685 --- /dev/null +++ b/src/main/java/testController.java @@ -0,0 +1,43 @@ +/** + * ${DESCRIPTION} + * + * @author: lizhenyu1 + * @create 2019-01-24 17:38 + */ + +import autojcode.CodeGenerateUtils; +import autojcode.domain.JcodeProperties; +import autojcode.domain.JsonResult; +import autojcode.domain.ResultUtil; +import autojcode.exception.MyBizException; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: + * @author: lizy + * @date: 2019/1/24 + */ +@Api(value = "自动生成代码",description = "自动生成代码") +@RestController +public class testController { + @Autowired + private CodeGenerateUtils codeGenerateUtils; + + @ApiOperation(value = "自动生成代码", notes = "自动生成代码", position = 1) + @PostMapping(value = "/autoJCode") + public JsonResult autoJcodeForDb(@RequestBody @ApiParam(name="jcodeProperties",value="生成参数",required=true) JcodeProperties jcodeProperties) { + try { + // 我是mast1 + String path = codeGenerateUtils.autoJcodeForDb(jcodeProperties); + return ResultUtil.success(path); + } catch (MyBizException e) { + return ResultUtil.error(e); + } + } +} -- Gitee From 112a209061bd7278994b69bfb1f99fc28b8e5fc2 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 17:56:33 +0800 Subject: [PATCH 02/12] =?UTF-8?q?t1=E5=A2=9E=E5=8A=A0test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/autojcode/test.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/main/java/autojcode/test.java diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java new file mode 100644 index 0000000..f133afa --- /dev/null +++ b/src/main/java/autojcode/test.java @@ -0,0 +1,17 @@ +package autojcode;/** + * ${DESCRIPTION} + * + * @author: lizhenyu1 + * @create 2019-01-24 17:55 + */ + +/** + * @description: + * @author: lizy + * @date: 2019/1/24 + */ +public class test { + public void MM(){ + return; + } +} -- Gitee From ab4eff3931025fe9c0326b85761fba67c239dcc8 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 22:57:07 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c151580 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +# maven ignore +target/ + +# eclipse ignore +.settings/ +.project +.classpath +dump.rdb +# intellij ignore +.idea/ +out/ +.gradle/ +*.iml + +# local configuration ignore +src/main/webapp/WEB-INF/classes +catalina.base_IS_UNDEFINED/ +VKConf/ +work/ +.gitignore~ +.gitlab-ci.yml~ +*.ipr +*.iws +logs/ +disconf/download + +# vipkidconfig +application.* +classVideo.properties +logback.xml +calendar.properties +remote-config.properties +autoBookClass.properties +task.properties +banner.txt +geetest.properties +morecourse.properties +vkmq.config \ No newline at end of file -- Gitee From 17216217c74850779b99091bb42324645ba0c858 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:21:50 +0800 Subject: [PATCH 04/12] test2 1 --- src/main/java/autojcode/test.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index f133afa..f16682d 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -11,7 +11,11 @@ package autojcode;/** * @date: 2019/1/24 */ public class test { - public void MM(){ - return; + public Boolean MM(){ + return true; + } + public Boolean MM3(){ + //test2 + return false; } } -- Gitee From 791039189bf92ac9c8b7f4879d6fc406ad670c43 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:22:01 +0800 Subject: [PATCH 05/12] test2 1 --- src/main/java/autojcode/test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index f16682d..c97f015 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -15,7 +15,7 @@ public class test { return true; } public Boolean MM3(){ - //test2 + //test2 这是测试 return false; } } -- Gitee From 4bfee9ff872aa9c93d1fd87e9314e32606405784 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:20:00 +0800 Subject: [PATCH 06/12] test1 --- src/main/java/autojcode/test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index c97f015..eebfcc2 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -14,7 +14,7 @@ public class test { public Boolean MM(){ return true; } - public Boolean MM3(){ + public Boolean MM3() { //test2 这是测试 return false; } -- Gitee From d117eb876554ca757529f781c85eca46256cc396 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:20:22 +0800 Subject: [PATCH 07/12] test1 2 --- src/main/java/autojcode/test.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index eebfcc2..d64894b 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -18,4 +18,8 @@ public class test { //test2 这是测试 return false; } + public String MM2(){ + //测试1 + return ""; + } } -- Gitee From 2bd9fdc017ff18dc9d4a33c53e871c0ab1608388 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:46:32 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E8=BD=AE1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/autojcode/test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index d64894b..1423eb3 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -22,4 +22,5 @@ public class test { //测试1 return ""; } + //第三轮1 } -- Gitee From 07bdd88cfc6c1885d6aedc52c6766e7b4b231dea Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:46:50 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E8=BD=AE2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/autojcode/test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index 1423eb3..7cdd508 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -23,4 +23,5 @@ public class test { return ""; } //第三轮1 + //第三轮2 } -- Gitee From 652bd5f9d9646a7df2c07711f1b48cee13e9e005 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:47:03 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E8=BD=AE2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/autojcode/test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index 7cdd508..aff3d19 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -24,4 +24,5 @@ public class test { } //第三轮1 //第三轮2 + //第三轮3 } -- Gitee From 09234a7b6837a5ccdc9d95c9ab33b1eb2687b7cb Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Thu, 24 Jan 2019 23:53:27 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E8=BD=AE4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/autojcode/test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index aff3d19..2da7676 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -25,4 +25,5 @@ public class test { //第三轮1 //第三轮2 //第三轮3 + //第三轮4 } -- Gitee From 1222de8f1a36dc80762c9f9793a50eb6ee746f98 Mon Sep 17 00:00:00 2001 From: lizhenyu1 Date: Fri, 25 Jan 2019 16:52:27 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=88=E5=B9=B61625?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/autojcode/test.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/autojcode/test.java b/src/main/java/autojcode/test.java index 2da7676..15d4d5e 100644 --- a/src/main/java/autojcode/test.java +++ b/src/main/java/autojcode/test.java @@ -22,6 +22,22 @@ public class test { //测试1 return ""; } + public String r1(){ + //r1 + //r1 2 + return ""; + } + public String testR1(){ + //r1 + //r1 2 + return ""; + } + public String testR2(){ + //r1 + //r1 2 + return ""; + } + //第三轮1 //第三轮2 //第三轮3 -- Gitee