Java：APIJSONBoot-MultiDataSource 从 APIJSONBoot 同步对应的源码

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.2.jar

@@ -53,7 +53,7 @@
 
 
 		<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 <<<<<<<<<< -->
-		<dependency>
+<!-- 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
 			<version>4.7.2</version>
@@ -67,7 +67,7 @@
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-column</artifactId>
 			<version>1.1.2</version>
-		</dependency>
+		</dependency> -->
 		<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 
 		<!-- 需要用的数据库 JDBC 驱动 -->

APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-4.8.0.jar renamed to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.3.jar

@@ -90,7 +90,7 @@
  * <br > 建议全通过HTTP POST来请求:
  * <br > 1.减少代码 - 客户端无需写HTTP GET,PUT等各种方式的请求代码
  * <br > 2.提高性能 - 无需URL encode和decode
- * <br > 3.调试方便 - 建议使用 APIJSON在线测试工具 或 Postman
+ * <br > 3.调试方便 - 建议使用 APIAuto(http://apijson.cn/api) 或 Postman
  * @author Lemon
  */
 @Service
@@ -187,6 +187,94 @@ public String delete(@RequestBody String request, HttpSession session) {
 	}
 
 
+	//以上接口对应的简版接口，格式为 {method}/{tag}?format=true&@explain=true.. <<<<<<<<<<<<<<<<<<<<<<<<<
+
+	/**获取
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#GET}
+	 */
+	@PostMapping("get/{tag}")  // 虽然看起来 APIAuto 更好识别是否为 APIJSON 万能接口，但 tag 导致空格截断前 Host 不固定不方便批量测试  {tag}/get")
+	@Override
+	public String getByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.getByTag(tag, params, request, session);
+	}
+
+	/**计数
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#HEAD}
+	 */
+	@PostMapping("head/{tag}")
+	@Override
+	public String headByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.headByTag(tag, params, request, session);
+	}
+
+	/**限制性GET，request和response都非明文，浏览器看不到，用于对安全性要求高的GET请求
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#GETS}
+	 */
+	@PostMapping("gets/{tag}")
+	@Override
+	public String getsByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.getsByTag(tag, params, request, session);
+	}
+
+	/**限制性HEAD，request和response都非明文，浏览器看不到，用于对安全性要求高的HEAD请求
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#HEADS}
+	 */
+	@PostMapping("heads/{tag}")
+	@Override
+	public String headsByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.headsByTag(tag, params, request, session);
+	}
+
+	/**新增
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#POST}
+	 */
+	@PostMapping("post/{tag}")
+	@Override
+	public String postByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.postByTag(tag, params, request, session);
+	}
+
+	/**修改
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#PUT}
+	 */
+	@PostMapping("put/{tag}")
+	@Override
+	public String putByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.putByTag(tag, params, request, session);
+	}
+
+	/**删除
+	 * @param request 只用String，避免encode后未decode
+	 * @param session
+	 * @return
+	 * @see {@link RequestMethod#DELETE}
+	 */
+	@PostMapping("delete/{tag}")
+	@Override
+	public String deleteByTag(@PathVariable String tag, @RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {
+		return super.deleteByTag(tag, params, request, session);
+	}
+
+	//以上接口对应的简版接口，格式为 {method}/{tag}?format=true&@explain=true..  >>>>>>>>>>>>>>>>>>>>>>>>>
+
 
 
 
@@ -197,7 +285,7 @@ public String delete(@RequestBody String request, HttpSession session) {
 	 * @return
 	 * @see {@link RequestMethod#GET}
 	 */
-	@RequestMapping("get/{request}")
+	@GetMapping("get/{request}")
 	public String openGet(@PathVariable String request, HttpSession session) {
 		try {
 			request = URLDecoder.decode(request, StringUtil.UTF_8);
@@ -214,7 +302,7 @@ public String openGet(@PathVariable String request, HttpSession session) {
 	 * @return
 	 * @see {@link RequestMethod#HEAD}
 	 */
-	@RequestMapping("head/{request}")
+	@GetMapping("head/{request}")
 	public String openHead(@PathVariable String request, HttpSession session) {
 		try {
 			request = URLDecoder.decode(request, StringUtil.UTF_8);

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.7.2.jar

@@ -26,9 +26,9 @@
 import apijson.JSONResponse;
 import apijson.NotNull;
 import apijson.RequestMethod;
-import apijson.RequestRole;
 import apijson.StringUtil;
 import apijson.framework.APIJSONFunctionParser;
+import apijson.orm.AbstractVerifier;
 import apijson.orm.JSONRequest;
 
 
@@ -212,8 +212,8 @@ public JSONArray getIdList(@NotNull JSONObject current) {
 	 */
 	public Object verifyAccess(@NotNull JSONObject current) throws Exception {
 		long userId = current.getLongValue(JSONRequest.KEY_USER_ID);
-		RequestRole role = RequestRole.get(current.getString(JSONRequest.KEY_ROLE));
-		if (role == RequestRole.OWNER && userId != DemoVerifier.getVisitorId(getSession())) {
+		String role = current.getString(JSONRequest.KEY_ROLE);
+		if (AbstractVerifier.OWNER.equals(role) && userId != DemoVerifier.getVisitorId(getSession())) {
 			throw new IllegalAccessException("登录用户与角色OWNER不匹配！");
 		}
 		return null;

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.8.0.jar

@@ -70,20 +70,20 @@ public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, Str
 
 			//取消注释来实现自定义各个表的主键名
 			//			@Override
-			//			public String getIdKey(String database, String schema, String table) {
+			//			public String getIdKey(String database, String schema, String datasource, String table) {
 			//				return StringUtil.firstCase(table + "Id");  // userId, comemntId ...
 			//				//		return StringUtil.toLowerCase(t) + "_id";  // user_id, comemnt_id ...
 			//				//		return StringUtil.toUpperCase(t) + "_ID";  // USER_ID, COMMENT_ID ...
 			//			}
 
 			@Override
-			public String getUserIdKey(String database, String schema, 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 table) {
+			//			public Object newId(RequestMethod method, String database, String schema, String datasource, String table) {
 			//				return null; // return null 则不生成 id，一般用于数据库自增 id
 			//			}
 
@@ -165,7 +165,7 @@ public String getDBUri() {
 			return "jdbc:mysql://localhost:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8"; //TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000
 		}
 		if (isPostgreSQL()) {
-			return "jdbc:postgresql://localhost:5432/postgres"; //TODO 改成你自己的
+			return "jdbc:postgresql://localhost:5432/postgres?stringtype=unspecified"; //TODO 改成你自己的
 		}
 		if (isSQLServer()) {
 			return "jdbc:jtds:sqlserver://localhost:1433/pubs;instance=SQLEXPRESS"; //TODO 改成你自己的

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.7.2.jar

@@ -14,9 +14,9 @@
 
 package apijson.demo.model;
 
-import static apijson.RequestRole.ADMIN;
-import static apijson.RequestRole.OWNER;
-import static apijson.RequestRole.UNKNOWN;
+import static apijson.orm.AbstractVerifier.ADMIN;
+import static apijson.orm.AbstractVerifier.OWNER;
+import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.8.0.jar

@@ -14,8 +14,8 @@
 
 package apijson.demo.model;
 
-import static apijson.RequestRole.ADMIN;
-import static apijson.RequestRole.UNKNOWN;
+import static apijson.orm.AbstractVerifier.ADMIN;
+import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import java.util.List;
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml

@@ -14,12 +14,12 @@
 
 package apijson.demo.model;
 
-import static apijson.RequestRole.ADMIN;
-import static apijson.RequestRole.CIRCLE;
-import static apijson.RequestRole.CONTACT;
-import static apijson.RequestRole.LOGIN;
-import static apijson.RequestRole.OWNER;
-import static apijson.RequestRole.UNKNOWN;
+import static apijson.orm.AbstractVerifier.ADMIN;
+import static apijson.orm.AbstractVerifier.CIRCLE;
+import static apijson.orm.AbstractVerifier.CONTACT;
+import static apijson.orm.AbstractVerifier.LOGIN;
+import static apijson.orm.AbstractVerifier.OWNER;
+import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import apijson.MethodAccess;
 import apijson.framework.BaseModel;

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

@@ -8,7 +8,7 @@ spring:
     hikari:
       type: com.zaxxer.hikari.HikariDataSource
       driver-class-name: org.postgresql.Driver
-      jdbc-url: jdbc:postgresql://localhost:5432/postgres
+      jdbc-url: jdbc:postgresql://localhost:5432/postgres?stringtype=unspecified
       username: postgres
       password: 
       minimum-idle: 5

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

@@ -5,8 +5,8 @@
 
 	<groupId>apijson.boot</groupId>
 	<artifactId>apijson-boot</artifactId>
-	<version>4.7.2</version>
-	<packaging>jar</packaging>
+	<version>4.8.0</version>
+	<!-- <packaging>jar</packaging> -->
 
 	<name>APIJSONBoot</name>
 	<description>Demo project for APIJSON Server based on SpringBoot</description>
@@ -53,7 +53,7 @@
 
 
 		<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 <<<<<<<<<< -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
 			<version>4.7.2</version>
@@ -67,7 +67,7 @@
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-column</artifactId>
 			<version>1.1.2</version>
-		</dependency>
+		</dependency> -->
 		<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 
 		<!-- 需要用的数据库 JDBC 驱动 -->