适配新版(预计 5.1.0) APIJSON 的主键泛型及生成值方法等

Author: TommyLemon

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

@@ -101,7 +101,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
 COMPILE_MAP.put("ID_CARD", StringUtil.PATTERN_ID_CARD);
 
 // 使用本项目的自定义处理类
-APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator() {
+APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Long>() {
 
 @Override
 public Parser<Long> createParser() {

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

@@ -101,7 +101,7 @@
 @Service
 @RestController
 @RequestMapping("")
-public class DemoController extends APIJSONRouterController { // APIJSONController { // 
+public class DemoController extends APIJSONRouterController<Long> { // APIJSONController<Long> { // 
 private static final String TAG = "DemoController";
 
 // 可以更方便地通过日志排查错误

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

@@ -57,7 +57,9 @@ public Long getCurrentUserId(@NotNull JSONObject current) {
 }
 
 public List<Long> getCurrentUserIdAsList(@NotNull JSONObject current) {
-return Arrays.asList(DemoVerifier.getVisitorId(getSession()));
+List<Long> list = new ArrayList<>(1);
+list.add(DemoVerifier.getVisitorId(getSession()));
+return list;
 }
 
 public List<Long> getCurrentContactIdList(@NotNull JSONObject current) {
@@ -235,17 +237,14 @@ public JSONArray getIdList(@NotNull JSONObject current) {
  * @return
  * @throws Exception
  */
-@Override
 public Object verifyAccess(@NotNull JSONObject current) throws Exception {
 long userId = current.getLongValue(JSONRequest.KEY_USER_ID);
 String role = current.getString(JSONRequest.KEY_ROLE);
-if (AbstractVerifier.OWNER.equals(role) && userId != DemoVerifier.getVisitorId(getSession())) {
+if (AbstractVerifier.OWNER.equals(role) && userId != (Long) DemoVerifier.getVisitorId(getSession())) {
 throw new IllegalAccessException("登录用户与角色OWNER不匹配！");
 }
 return null;
 }
 
 
-
-
 }

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

@@ -26,7 +26,7 @@
  * 具体见 https://github.com/Tencent/APIJSON/issues/38
  * @author Lemon
  */
-public class DemoParser extends APIJSONParser {
+public class DemoParser extends APIJSONParser<Long> {
 
  public DemoParser() {
  super();

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

@@ -65,10 +65,10 @@ public DemoSQLConfig(RequestMethod method, String table) {
 //	TABLE_KEY_MAP.put(Privacy.class.getSimpleName(), "apijson_privacy");
 
 //主键名映射
-SIMPLE_CALLBACK = new SimpleCallback() {
+SIMPLE_CALLBACK = new SimpleCallback<Long>() {
 
 @Override
-public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, String schema, String table) {
+public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, String schema, String datasource, String table) {
 return new DemoSQLConfig(method, table);
 }
 
@@ -81,13 +81,13 @@ public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, Str
 //	}
 
 @Override
-public String getUserIdKey(String database, String schema,String datasource, String table) {
+public String getUserIdKey(String database, String schema, String datasource, String table) {
 return USER_.equals(table) || PRIVACY_.equals(table) ? ID : USER_ID; // id / userId
 }
 
 //取消注释来实现数据库自增 id
 //	@Override
-//	public Object newId(RequestMethod method, String database, String schema, String datasource, String table) {
+//	public Long newId(RequestMethod method, String database, String schema, String datasource, String table) {
 //	return null; // return null 则不生成 id，一般用于数据库自增 id
 //	}
 

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

@@ -21,7 +21,7 @@
  * 具体见 https://github.com/Tencent/APIJSON/issues/12
  * @author Lemon
  */
-public class DemoVerifier extends APIJSONRouterVerifier { // APIJSONVerifier {
+public class DemoVerifier extends APIJSONRouterVerifier<Long> { // APIJSONVerifier<Long> {
 public static final String TAG = "DemoVerifier";
 
 // 重写方法来自定义字段名等