Skip to content

Commit d11ecfc

Browse files
zhanglingsizhanglingsi
committed
init
1 parent 93fdbba commit d11ecfc

File tree

25 files changed

+875
-541
lines changed

25 files changed

+875
-541
lines changed

‎APIJSON-Java-Server/APIJSONDemo/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>com.alibaba</groupId>
7575
<artifactId>fastjson</artifactId>
76-
<version>1.2.21</version>
76+
<version>1.2.55</version>
7777
</dependency>
7878

7979
<dependency>
@@ -146,6 +146,7 @@
146146
<include>**/*.xml</include>
147147
<include>**/*.properties</include>
148148
<include>**/*.yml</include>
149+
<include>**/*.sql</include>
149150
</includes>
150151
<filtering>true</filtering>
151152
</resource>

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/common/JsonResponse.java‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
package apijson.demo.server.common;
2+
3+
import com.google.common.base.MoreObjects;
4+
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
6+
import lombok.Setter;
7+
import lombok.extern.slf4j.Slf4j;
8+
9+
import java.io.Serializable;
10+
11+
/**
12+
* Created by zhangls on 2019/1/23.
13+
*
14+
* @author zhangls
15+
*/
16+
@Slf4j
17+
@NoArgsConstructor
18+
public class JsonResponse<T extends Response> implements Serializable {
19+
20+
private static final long serialVersionUID = 8350327877975282483L;
21+
22+
@Getter
23+
@Setter
24+
private Boolean success;
25+
26+
/**
27+
* 获取错误码
28+
*/
29+
@Getter
30+
@Setter
31+
private String errorCode;
32+
33+
@Getter
34+
@Setter
35+
private String errorMsg;
36+
37+
/**
38+
* 是否可以查询
39+
*/
40+
@Getter
41+
@Setter
42+
private Boolean hasSearch;
43+
44+
/**
45+
* 是否是文件服务
46+
*/
47+
@Getter
48+
@Setter
49+
private Boolean hasFile;
50+
51+
/**
52+
* 结果数据
53+
*/
54+
@Getter
55+
@Setter
56+
private T result;
57+
58+
59+
public JsonResponse(T result) {
60+
this.success = Boolean.TRUE;
61+
this.result = result;
62+
}
63+
64+
public JsonResponse(String errorCode, String errorMsg) {
65+
this.success = Boolean.FALSE;
66+
this.errorCode = errorCode;
67+
this.errorMsg = errorMsg;
68+
}
69+
70+
public JsonResponse(String errorCode, String errorMsg, T result) {
71+
this.success = Boolean.FALSE;
72+
this.errorCode = errorCode;
73+
this.errorMsg = errorMsg;
74+
this.result = result;
75+
}
76+
77+
@Override
78+
public boolean equals(Object o) {
79+
if (this == o) {
80+
return true;
81+
}
82+
if (o == null || getClass() != o.getClass()) {
83+
return false;
84+
}
85+
86+
JsonResponse response = (JsonResponse) o;
87+
88+
if (success.equals(response.success)) {
89+
return false;
90+
}
91+
if (!errorCode.equals(response.errorCode)) {
92+
return false;
93+
}
94+
if (!result.equals(response.result)) {
95+
return false;
96+
}
97+
98+
return true;
99+
}
100+
101+
@Override
102+
public int hashCode() {
103+
int result1 = (success ? 1 : 0);
104+
result1 = 31 * result1 + result.hashCode();
105+
result1 = 31 * result1 + errorCode.hashCode();
106+
return result1;
107+
}
108+
109+
@Override
110+
public String toString() {
111+
return MoreObjects.toStringHelper(this)
112+
.add("success", success)
113+
.add("result", result)
114+
.add("errorCode", errorCode)
115+
.add("errorMsg", errorMsg)
116+
.omitNullValues()
117+
.toString();
118+
}
119+
}

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/common/Response.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package apijson.demo.server.common;
2+
3+
/**
4+
* Created by zhangls on 2019/1/23.
5+
*/
6+
public class Response {
7+
}

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/common/UtilConstants.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public interface UtilConstants {
1616
* 公共常量
1717
*/
1818
class Public {
19-
private static final String TAG = "Controller";
2019
public static final String VERIFY_ = Verify.class.getSimpleName();
2120
public static final String USER_ = User.class.getSimpleName();
2221
public static final String PRIVACY_ = Privacy.class.getSimpleName();

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/config/ConfigAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ConfigAdapter extends WebMvcConfigurationSupport {
2222
public void addInterceptors(InterceptorRegistry registry) {
2323
// 可配置多个拦截器
2424
registry.addInterceptor(standardInterceptor).addPathPatterns("/**");
25-
registry.addInterceptor(jwtInterceptor).addPathPatterns("/api/**");
25+
// registry.addInterceptor(jwtInterceptor).addPathPatterns("/api/**");
2626

2727
super.addInterceptors(registry);
2828
}

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/config/StandardInterceptor.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public class StandardInterceptor implements HandlerInterceptor {
3131
@Override
3232
public boolean preHandle(HttpServletRequest req, HttpServletResponse res, Object handler) throws Exception {
3333
log.info("【StandardInterceptor请求拦截器预处理方法】：{}", "preHandle");
34+
String[] strings = req.getRequestURI().split("/");
35+
log.info("【进入 getDataJson 方法，请求apiCode为】：{}", strings[2]);
36+
log.info("【进入 getDataJson 方法，请求apiId为】：{}", strings[3]);
37+
log.info("【进入 getDataJson 方法，请求token为】：{}", strings[4]);
3438

3539
return true;
3640
}

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/controller/Controller.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import apijson.demo.server.common.StandardParser;
1616
import apijson.demo.server.common.UtilConstants;
17-
import apijson.demo.server.demo.DemoParser;
1817
import com.zhangls.apijson.utils.StringUtil;
1918
import lombok.extern.slf4j.Slf4j;
2019
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +35,6 @@ public class Controller {
3635

3736
@Autowired
3837
private StandardParser standardParser;
39-
@Autowired
40-
private DemoParser parser;
4138

4239
/**
4340
* 获取 查询
@@ -48,8 +45,6 @@ public String get(@RequestBody String request, HttpSession session) {
4845

4946
standardParser.setMethod(GET);
5047
return standardParser.setSession(session).parse(request);
51-
// parser.setMethod(GET);
52-
// return parser.parse(request);
5348
}
5449

5550
/**

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/controller/StandardController.java‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static com.zhangls.apijson.base.model.RequestMethod.GET;
44

5+
import apijson.demo.server.common.JsonResponse;
56
import apijson.demo.server.common.UtilConstants;
67
import apijson.demo.server.service.StandardService;
78
import apijson.demo.server.utils.ControllerUtils;
@@ -10,6 +11,7 @@
1011
import io.jsonwebtoken.Claims;
1112
import lombok.extern.slf4j.Slf4j;
1213
import org.springframework.beans.factory.annotation.Autowired;
14+
import org.springframework.http.MediaType;
1315
import org.springframework.web.bind.annotation.*;
1416

1517
import javax.servlet.http.HttpServletRequest;
@@ -20,9 +22,9 @@
2022
* @author zhangls
2123
*/
2224
@Slf4j
23-
//@RestController
24-
//@RequestMapping(value = "/api", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,
25-
// consumes = MediaType.APPLICATION_JSON_VALUE)
25+
@RestController
26+
@RequestMapping(value = "/api", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,
27+
consumes = MediaType.APPLICATION_JSON_VALUE)
2628
public class StandardController {
2729

2830

@@ -32,28 +34,38 @@ public class StandardController {
3234
/**
3335
* 获取 查询
3436
*/
35-
@PostMapping(value = UtilConstants.Request.GET)
36-
public JSONObject get(@RequestBody String queryStr, final HttpServletRequest request) {
37-
log.info("【进入 {} 方法，请求JSON串为】：{}", RequestMethod.GET, queryStr);
37+
@PostMapping("/{apiName}/{apiId}/{token}/getDataJson")
38+
public JsonResponse getDataJson(@RequestBody String queryStr,
39+
@PathVariable String apiName,
40+
@PathVariable String apiId,
41+
@PathVariable String token,
42+
final HttpServletRequest request) {
43+
log.info("【进入 getDataJson 方法，请求apiCode为】：{}", apiName);
44+
log.info("【进入 getDataJson 方法，请求apiId为】：{}", apiId);
45+
log.info("【进入 getDataJson 方法，请求token为】：{}", token);
46+
log.info("【进入 getDataJson 方法，请求JSON串为】：{}", queryStr);
3847

39-
// 获取JWT中的用户信息
40-
Claims claims = (Claims) request.getAttribute(UtilConstants.Jwt.JWT_USER_INFO);
41-
log.info("【获取JWT中的用户信息为】：{}", claims);
4248

43-
// 1. 访问权限
44-
JSONObject jsonValidate = ControllerUtils.standardValidator(GET, queryStr);
45-
log.info("【验证后的，返回的JSON串为】：{}", jsonValidate);
4649

47-
// 验证通过
48-
if (jsonValidate.containsKey(JsonApiResponse.KEY_CODE) && jsonValidate.get(JsonApiResponse.KEY_CODE).equals(JsonApiResponse.CODE_SUCCESS)) {
49-
// 有可能返回业务异常信息
50-
return service.queryService(jsonValidate);
51-
} else {
52-
jsonValidate.put("request", queryStr);
53-
54-
return jsonValidate;
55-
}
50+
// // 获取JWT中的用户信息
51+
// Claims claims = (Claims) request.getAttribute(UtilConstants.Jwt.JWT_USER_INFO);
52+
// log.info("【获取JWT中的用户信息为】：{}", claims);
53+
//
54+
// // 1. 访问权限
55+
// JSONObject jsonValidate = ControllerUtils.standardValidator(GET, queryStr);
56+
// log.info("【验证后的，返回的JSON串为】：{}", jsonValidate);
57+
//
58+
// // 验证通过
59+
// if (jsonValidate.containsKey(JsonApiResponse.KEY_CODE) && jsonValidate.get(JsonApiResponse.KEY_CODE).equals(JsonApiResponse.CODE_SUCCESS)) {
60+
// // 有可能返回业务异常信息
61+
// return service.queryService(jsonValidate);
62+
// } else {
63+
// jsonValidate.put("request", queryStr);
64+
//
65+
// return jsonValidate;
66+
// }
5667

5768
// return jsonValidate;
69+
return null;
5870
}
5971
}

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/demo/DemoParser.java‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)