Skip to content

Commit 59fae86

Browse files
moshowgamemoshowgame
authored
Merge pull request #92 from gaohanghang/master
1. 将 mybatis controller 模板里，类上 @RequestMapping 注解里的 url 改为首字母小写 2. 对 java 代码进行格式化，使其看上去更加美观
2 parents 3bbca9d + ed0bc8e commit 59fae86

File tree

15 files changed

+770
-722
lines changed

15 files changed

+770
-722
lines changed

‎generator-web/src/main/java/com/softdev/system/generator/GeneratorWebApplication.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
@SpringBootApplication
88
public class GeneratorWebApplication {
9-
public static void main(String[] args) {
10-
SpringApplication.run(GeneratorWebApplication.class,args);
11-
}
9+
10+
public static void main(String[] args) {
11+
SpringApplication.run(GeneratorWebApplication.class, args);
12+
}
13+
1214
}

‎generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package com.softdev.system.generator.config;
2-
3-
import com.softdev.system.generator.entity.ReturnT;
4-
import org.springframework.web.bind.annotation.ControllerAdvice;
5-
import org.springframework.web.bind.annotation.ExceptionHandler;
6-
import org.springframework.web.bind.annotation.ResponseBody;
7-
8-
import javax.servlet.http.HttpServletRequest;
9-
10-
@ControllerAdvice
11-
public class GlobalDefaultExceptionHandler {
12-
13-
@ExceptionHandler(Exception.class)
14-
@ResponseBody
15-
public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) {
16-
e.printStackTrace();
17-
return ReturnT.ERROR(e.getMessage());
18-
}
19-
20-
}
1+
package com.softdev.system.generator.config;
2+
3+
import com.softdev.system.generator.entity.ReturnT;
4+
import org.springframework.web.bind.annotation.ControllerAdvice;
5+
import org.springframework.web.bind.annotation.ExceptionHandler;
6+
import org.springframework.web.bind.annotation.ResponseBody;
7+
8+
import javax.servlet.http.HttpServletRequest;
9+
10+
@ControllerAdvice
11+
public class GlobalDefaultExceptionHandler {
12+
13+
@ExceptionHandler(Exception.class)
14+
@ResponseBody
15+
public ReturnT defaultExceptionHandler(HttpServletRequest req, Exception e) {
16+
e.printStackTrace();
17+
return ReturnT.ERROR(e.getMessage());
18+
}
19+
20+
}

‎generator-web/src/main/java/com/softdev/system/generator/config/ServerConfig.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.springframework.boot.web.context.WebServerInitializedEvent;
55
import org.springframework.context.ApplicationListener;
66
import org.springframework.stereotype.Component;
7+
78
import java.net.Inet4Address;
89
import java.net.InetAddress;
910
import java.net.UnknownHostException;

‎generator-web/src/main/java/com/softdev/system/generator/config/WebMvcConfig.java‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
1-
package com.softdev.system.generator.config;
2-
3-
import com.alibaba.fastjson.support.config.FastJsonConfig;
4-
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
5-
import org.springframework.context.annotation.Configuration;
6-
import org.springframework.http.MediaType;
7-
import org.springframework.http.converter.HttpMessageConverter;
8-
import org.springframework.http.converter.StringHttpMessageConverter;
9-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
10-
11-
import java.nio.charset.StandardCharsets;
12-
import java.util.ArrayList;
13-
import java.util.List;
14-
/**
15-
* 2019-2-11 liutf WebMvcConfig 整合 cors 和 SpringMvc MessageConverter
16-
*/
17-
@Configuration
18-
public class WebMvcConfig implements WebMvcConfigurer {
19-
20-
/* @Override
21-
public void addCorsMappings(CorsRegistry registry) {
22-
registry.addMapping("/**")
23-
.allowedOrigins("*")
24-
.allowedHeaders("x-requested-with")
25-
.allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "TRACE")
26-
.maxAge(3600);
27-
}*/
28-
29-
@Override
30-
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
31-
//FastJsonHttpMessageConverter
32-
FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
33-
34-
List<MediaType> fastMediaTypes = new ArrayList<>();
35-
fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
36-
fastConverter.setSupportedMediaTypes(fastMediaTypes);
37-
38-
FastJsonConfig fastJsonConfig = new FastJsonConfig();
39-
fastJsonConfig.setCharset(StandardCharsets.UTF_8);
40-
fastConverter.setFastJsonConfig(fastJsonConfig);
41-
42-
//StringHttpMessageConverter
43-
StringHttpMessageConverter stringConverter = new StringHttpMessageConverter();
44-
stringConverter.setDefaultCharset(StandardCharsets.UTF_8);
45-
stringConverter.setSupportedMediaTypes(fastMediaTypes);
46-
converters.add(stringConverter);
47-
converters.add(fastConverter);
48-
}
49-
}
1+
package com.softdev.system.generator.config;
2+
3+
import com.alibaba.fastjson.support.config.FastJsonConfig;
4+
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
5+
import org.springframework.context.annotation.Configuration;
6+
import org.springframework.http.MediaType;
7+
import org.springframework.http.converter.HttpMessageConverter;
8+
import org.springframework.http.converter.StringHttpMessageConverter;
9+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
10+
11+
import java.nio.charset.StandardCharsets;
12+
import java.util.ArrayList;
13+
import java.util.List;
14+
/**
15+
* 2019-2-11 liutf WebMvcConfig 整合 cors 和 SpringMvc MessageConverter
16+
*/
17+
@Configuration
18+
public class WebMvcConfig implements WebMvcConfigurer {
19+
20+
/* @Override
21+
public void addCorsMappings(CorsRegistry registry) {
22+
registry.addMapping("/**")
23+
.allowedOrigins("*")
24+
.allowedHeaders("x-requested-with")
25+
.allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "TRACE")
26+
.maxAge(3600);
27+
}*/
28+
29+
@Override
30+
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
31+
//FastJsonHttpMessageConverter
32+
FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
33+
34+
List<MediaType> fastMediaTypes = new ArrayList<>();
35+
fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
36+
fastConverter.setSupportedMediaTypes(fastMediaTypes);
37+
38+
FastJsonConfig fastJsonConfig = new FastJsonConfig();
39+
fastJsonConfig.setCharset(StandardCharsets.UTF_8);
40+
fastConverter.setFastJsonConfig(fastJsonConfig);
41+
42+
//StringHttpMessageConverter
43+
StringHttpMessageConverter stringConverter = new StringHttpMessageConverter();
44+
stringConverter.setDefaultCharset(StandardCharsets.UTF_8);
45+
stringConverter.setSupportedMediaTypes(fastMediaTypes);
46+
converters.add(stringConverter);
47+
converters.add(fastConverter);
48+
}
49+
50+
}

‎generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
/**
2020
* spring boot code generator
21+
*
2122
* @author zhengk/moshow
2223
*/
2324
@Controller
@@ -34,29 +35,37 @@ public String index() {
3435

3536
@PostMapping("/genCode")
3637
@ResponseBody
37-
public ReturnT codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception {
38+
public ReturnT codeGenerate(@RequestBody ParamInfo paramInfo) throws Exception {
3839

39-
if (paramInfo.getTableSql().trim().length()<1) {
40+
if (paramInfo.getTableSql().trim().length() < 1) {
4041
return ReturnT.ERROR("表结构信息不可为空");
4142
}
4243

4344
//1.Parse Table Structure 表结构解析
4445
ClassInfo classInfo = null;
45-
switch (paramInfo.getDataType()){
46+
switch (paramInfo.getDataType()) {
4647
//JSON模式：parse field from json string
47-
case "json":classInfo = TableParseUtil.processJsonToClassInfo(paramInfo);break;
48+
case "json":
49+
classInfo = TableParseUtil.processJsonToClassInfo(paramInfo);
50+
break;
4851
//INSERT SQL模式：parse field from insert sql
49-
case "insert-sql":classInfo = TableParseUtil.processInsertSqlToClassInfo(paramInfo);break;
52+
case "insert-sql":
53+
classInfo = TableParseUtil.processInsertSqlToClassInfo(paramInfo);
54+
break;
5055
//正则表达式模式（非完善版本）：parse sql by regex
51-
case "sql-regex":classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);break;
56+
case "sql-regex":
57+
classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);
58+
break;
5259
//默认模式：default parse sql by java
53-
default : classInfo = TableParseUtil.processTableIntoClassInfo(paramInfo);break;
60+
default:
61+
classInfo = TableParseUtil.processTableIntoClassInfo(paramInfo);
62+
break;
5463
}
5564

5665
//2.Set the params 设置表格参数
5766
Map<String, Object> params = new HashMap<String, Object>(8);
5867
params.put("classInfo", classInfo);
59-
params.put("tableName", classInfo==null?System.currentTimeMillis():classInfo.getTableName());
68+
params.put("tableName", classInfo == null ? System.currentTimeMillis() : classInfo.getTableName());
6069
params.put("authorName", paramInfo.getAuthorName());
6170
params.put("packageName", paramInfo.getPackageName());
6271
params.put("returnUtil", paramInfo.getReturnUtil());

‎generator-web/src/main/java/com/softdev/system/generator/entity/ClassInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ClassInfo {
1414

1515
private String tableName;
1616
private String className;
17-
private String classComment;
18-
private List<FieldInfo> fieldList;
17+
private String classComment;
18+
private List<FieldInfo> fieldList;
1919

20-
}
20+
}

‎generator-web/src/main/java/com/softdev/system/generator/entity/ParamInfo.java‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
package com.softdev.system.generator.entity;
2-
3-
import lombok.Data;
4-
5-
/**
6-
* Post data - ParamInfo
7-
* @author zhengkai.blog.csdn.net
8-
*/
9-
@Data
10-
public class ParamInfo {
11-
private String tableSql;
12-
private String authorName;
13-
private String packageName;
14-
private String returnUtil;
15-
private String nameCaseType;
16-
private String tinyintTransType;
17-
private String dataType;
18-
private boolean swagger;
19-
20-
@Data
21-
public static class NAME_CASE_TYPE{
22-
public static String CAMEL_CASE="CamelCase";
23-
public static String UNDER_SCORE_CASE="UnderScoreCase";
24-
public static String UPPER_UNDER_SCORE_CASE="UpperUnderScoreCase";
25-
}
26-
}
1+
package com.softdev.system.generator.entity;
2+
3+
import lombok.Data;
4+
5+
/**
6+
* Post data - ParamInfo
7+
*
8+
* @author zhengkai.blog.csdn.net
9+
*/
10+
@Data
11+
public class ParamInfo {
12+
13+
private String tableSql;
14+
private String authorName;
15+
private String packageName;
16+
private String returnUtil;
17+
private String nameCaseType;
18+
private String tinyintTransType;
19+
private String dataType;
20+
private boolean swagger;
21+
22+
@Data
23+
public static class NAME_CASE_TYPE {
24+
public static String CAMEL_CASE = "CamelCase";
25+
public static String UNDER_SCORE_CASE = "UnderScoreCase";
26+
public static String UPPER_UNDER_SCORE_CASE = "UpperUnderScoreCase";
27+
}
28+
29+
}

0 commit comments

Comments
 (0)