解决操作符 UNIQUE 校验不允许重复失效

TommyLemon · TommyLemon · commit 646bed418655 · 2021-08-01T01:19:29.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -447,14 +447,14 @@ public void verifyRepeat(String table, String key, Object value, long exceptId)
 		if (exceptId > 0) {//允许修改自己的属性为该属性原来的值
 			request.put(JSONRequest.KEY_ID + "!", exceptId);  // FIXME 这里 id 写死了，不支持自定义
 		}
-		JSONObject repeat = createParser().setMethod(GET).setNeedVerify(true).parseResponse(
+		JSONObject repeat = createParser().setMethod(HEAD).setNeedVerify(true).parseResponse(
 				new JSONRequest(table, request)
 				);
 		repeat = repeat == null ? null : repeat.getJSONObject(table);
 		if (repeat == null) {
 			throw new Exception("服务器内部错误  verifyRepeat  repeat == null");
 		}
-		if (repeat.getIntValue(JSONResponse.KEY_CODE) > 0) {
+		if (repeat.getIntValue(JSONResponse.KEY_COUNT) > 0) {
 			throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");
 		}
 	}
@@ -1424,7 +1424,7 @@ public static void verifyRepeat(String table, String key, Object value, long exc
 
 		String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
 
-		SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.GET).setCount(1).setPage(0);
+		SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);
 		config.setTable(table);
 		if (exceptId > 0) { //允许修改自己的属性为该属性原来的值
 			config.putWhere(finalIdKey + "!", exceptId, false);
@@ -1437,7 +1437,7 @@ public static void verifyRepeat(String table, String key, Object value, long exc
 			if (result == null) {
 				throw new Exception("服务器内部错误  verifyRepeat  result == null");
 			}
-			if (result.getIntValue(JSONResponse.KEY_CODE) > 0) {
+			if (result.getIntValue(JSONResponse.KEY_COUNT) > 0) {
 				throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");
 			}
 		} finally {

Original file line number	Diff line number	Diff line change
`@@ -447,14 +447,14 @@ public void verifyRepeat(String table, String key, Object value, long exceptId)`
`447`	`447`	`if (exceptId > 0) {//允许修改自己的属性为该属性原来的值`
`448`	`448`	`request.put(JSONRequest.KEY_ID + "!", exceptId); // FIXME 这里 id 写死了，不支持自定义`
`449`	`449`	`}`
`450`		`- JSONObject repeat = createParser().setMethod(GET).setNeedVerify(true).parseResponse(`
	`450`	`+ JSONObject repeat = createParser().setMethod(HEAD).setNeedVerify(true).parseResponse(`
`451`	`451`	`new JSONRequest(table, request)`
`452`	`452`	`);`
`453`	`453`	`repeat = repeat == null ? null : repeat.getJSONObject(table);`
`454`	`454`	`if (repeat == null) {`
`455`	`455`	`throw new Exception("服务器内部错误 verifyRepeat repeat == null");`
`456`	`456`	`}`
`457`		`- if (repeat.getIntValue(JSONResponse.KEY_CODE) > 0) {`
	`457`	`+ if (repeat.getIntValue(JSONResponse.KEY_COUNT) > 0) {`
`458`	`458`	`throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");`
`459`	`459`	`}`
`460`	`460`	`}`
`@@ -1424,7 +1424,7 @@ public static void verifyRepeat(String table, String key, Object value, long exc`
`1424`	`1424`
`1425`	`1425`	`String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;`
`1426`	`1426`
`1427`		`- SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.GET).setCount(1).setPage(0);`
	`1427`	`+ SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);`
`1428`	`1428`	`config.setTable(table);`
`1429`	`1429`	`if (exceptId > 0) { //允许修改自己的属性为该属性原来的值`
`1430`	`1430`	`config.putWhere(finalIdKey + "!", exceptId, false);`
`@@ -1437,7 +1437,7 @@ public static void verifyRepeat(String table, String key, Object value, long exc`
`1437`	`1437`	`if (result == null) {`
`1438`	`1438`	`throw new Exception("服务器内部错误 verifyRepeat result == null");`
`1439`	`1439`	`}`
`1440`		`- if (result.getIntValue(JSONResponse.KEY_CODE) > 0) {`
	`1440`	`+ if (result.getIntValue(JSONResponse.KEY_COUNT) > 0) {`
`1441`	`1441`	`throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");`
`1442`	`1442`	`}`
`1443`	`1443`	`} finally {`