Skip to content

Commit ac728ef

Browse files
TommyLemonTommyLemon
committed
适配新版(预计 5.1.0) APIJSON 的主键泛型及生成值方法等
1 parent 1d23757 commit ac728ef

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
101101
COMPILE_MAP.put("ID_CARD", StringUtil.PATTERN_ID_CARD);
102102

103103
// 使用本项目的自定义处理类
104-
APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator() {
104+
APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Long>() {
105105

106106
@Override
107107
public Parser<Long> createParser() {

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
@Service
102102
@RestController
103103
@RequestMapping("")
104-
public class DemoController extends APIJSONRouterController { // APIJSONController { //
104+
public class DemoController extends APIJSONRouterController<Long> { // APIJSONController<Long> { //
105105
private static final String TAG = "DemoController";
106106

107107
// 可以更方便地通过日志排查错误

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoFunctionParser.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ public Long getCurrentUserId(@NotNull JSONObject current) {
5757
}
5858

5959
public List<Long> getCurrentUserIdAsList(@NotNull JSONObject current) {
60-
return Arrays.asList(DemoVerifier.getVisitorId(getSession()));
60+
List<Long> list = new ArrayList<>(1);
61+
list.add(DemoVerifier.getVisitorId(getSession()));
62+
return list;
6163
}
6264

6365
public List<Long> getCurrentContactIdList(@NotNull JSONObject current) {
@@ -235,17 +237,14 @@ public JSONArray getIdList(@NotNull JSONObject current) {
235237
* @return
236238
* @throws Exception
237239
*/
238-
@Override
239240
public Object verifyAccess(@NotNull JSONObject current) throws Exception {
240241
long userId = current.getLongValue(JSONRequest.KEY_USER_ID);
241242
String role = current.getString(JSONRequest.KEY_ROLE);
242-
if (AbstractVerifier.OWNER.equals(role) && userId != DemoVerifier.getVisitorId(getSession())) {
243+
if (AbstractVerifier.OWNER.equals(role) && userId != (Long) DemoVerifier.getVisitorId(getSession())) {
243244
throw new IllegalAccessException("登录用户与角色OWNER不匹配！");
244245
}
245246
return null;
246247
}
247248

248249

249-
250-
251250
}

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* 具体见 https://github.com/Tencent/APIJSON/issues/38
2727
* @author Lemon
2828
*/
29-
public class DemoParser extends APIJSONParser {
29+
public class DemoParser extends APIJSONParser<Long> {
3030

3131
public DemoParser() {
3232
super();

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public DemoSQLConfig(RequestMethod method, String table) {
6565
// TABLE_KEY_MAP.put(Privacy.class.getSimpleName(), "apijson_privacy");
6666

6767
//主键名映射
68-
SIMPLE_CALLBACK = new SimpleCallback() {
68+
SIMPLE_CALLBACK = new SimpleCallback<Long>() {
6969

7070
@Override
71-
public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, String schema, String table) {
71+
public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, String schema, String datasource, String table) {
7272
return new DemoSQLConfig(method, table);
7373
}
7474

@@ -81,13 +81,13 @@ public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, Str
8181
// }
8282

8383
@Override
84-
public String getUserIdKey(String database, String schema,String datasource, String table) {
84+
public String getUserIdKey(String database, String schema, String datasource, String table) {
8585
return USER_.equals(table) || PRIVACY_.equals(table) ? ID : USER_ID; // id / userId
8686
}
8787

8888
//取消注释来实现数据库自增 id
8989
// @Override
90-
// public Object newId(RequestMethod method, String database, String schema, String datasource, String table) {
90+
// public Long newId(RequestMethod method, String database, String schema, String datasource, String table) {
9191
// return null; // return null 则不生成 id，一般用于数据库自增 id
9292
// }
9393

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoVerifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* 具体见 https://github.com/Tencent/APIJSON/issues/12
2222
* @author Lemon
2323
*/
24-
public class DemoVerifier extends APIJSONRouterVerifier { // APIJSONVerifier {
24+
public class DemoVerifier extends APIJSONRouterVerifier<Long> { // APIJSONVerifier<Long> {
2525
public static final String TAG = "DemoVerifier";
2626

2727
// 重写方法来自定义字段名等

0 commit comments

Comments
 (0)