Server:同步eclipse版至idea版

Author: TommyLemon

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

@@ -41,7 +41,6 @@ public static void main(String[] args) throws Exception {
 		}
 		System.out.println("\n完成测试:远程函数 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
 
-//		Structure.init();
 
 		System.out.println("\n\n\n开始测试:请求校验 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
 		try {

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

@@ -158,7 +158,7 @@ public String delete(@RequestBody String request, HttpSession session) {
 	 * @see {@link RequestMethod#GET}
 	 */
 	@RequestMapping("get/{request}")
-	public String open_get(@PathVariable String request, HttpSession session) {
+	public String openGet(@PathVariable String request, HttpSession session) {
 		try {
 			request = URLDecoder.decode(request, StringUtil.UTF_8);
 		} catch (Exception e) {
@@ -175,7 +175,7 @@ public String open_get(@PathVariable String request, HttpSession session) {
 	 * @see {@link RequestMethod#HEAD}
 	 */
 	@RequestMapping("head/{request}")
-	public String open_head(@PathVariable String request, HttpSession session) {
+	public String openHead(@PathVariable String request, HttpSession session) {
 		try {
 			request = URLDecoder.decode(request, StringUtil.UTF_8);
 		} catch (Exception e) {
@@ -676,7 +676,7 @@ public static JSONObject newIllegalArgumentResult(JSONObject requestObject, Stri
 	@PostMapping("put/password")
 	public JSONObject putPassword(@RequestBody String request){
 		JSONObject requestObject = null;
-		String old_password;
+		String oldPassword;
 		String verify;
 
 		int type = Verify.TYPE_PASSWORD;
@@ -687,7 +687,7 @@ public JSONObject putPassword(@RequestBody String request){
 		String password;
 		try {
 			requestObject = Parser.parseRequest(request, PUT);
-			old_password = StringUtil.getString(requestObject.getString(OLD_PASSWORD));
+			oldPassword = StringUtil.getString(requestObject.getString(OLD_PASSWORD));
 			verify = StringUtil.getString(requestObject.getString(VERIFY));
 
 			requestObject.remove(OLD_PASSWORD);
@@ -717,20 +717,20 @@ public JSONObject putPassword(@RequestBody String request){
 		}
 
 
-		if (StringUtil.isPassword(old_password)) {
+		if (StringUtil.isPassword(oldPassword)) {
 			if (userId <= 0) { //手机号+验证码不需要userId
 				return Parser.extendErrorResult(requestObject, new IllegalArgumentException(ID + ":value 中value不合法！"));
 			}
-			if (old_password.equals(password)) {
+			if (oldPassword.equals(password)) {
 				return Parser.extendErrorResult(requestObject, new ConflictException("新旧密码不能一样！"));
 			}
 
 			//验证旧密码
 			Privacy privacy = new Privacy(userId);
 			if (type == Verify.TYPE_PASSWORD) {
-				privacy.setPassword(old_password);
+				privacy.setPassword(oldPassword);
 			} else {
-				privacy.setPayPassword(old_password);
+				privacy.setPayPassword(oldPassword);
 			}
 			JSONResponse response = new JSONResponse( 
 					new Parser(HEAD, true).parseResponse(

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

@@ -18,7 +18,7 @@
 import java.util.Map;
 
 //TODO  新增 @FunctionList ，被它注解过的List可以传到 FuntionUtil.invoke(FunctionList list, ...)
-/**可远程调用的函数列表
+/**可远程调用的函数列表，暴露功能和使用方式，而不是具体的实现细节。
  * @author Lemon
  */
 public interface FunctionList {

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

@@ -148,7 +148,7 @@ public ObjectParser(@NotNull JSONObject request, String parentPath, int type, St
 		COMPILE_MAP = new HashMap<String, Pattern>();
 		COMPILE_MAP.put("phone", StringUtil.PATTERN_PHONE);
 		COMPILE_MAP.put("email", StringUtil.PATTERN_EMAIL);
-		COMPILE_MAP.put("id_number", StringUtil.PATTERN_ID_CARD);
+		COMPILE_MAP.put("idCard", StringUtil.PATTERN_ID_CARD);
 	}
 
 	protected Map<String, String> corrected;
@@ -398,7 +398,7 @@ protected boolean onParse(@NotNull String key, @NotNull Object value) throws Exc
 	}
 
 
-	//TODO 需要锁表来保证获取到的 [] 不会在写入前被修改
+	//TODO 改用 MySQL json_add,json_remove,json_contains 等函数！ 
 	/**PUT key:[]
 	 * @param key
 	 * @param array

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

@@ -71,10 +71,6 @@
 public class SQLConfig {
 	private static final String TAG = "SQLConfig";
 
-	public static final String MYSQL_URI = "jdbc:mysql://localhost:3306";//TODO 改成你自己的
-	public static final String MYSQL_SCHEMA = "sys";//TODO 改成你自己的
-	public static final String MYSQL_ACCOUNT = "root";//TODO 改成你自己的
-	public static final String MYSQL_PASSWORD = "apijson";//TODO 改成你自己的
 
 
 	public static final String SCHEMA_INFORMATION = "`information_schema`";
@@ -203,7 +199,7 @@ public String getSchema() {
 	}
 	public static String getSchema(String schema) {
 		if (StringUtil.isEmpty(schema, true)) {
-			schema = MYSQL_SCHEMA; //非默认Schema必须要有
+			schema = "sys"; //非默认Schema必须要有
 		}
 		return schema;
 	}
@@ -1027,8 +1023,8 @@ private static String getConditionString(String column, String table, SQLConfig
 		//		//order: id+ -> id >= idOfStartIndex; id- -> id <= idOfStartIndex >>>>>>>>>>>>>>>>>>
 		//
 		//
-		//		//结果错误！SELECT * FROM linking_member.mes_member_user_test AS t0 INNER JOIN
-		//      (SELECT id FROM linking_member.mes_member_user_test ORDER BY date ASC LIMIT 20, 10) AS t1 ON t0.id = t1.id
+		//		//结果错误！SELECT * FROM Test AS t0 INNER JOIN
+		//      (SELECT id FROM Test ORDER BY date ASC LIMIT 20, 10) AS t1 ON t0.id = t1.id
 		//		//common case, inner join
 		//		condition += config.getLimitString();
 		//		return table + " AS t0 INNER JOIN (SELECT id FROM " + condition + ") AS t1 ON t0.id = t1.id";
@@ -1117,7 +1113,7 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, JSONObj
 
 			column = StringUtil.getString(column);
 			if (column.isEmpty() && RequestMethod.isHeadMethod(method, true) == false) {
-				column = "column_name,column_type,is_nullable,column_default,column_comment";
+				column = "column_name,column_type,column_default,column_comment";
 			}
 		}
 

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

@@ -38,6 +38,9 @@
 public class SQLExecutor {
 	private static final String TAG = "SQLExecutor";
 
+	public static final String MYSQL_URI = "jdbc:mysql://localhost:3306";//TODO 改成你自己的
+	public static final String MYSQL_ACCOUNT = "root";//TODO 改成你自己的
+	public static final String MYSQL_PASSWORD = "apijson";//TODO 改成你自己的
 
 	//访问一次后丢失，可能因为static导致内存共享，别的地方改变了内部对象的值
 	//	private static final Map<String, Map<Integer, JSONObject>> staticCacheMap;
@@ -63,8 +66,8 @@ public class SQLExecutor {
 	 */
 	private synchronized Connection getConnection() throws Exception {
 		Log.i(TAG, "成功加载MySQL驱动！");
-		return DriverManager.getConnection(SQLConfig.MYSQL_URI + "?useUnicode=true&characterEncoding=UTF-8&user="
-				+ SQLConfig.MYSQL_ACCOUNT + "&password=" + SQLConfig.MYSQL_PASSWORD);
+		return DriverManager.getConnection(MYSQL_URI + "?useUnicode=true&characterEncoding=UTF-8&user="
+				+ MYSQL_ACCOUNT + "&password=" + MYSQL_PASSWORD);
 	}
 
 	/**保存缓存