Server:同步eclipse版至idea版

Author: TommyLemon

APIJSON-Java-Server/APIJSON-Idea/src/main/java/apijson/demo/server/APIJSONApplication.java

@@ -57,17 +57,18 @@ public static void main(String[] args) throws Exception {
 	@Bean  
 	public CorsFilter corsFilter() {  
 		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();  
-		source.registerCorsConfiguration("/**", buildConfig()); // 4  
+		source.registerCorsConfiguration("/**", buildConfig());
 		return new CorsFilter(source);  
 	}  
 	/**CORS跨域配置
 	 * @return
 	 */
 	private CorsConfiguration buildConfig() {  
 		CorsConfiguration corsConfiguration = new CorsConfiguration();  
-		corsConfiguration.addAllowedOrigin("*");  
-		corsConfiguration.addAllowedHeader("*");  
-		corsConfiguration.addAllowedMethod("*");  
+		corsConfiguration.addAllowedOrigin("*"); //允许的域名或IP地址
+		corsConfiguration.addAllowedHeader("*"); //允许的请求头
+		corsConfiguration.addAllowedMethod("*"); //允许的HTTP请求方法
+		corsConfiguration.setAllowCredentials(true); //允许发送跨域凭据，前端Axios存取JSESSIONID必须要
 		return corsConfiguration;  
 	}  
 	//支持JavaScript跨域请求 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

APIJSON-Java-Server/APIJSON-Idea/src/main/java/zuo/biao/apijson/JSONRequest.java

@@ -51,6 +51,7 @@ public JSONRequest(String name, Object object) {
 
 
 	public static final String KEY_TAG = "tag";//只在最外层，最外层用JSONRequest
+	public static final String KEY_VERSION = "version";//只在最外层，最外层用JSONRequest
 
 	/**set "tag":tag in outermost layer
 	 * for write operations
@@ -60,6 +61,14 @@ public JSONRequest(String name, Object object) {
 	public JSONRequest setTag(String tag) {
 		return puts(KEY_TAG, tag);
 	}
+	/**set "version":version in outermost layer
+	 * for target version of request
+	 * @param version
+	 * @return
+	 */
+	public JSONRequest setVersion(String version) {
+		return puts(KEY_VERSION, version);
+	}
 
 
 	//array object <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

APIJSON-Java-Server/APIJSON-Idea/src/main/java/zuo/biao/apijson/server/Parser.java

@@ -374,11 +374,12 @@ public static JSONObject getCorrectRequest(@NotNull RequestMethod method, JSONOb
 		if (StringUtil.isNotEmpty(tag, true) == false) {
 			throw new IllegalArgumentException("请设置tag！一般是Table名");
 		}
+		int version = request.getIntValue(JSONRequest.KEY_VERSION);
 
 		JSONObject object = null;
 		String error = "";
 		try {
-			object = getStructure(method, "Request", JSONRequest.KEY_TAG, tag);
+			object = getStructure(method, "Request", JSONRequest.KEY_TAG, tag, version);
 		} catch (Exception e) {
 			error = e.getMessage();
 		}
@@ -396,6 +397,7 @@ public static JSONObject getCorrectRequest(@NotNull RequestMethod method, JSONOb
 		//获取指定的JSON结构 >>>>>>>>>>>>>>
 
 		request.remove(JSONRequest.KEY_TAG);
+		request.remove(JSONRequest.KEY_VERSION);
 		return Structure.parseRequest(method, "", (JSONObject) target.clone(), request);
 	}
 
@@ -431,11 +433,12 @@ public static JSONObject getCorrectResponse(@NotNull final RequestMethod method
 	 * @param table
 	 * @param key
 	 * @param value
+	 * @param version
 	 * @return
 	 * @throws Exception
 	 */
 	public static JSONObject getStructure(@NotNull final RequestMethod method, @NotNull String table,
-			String key, String value) throws Exception  {
+			String key, String value, int version) throws Exception  {
 		//获取指定的JSON结构 <<<<<<<<<<<<<<
 		SQLConfig config = new SQLConfig(GET, table);
 		config.setColumn("structure");
@@ -445,7 +448,12 @@ public static JSONObject getStructure(@NotNull final RequestMethod method, @NotN
 		if (key != null) {
 			where.put(key, value);
 		}
+		if (version > 0) {
+			where.put(JSONRequest.KEY_VERSION + "{}", ">=" + version);
+		}
 		config.setWhere(where);
+		config.setOrder(JSONRequest.KEY_VERSION + (version > 0 ? "+" : "-"));
+		config.setCount(1);
 
 		SQLExecutor qh = new SQLExecutor();
 

APIJSON-Java-Server/APIJSON-Idea/src/test/java/zuo/biao/apijson/server/ApplicationTests.java

@@ -11,6 +11,7 @@ public class ApplicationTests {
 
 	@Test
 	public void contextLoads() {
+		//TODO Test Case，包括GitHub README介绍和简版demo
 	}
 
 }