Skip to content

Commit 548ed39

Browse files
zhanglingsizhanglingsi
committed
init
1 parent 5588ef4 commit 548ed39

69 files changed

Lines changed: 458 additions & 11428 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,13 @@ protected void onVerifyContent() throws Exception {
111111
super.onVerifyContent();
112112
}
113113

114-
// //可重写来设置最大查询数量
115-
// @Override
116-
// public int getMaxQueryCount() {
117-
// return 50;
118-
// }
114+
/**
115+
* 可重写来设置最大查询数量
116+
* @return
117+
*/
118+
@Override
119+
public Integer getMaxQueryCount() {
120+
return 50;
121+
}
119122

120123
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
*/
1515
public class StandardVerifier extends AbstractVerifier<Long> {
1616

17-
// <TableName, <METHOD, allowRoles>>
18-
// <User, <GET, [OWNER, ADMIN]>>
19-
static { //注册权限
17+
static {
2018
ACCESS_MAP.put(User.class.getSimpleName(), getAccessMap(User.class.getAnnotation(MethodAccess.class)));
2119
ACCESS_MAP.put(Privacy.class.getSimpleName(), getAccessMap(Privacy.class.getAnnotation(MethodAccess.class)));
2220
ACCESS_MAP.put(Moment.class.getSimpleName(), getAccessMap(Moment.class.getAnnotation(MethodAccess.class)));

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,15 @@ class Jwt {
8080
public static final String JWT_USER_INFO = "jwtUserInfo";
8181

8282
}
83+
84+
class ISqlConfig {
85+
public static final String DATABASE_MYSQL = "MySQL";
86+
public static final String DATABASE_POSTGRESQL = "PostgreSQL";
87+
public static final String SCHEMA_INFORMATION = "information_schema";
88+
public static final String TABLE_SCHEMA = "table_schema";
89+
public static final String TABLE_NAME = "table_name";
90+
public static final Integer TYPE_CHILD = 0;
91+
public static final Integer TYPE_ITEM = 1;
92+
public static final Integer TYPE_ITEM_CHILD_0 = 2;
93+
}
8394
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.zhangls.apijson.base.exception.ConditionErrorException;
1212
import com.zhangls.apijson.base.exception.OutOfRangeException;
1313
import com.zhangls.apijson.base.model.RequestMethod;
14+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1415
import com.zhangls.apijson.utils.StringUtil;
1516
import org.springframework.web.bind.annotation.PostMapping;
1617
import org.springframework.web.bind.annotation.RequestBody;
@@ -68,7 +69,7 @@ public JSONObject putBalance(@RequestBody String request, HttpSession session) {
6869
throw new IllegalArgumentException(UtilConstants.Public.PRIVACY_ + "." + UtilConstants.Balance._PAY_PASS_WORD + ":value 中value不合法！");
6970
}
7071
} catch (Exception e) {
71-
return StandardParser.extendErrorResult(requestObject, e);
72+
return ParserHelper.extendErrorResult(requestObject, e);
7273
}
7374

7475
//验证密码<<<<<<<<<<<<<<<<<<<<<<<
@@ -81,7 +82,7 @@ public JSONObject putBalance(@RequestBody String request, HttpSession session) {
8182
);
8283
response = response.getJSONResponse(UtilConstants.Public.PRIVACY_);
8384
if (JsonApiResponse.isExist(response) == false) {
84-
return StandardParser.extendErrorResult(requestObject, new ConditionErrorException("支付密码错误！"));
85+
return ParserHelper.extendErrorResult(requestObject, new ConditionErrorException("支付密码错误！"));
8586
}
8687

8788
//验证密码>>>>>>>>>>>>>>>>>>>>>>>>
@@ -90,10 +91,10 @@ public JSONObject putBalance(@RequestBody String request, HttpSession session) {
9091
//验证金额范围<<<<<<<<<<<<<<<<<<<<<<<
9192

9293
if (change == 0) {
93-
return StandardParser.extendErrorResult(requestObject, new OutOfRangeException("balance+的值不能为0！"));
94+
return ParserHelper.extendErrorResult(requestObject, new OutOfRangeException("balance+的值不能为0！"));
9495
}
9596
if (Math.abs(change) > 10000) {
96-
return StandardParser.extendErrorResult(requestObject, new OutOfRangeException("单次 充值/提现 的金额不能超过10000元！"));
97+
return ParserHelper.extendErrorResult(requestObject, new OutOfRangeException("单次 充值/提现 的金额不能超过10000元！"));
9798
}
9899

99100
//验证金额范围>>>>>>>>>>>>>>>>>>>>>>>>
@@ -109,11 +110,11 @@ public JSONObject putBalance(@RequestBody String request, HttpSession session) {
109110
Privacy privacy = response == null ? null : response.getObject(Privacy.class);
110111
long id = privacy == null ? 0 : BaseModel.value(privacy.getId());
111112
if (id != userId) {
112-
return StandardParser.extendErrorResult(requestObject, new Exception("服务器内部错误！"));
113+
return ParserHelper.extendErrorResult(requestObject, new Exception("服务器内部错误！"));
113114
}
114115

115116
if (BaseModel.value(privacy.getBalance()) < -change) {
116-
return StandardParser.extendErrorResult(requestObject, new OutOfRangeException("余额不足！"));
117+
return ParserHelper.extendErrorResult(requestObject, new OutOfRangeException("余额不足！"));
117118
}
118119
}
119120

‎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
@@ -13,6 +13,7 @@
1313
import com.zhangls.apijson.base.exception.ConditionErrorException;
1414
import com.zhangls.apijson.base.exception.NotExistException;
1515
import com.zhangls.apijson.base.service.impl.JsonBaseRequest;
16+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1617
import com.zhangls.apijson.utils.StringUtil;
1718
import org.springframework.web.bind.annotation.PostMapping;
1819
import org.springframework.web.bind.annotation.RequestBody;
@@ -109,7 +110,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
109110
requestObject.remove(UtilConstants.Login.FORMAT);
110111

111112
} catch (Exception e) {
112-
return StandardParser.extendErrorResult(requestObject, e);
113+
return ParserHelper.extendErrorResult(requestObject, e);
113114
}
114115

115116

@@ -122,13 +123,13 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
122123
);
123124

124125
if (!JsonApiResponse.isSuccess(phoneResponse)) {
125-
return StandardParser.newResult(phoneResponse.getIntValue(JsonApiResponse.KEY_CODE), phoneResponse.getString(JsonApiResponse.KEY_MSG));
126+
return ParserHelper.newResult(phoneResponse.getIntValue(JsonApiResponse.KEY_CODE), phoneResponse.getString(JsonApiResponse.KEY_MSG));
126127
}
127128

128129
JsonApiResponse response = new JsonApiResponse(phoneResponse).getJSONResponse(UtilConstants.Public.PRIVACY_);
129130

130131
if (!JsonApiResponse.isExist(response)) {
131-
return StandardParser.newErrorResult(new NotExistException("手机号未注册"));
132+
return ParserHelper.newErrorResult(new NotExistException("手机号未注册"));
132133
}
133134

134135
//根据phone获取User
@@ -162,7 +163,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
162163

163164
response = response.getJSONResponse(isPassword ? UtilConstants.Public.PRIVACY_ : UtilConstants.Public.VERIFY_);
164165
if (!JsonApiResponse.isExist(response)) {
165-
return StandardParser.newErrorResult(new ConditionErrorException("账号或密码错误"));
166+
return ParserHelper.newErrorResult(new ConditionErrorException("账号或密码错误"));
166167
}
167168

168169
response = new JsonApiResponse(
@@ -173,7 +174,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
173174

174175
User user = response.getObject(User.class);
175176
if (user == null || BaseModel.value(user.getId()) != userId) {
176-
return StandardParser.newErrorResult(new NullPointerException("服务器内部错误"));
177+
return ParserHelper.newErrorResult(new NullPointerException("服务器内部错误"));
177178
}
178179

179180

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import com.alibaba.fastjson.JSONObject;
99
import com.google.common.collect.Maps;
1010
import com.zhangls.apijson.base.JsonApiResponse;
11+
import com.zhangls.apijson.base.service.impl.AbstractParser;
12+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1113
import com.zhangls.apijson.utils.StringUtil;
1214
import lombok.extern.slf4j.Slf4j;
1315
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +72,7 @@ public String login(@RequestBody String reqStr, HttpSession session) {
7072
// 2. 验证请求字符串
7173
JSONObject reqParse = null;
7274
try {
73-
reqParse = JsonParseUtils.parseRequest(reqStr);
75+
reqParse = AbstractParser.parseRequest(reqStr);
7476
String phone = reqParse.getString(UtilConstants.Login.PHONE);
7577
String password = reqParse.getString(UtilConstants.Login.PASS_WORD);
7678

@@ -89,7 +91,7 @@ public String login(@RequestBody String reqStr, HttpSession session) {
8991
}
9092
}
9193
} catch (Exception e) {
92-
return JsonParseUtils.extendErrorResult(reqParse, e).toJSONString();
94+
return ParserHelper.extendErrorResult(reqParse, e).toJSONString();
9395
}
9496

9597
// 3. 请求Service返回结果(JSONObject对象) ,验证成功 返回token串

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import apijson.demo.server.model.Verify;
88
import com.alibaba.fastjson.JSONObject;
99
import com.zhangls.apijson.base.JsonApiResponse;
10+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1011
import com.zhangls.apijson.utils.StringUtil;
1112
import org.springframework.web.bind.annotation.PostMapping;
1213

@@ -50,11 +51,11 @@ public JSONObject logout(HttpSession session) {
5051
// Log.d(TAG, "logout userId = " + userId + "; session.getId() = " + (session == null ? null : session.getId()));
5152
session.invalidate();
5253
} catch (Exception e) {
53-
return StandardParser.newErrorResult(e);
54+
return ParserHelper.newErrorResult(e);
5455
}
5556

56-
JSONObject result = StandardParser.newSuccessResult();
57-
JSONObject user = StandardParser.newSuccessResult();
57+
JSONObject result = ParserHelper.newSuccessResult();
58+
JSONObject user = ParserHelper.newSuccessResult();
5859
user.put(ID, userId);
5960
user.put(COUNT, 1);
6061
result.put(StringUtil.firstCase(USER_), user);

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.zhangls.apijson.base.JsonApiResponse;
1212
import com.zhangls.apijson.base.exception.ConditionErrorException;
1313
import com.zhangls.apijson.base.model.RequestMethod;
14+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1415
import com.zhangls.apijson.utils.StringUtil;
1516
import org.springframework.web.bind.annotation.PostMapping;
1617
import org.springframework.web.bind.annotation.RequestBody;
@@ -83,7 +84,7 @@ public JSONObject register(@RequestBody String request) {
8384
return newIllegalArgumentResult(requestObject, VERIFY);
8485
}
8586
} catch (Exception e) {
86-
return StandardParser.extendErrorResult(requestObject, e);
87+
return ParserHelper.extendErrorResult(requestObject, e);
8788
}
8889

8990

@@ -93,7 +94,7 @@ public JSONObject register(@RequestBody String request) {
9394
}
9495
//手机号或验证码错误
9596
if (JsonApiResponse.isExist(response.getJSONResponse(VERIFY_)) == false) {
96-
return StandardParser.extendErrorResult(response, new ConditionErrorException("手机号或验证码错误！"));
97+
return ParserHelper.extendErrorResult(response, new ConditionErrorException("手机号或验证码错误！"));
9798
}
9899

99100

@@ -145,7 +146,7 @@ public static JSONObject newIllegalArgumentResult(JSONObject requestObject, Stri
145146
* @return
146147
*/
147148
public static JSONObject newIllegalArgumentResult(JSONObject requestObject, String key, String msg) {
148-
return StandardParser.extendErrorResult(requestObject
149+
return ParserHelper.extendErrorResult(requestObject
149150
, new IllegalArgumentException(key + ":value 中value不合法！" + StringUtil.getString(msg)));
150151
}
151152

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.zhangls.apijson.base.exception.ConditionErrorException;
1313
import com.zhangls.apijson.base.exception.ConflictException;
1414
import com.zhangls.apijson.base.model.RequestMethod;
15+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1516
import com.zhangls.apijson.utils.StringUtil;
1617
import org.springframework.web.bind.annotation.PostMapping;
1718
import org.springframework.web.bind.annotation.RequestBody;
@@ -89,16 +90,16 @@ public JSONObject putPassword(@RequestBody String request) {
8990
}
9091
}
9192
} catch (Exception e) {
92-
return StandardParser.extendErrorResult(requestObject, e);
93+
return ParserHelper.extendErrorResult(requestObject, e);
9394
}
9495

9596

9697
if (StringUtil.isPassword(oldPassword)) {
9798
if (userId <= 0) {
98-
return StandardParser.extendErrorResult(requestObject, new IllegalArgumentException(UtilConstants.Reset.ID + ":value 中value不合法！"));
99+
return ParserHelper.extendErrorResult(requestObject, new IllegalArgumentException(UtilConstants.Reset.ID + ":value 中value不合法！"));
99100
}
100101
if (oldPassword.equals(password)) {
101-
return StandardParser.extendErrorResult(requestObject, new ConflictException("新旧密码不能一样！"));
102+
return ParserHelper.extendErrorResult(requestObject, new ConflictException("新旧密码不能一样！"));
102103
}
103104

104105
//验证旧密码
@@ -114,15 +115,15 @@ public JSONObject putPassword(@RequestBody String request) {
114115
)
115116
);
116117
if (JsonApiResponse.isExist(response.getJSONResponse(UtilConstants.Public.PRIVACY_)) == false) {
117-
return StandardParser.extendErrorResult(requestObject, new ConditionErrorException("账号或原密码错误，请重新输入！"));
118+
return ParserHelper.extendErrorResult(requestObject, new ConditionErrorException("账号或原密码错误，请重新输入！"));
118119
}
119120
} else if (StringUtil.isPhone(phone) && StringUtil.isVerify(verify)) {
120121
JsonApiResponse response = new JsonApiResponse(ControllerUtils.headVerify(type, phone, verify));
121122
if (JsonApiResponse.isSuccess(response) == false) {
122123
return response;
123124
}
124125
if (JsonApiResponse.isExist(response.getJSONResponse(UtilConstants.Public.VERIFY_)) == false) {
125-
return StandardParser.extendErrorResult(response, new ConditionErrorException("手机号或验证码错误！"));
126+
return ParserHelper.extendErrorResult(response, new ConditionErrorException("手机号或验证码错误！"));
126127
}
127128
response = new JsonApiResponse(
128129
new StandardParser(RequestMethod.GET, true).parseResponse(
@@ -138,7 +139,7 @@ public JSONObject putPassword(@RequestBody String request) {
138139

139140
requestObject.put(UtilConstants.Public.PRIVACY_, privacyObj);
140141
} else {
141-
return StandardParser.extendErrorResult(requestObject, new IllegalArgumentException("请输入合法的 旧密码 或 手机号+验证码 ！"));
142+
return ParserHelper.extendErrorResult(requestObject, new IllegalArgumentException("请输入合法的 旧密码 或 手机号+验证码 ！"));
142143
}
143144
//TODO 上线版加上 password = MD5Util.MD5(password);
144145

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.zhangls.apijson.base.JsonApiRequest;
1010
import com.zhangls.apijson.base.JsonApiResponse;
1111
import com.zhangls.apijson.base.model.RequestMethod;
12+
import com.zhangls.apijson.base.service.impl.ParserHelper;
1213
import com.zhangls.apijson.utils.StringUtil;
1314
import org.springframework.web.bind.annotation.PostMapping;
1415
import org.springframework.web.bind.annotation.RequestBody;
@@ -39,7 +40,7 @@ public JSONObject postVerify(@RequestBody String request) {
3940
type = requestObject.getIntValue(UtilConstants.Login.TYPE);
4041
phone = requestObject.getString(UtilConstants.Reset.PHONE);
4142
} catch (Exception e) {
42-
return StandardParser.extendErrorResult(requestObject, e);
43+
return ParserHelper.extendErrorResult(requestObject, e);
4344
}
4445

4546
new StandardParser(RequestMethod.DELETE, true).parse(newVerifyRequest(type, phone, null));
@@ -82,7 +83,7 @@ public JSONObject getVerify(@RequestBody String request) {
8283
type = requestObject.getIntValue(UtilConstants.Login.TYPE);
8384
phone = requestObject.getString(UtilConstants.Reset.PHONE);
8485
} catch (Exception e) {
85-
return StandardParser.extendErrorResult(requestObject, e);
86+
return ParserHelper.extendErrorResult(requestObject, e);
8687
}
8788
return new StandardParser(RequestMethod.GETS, true).parseResponse(newVerifyRequest(type, phone, null));
8889
}
@@ -105,7 +106,7 @@ public JSONObject headVerify(@RequestBody String request) {
105106
phone = requestObject.getString(UtilConstants.Reset.PHONE);
106107
verify = requestObject.getString(UtilConstants.Reset.VERIFY);
107108
} catch (Exception e) {
108-
return StandardParser.extendErrorResult(requestObject, e);
109+
return ParserHelper.extendErrorResult(requestObject, e);
109110
}
110111
return ControllerUtils.headVerify(type, phone, verify);
111112
}

0 commit comments

Comments
 (0)