Skip to content

Commit e0cac32

Browse files
zhanglingsizhanglingsi
committed
init
1 parent 9b60c87 commit e0cac32

17 files changed

Lines changed: 70 additions & 72 deletions

File tree

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ public abstract class StandardObjectParser extends AbstractObjectParser {
2525
COMPILE_MAP.put("idCard", StringUtil.PATTERN_ID_CARD);
2626
}
2727

28-
/**
29-
* for single object
30-
*
31-
* @param parentPath
32-
* @param request
33-
* @param name
34-
* @throws Exception
35-
*/
3628
public StandardObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, String name, SqlConfig arrayConfig) throws Exception {
3729
super(request, parentPath, name, arrayConfig);
3830
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ public StandardParser(RequestMethod method, boolean noVerify) {
2828
super(method, noVerify);
2929
}
3030

31+
32+
3133
protected HttpSession session;
3234

3335
public HttpSession getSession() {
@@ -56,6 +58,11 @@ public StandardSqlExecutor createSQLExecutor() {
5658
return new StandardSqlExecutor();
5759
}
5860

61+
/**
62+
* 登陆使用
63+
* @param request
64+
* @return
65+
*/
5966
@Override
6067
public JSONObject parseResponse(JSONObject request) {
6168
//补充format

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* @author zhangls
1414
*/
1515
public class StandardVerifier extends AbstractVerifier<Long> {
16-
private static final String TAG = "DemoVerifier";
1716

1817
// <TableName, <METHOD, allowRoles>>
1918
// <User, <GET, [OWNER, ADMIN]>>
@@ -46,6 +45,14 @@ public String getVisitorIdKey() {
4645
return UtilConstants.Login.USER_ID;
4746
}
4847

48+
/**
49+
* 验证访问Key
50+
*
51+
* 如果表名 是User 或者 Privacy 则返回 "id" 否则返回 "userId"
52+
*
53+
* @param table
54+
* @return
55+
*/
4956
@Override
5057
public String getVisitorIdKey(String table) {
5158
return UtilConstants.Public.USER_.equals(table) || UtilConstants.Public.PRIVACY_.equals(table) ? UtilConstants.Reset.ID : getVisitorIdKey();

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import javax.servlet.http.HttpSession;
1414

1515
import apijson.demo.server.common.StandardParser;
16+
import apijson.demo.server.common.UtilConstants;
1617
import com.zhangls.apijson.utils.StringUtil;
1718
import lombok.extern.slf4j.Slf4j;
1819
import org.springframework.web.bind.annotation.*;
@@ -28,13 +29,13 @@
2829
* @author zhangls
2930
*/
3031
@Slf4j
31-
//@RestController
32+
@RestController
3233
public class Controller {
3334

3435
/**
3536
* 获取 查询
3637
*/
37-
// @PostMapping(UtilConstants.Request.GET)
38+
@PostMapping(UtilConstants.Request.GET)
3839
public String get(@RequestBody String request, HttpSession session) {
3940
log.info("【进入 {} 方法，请求JSON串为】：{}", RequestMethod.getName(GET), request);
4041

@@ -44,7 +45,7 @@ public String get(@RequestBody String request, HttpSession session) {
4445
/**
4546
* 计数 查询count(*)
4647
*/
47-
// @PostMapping(UtilConstants.Request.HEAD)
48+
@PostMapping(UtilConstants.Request.HEAD)
4849
public String head(@RequestBody String request, HttpSession session) {
4950
log.info("进入 {} 方法，请求JSON串为：{}", RequestMethod.getName(HEAD), request);
5051

@@ -54,7 +55,7 @@ public String head(@RequestBody String request, HttpSession session) {
5455
/**
5556
* 限制性GET，request和response都非明文，浏览器看不到，用于对安全性要求高的GET请求
5657
*/
57-
// @PostMapping(UtilConstants.Request.GETS)
58+
@PostMapping(UtilConstants.Request.GETS)
5859
public String gets(@RequestBody String request, HttpSession session) {
5960
log.info("进入 {} 方法，请求JSON串为：{}", RequestMethod.getName(GETS), request);
6061

@@ -64,7 +65,7 @@ public String gets(@RequestBody String request, HttpSession session) {
6465
/**
6566
* 限制性HEAD，request和response都非明文，浏览器看不到，用于对安全性要求高的HEAD请求
6667
*/
67-
// @PostMapping(UtilConstants.Request.HEADS)
68+
@PostMapping(UtilConstants.Request.HEADS)
6869
public String heads(@RequestBody String request, HttpSession session) {
6970
log.info("进入 {} 方法，请求JSON串为：{}", RequestMethod.getName(HEADS), request);
7071

@@ -74,7 +75,7 @@ public String heads(@RequestBody String request, HttpSession session) {
7475
/**
7576
* 新增POST
7677
*/
77-
// @PostMapping(UtilConstants.Request.POST)
78+
@PostMapping(UtilConstants.Request.POST)
7879
public String post(@RequestBody String request, HttpSession session) {
7980
log.info("进入 {} 方法，请求JSON串为：{}", RequestMethod.getName(POST), request);
8081

@@ -84,7 +85,7 @@ public String post(@RequestBody String request, HttpSession session) {
8485
/**
8586
* 修改 PUT
8687
*/
87-
// @PostMapping(UtilConstants.Request.PUT)
88+
@PostMapping(UtilConstants.Request.PUT)
8889
public String put(@RequestBody String request, HttpSession session) {
8990
log.info("进入 {} 方法，请求JSON串为：{}", RequestMethod.getName(PUT), request);
9091

@@ -94,7 +95,7 @@ public String put(@RequestBody String request, HttpSession session) {
9495
/**
9596
* 删除 DELETE
9697
*/
97-
// @PostMapping(UtilConstants.Request.DELETE)
98+
@PostMapping(UtilConstants.Request.DELETE)
9899
public String delete(@RequestBody String request, HttpSession session) {
99100
log.info("进入 {} 方法，请求JSON串为：{}", RequestMethod.getName(DELETE), request);
100101

@@ -106,7 +107,7 @@ public String delete(@RequestBody String request, HttpSession session) {
106107
* 只为兼容HTTP GET请求，推荐用HTTP POST，可删除
107108
*/
108109
@Deprecated
109-
// @GetMapping("get/{request}")
110+
@GetMapping("get/{request}")
110111
public String openGet(@PathVariable String request, HttpSession session) {
111112
try {
112113
request = URLDecoder.decode(request, StringUtil.UTF_8);
@@ -121,7 +122,7 @@ public String openGet(@PathVariable String request, HttpSession session) {
121122
* 只为兼容HTTP GET请求，推荐用HTTP POST，可删除
122123
*/
123124
@Deprecated
124-
// @GetMapping("head/{request}")
125+
@GetMapping("head/{request}")
125126
public String openHead(@PathVariable String request, HttpSession session) {
126127
try {
127128
request = URLDecoder.decode(request, StringUtil.UTF_8);

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.zhangls.apijson.base.JsonApiResponse;
1313
import com.zhangls.apijson.base.exception.ConditionErrorException;
1414
import com.zhangls.apijson.base.exception.NotExistException;
15+
import com.zhangls.apijson.base.service.impl.JsonBaseRequest;
1516
import com.zhangls.apijson.utils.StringUtil;
1617
import org.springframework.web.bind.annotation.PostMapping;
1718
import org.springframework.web.bind.annotation.RequestBody;
@@ -115,7 +116,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
115116
//手机号是否已注册
116117
//SELECT COUNT(*) AS COUNT FROM `apijson`.`apijson_privacy` WHERE ( (`phone`='13000082001') ) LIMIT 1 OFFSET 0
117118
JSONObject phoneResponse = new StandardParser(HEADS, true).parseResponse(
118-
new JsonApiRequest(
119+
new JsonBaseRequest(
119120
new Privacy().setPhone(phone)
120121
)
121122
);
@@ -132,7 +133,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
132133

133134
//根据phone获取User
134135
JSONObject privacyResponse = new StandardParser(GETS, true).parseResponse(
135-
new JsonApiRequest(
136+
new JsonBaseRequest(
136137
new Privacy().setPhone(phone)
137138
).setFormat(true)
138139
);
@@ -148,7 +149,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
148149
if (isPassword) {
149150
response = new JsonApiResponse(
150151
new StandardParser(HEADS, true).parseResponse(
151-
new JsonApiRequest(new Privacy(userId).setPassword(password))
152+
new JsonBaseRequest(new Privacy(userId).setPassword(password))
152153
)
153154
);
154155
} else {//verify手机验证码登录
@@ -160,13 +161,13 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
160161
}
161162

162163
response = response.getJSONResponse(isPassword ? UtilConstants.Public.PRIVACY_ : UtilConstants.Public.VERIFY_);
163-
if (JsonApiResponse.isExist(response) == false) {
164+
if (!JsonApiResponse.isExist(response)) {
164165
return StandardParser.newErrorResult(new ConditionErrorException("账号或密码错误"));
165166
}
166167

167168
response = new JsonApiResponse(
168169
new StandardParser(GETS, true).parseResponse(
169-
new JsonApiRequest(new User(userId)).setFormat(true)
170+
new JsonBaseRequest(new User(userId)).setFormat(true)
170171
)
171172
);
172173

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/com/zhangls/apijson/base/JsonApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public static <T> T parseObject(String json, Class<T> clazz) {
134134
log.error("参数类型异常：{}", clazz);
135135
} else {
136136
try {
137-
int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
137+
int features = JSON.DEFAULT_PARSER_FEATURE;
138138
features |= Feature.OrderedField.getMask();
139139
return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), clazz, features);
140140
} catch (Exception e) {

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/com/zhangls/apijson/base/JsonApiObject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
public class JsonApiObject extends JSONObject {
1717

1818
public JsonApiObject() {
19-
super(true);
19+
super(Boolean.TRUE);
2020
}
2121

2222
public JsonApiObject(Object object) {

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/com/zhangls/apijson/base/JsonApiResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ public static JSONObject format(final JSONObject object) {
394394
if (object == null || object.isEmpty()) {
395395
return object;
396396
}
397-
JsonApiObject formatedObject = new JsonApiObject(true);
397+
JSONObject formatedObject = new JSONObject(true);
398398

399399
Set<String> set = object.keySet();
400400
if (set != null) {
@@ -406,8 +406,8 @@ public static JSONObject format(final JSONObject object) {
406406
if (value instanceof JSONArray) {
407407
formatedObject.put(formatArrayKey(key), format((JSONArray) value));
408408
//JSONObject，往下一级提取
409-
} else if (value instanceof JsonApiObject) {
410-
formatedObject.put(formatObjectKey(key), format((JsonApiObject) value));
409+
} else if (value instanceof JSONObject) {
410+
formatedObject.put(formatObjectKey(key), format((JSONObject) value));
411411
} else {//其它Object，直接填充
412412
formatedObject.put(formatOtherKey(key), value);
413413
}

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/com/zhangls/apijson/base/service/SqlConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public interface SqlConfig {
5656
String getSQL(Boolean prepared) throws Exception;
5757

5858

59-
Boolean isTest();
59+
boolean isTest();
6060

61-
SqlConfig setTest(Boolean test);
61+
SqlConfig setTest(boolean test);
6262

63-
Boolean isCacheStatic();
63+
boolean isCacheStatic();
6464

65-
SqlConfig setCacheStatic(Boolean cacheStatic);
65+
SqlConfig setCacheStatic(boolean cacheStatic);
6666

6767
Integer getType();
6868

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/com/zhangls/apijson/base/service/Verifier.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public interface Verifier<T> {
1818
* @return
1919
* @throws Exception
2020
*/
21-
boolean verify(SqlConfig config) throws Exception;
21+
Boolean verify(SqlConfig config) throws Exception;
2222

2323
/**
2424
* 允许请求，角色不好判断，让访问者发过来角色名，OWNER,CONTACT,ADMIN等

0 commit comments

Comments
 (0)