Browse Source

update: 针对pr进行修改。

master
zjz1993 5 years ago
parent
commit
751d82b980
  1. 3
      src/main/java/com/fanruan/api/cal/ParameterKit.java
  2. 4
      src/main/java/com/fanruan/api/data/connection/NameReference.java
  3. 7
      src/main/java/com/fanruan/api/err/JSONException.java
  4. 26
      src/main/java/com/fanruan/api/json/JSONArray.java
  5. 11
      src/main/java/com/fanruan/api/json/JSONKit.java
  6. 16
      src/main/java/com/fanruan/api/json/JSONObject.java
  7. 10
      src/main/java/com/fanruan/api/security/SecurityKit.java

3
src/main/java/com/fanruan/api/cal/ParameterKit.java

@ -96,8 +96,7 @@ public class ParameterKit {
* @param ps 旧的参数集合 * @param ps 旧的参数集合
* @return 新参数集合 * @return 新参数集合
*/ */
public static Parameter[] analyzeAndUnionSameParameters(String[] paramTexts, public static ParameterProvider[] analyzeAndUnionSameParameters(String[] paramTexts, Parameter[] ps){
Parameter[] ps){
return ParameterHelper.analyzeAndUnionSameParameters(paramTexts, ps); return ParameterHelper.analyzeAndUnionSameParameters(paramTexts, ps);
} }
} }

4
src/main/java/com/fanruan/api/data/connection/NameReference.java

@ -1,4 +0,0 @@
package com.fanruan.api.data.connection;
public class NameReference extends com.fr.data.impl.NameDatabaseConnection{
}

7
src/main/java/com/fanruan/api/err/JSONException.java

@ -1,8 +1,11 @@
package com.fanruan.api.err; package com.fanruan.api.err;
/*
* 定义json的异常
* */
public class JSONException extends com.fr.json.JSONException{ public class JSONException extends com.fr.json.JSONException{
public JSONException(String var1) { public JSONException(String message) {
super(var1); super(message);
} }
public JSONException(Throwable var1) { public JSONException(Throwable var1) {

26
src/main/java/com/fanruan/api/json/JSONArray.java

@ -1,26 +0,0 @@
package com.fanruan.api.json;
import java.util.*;
import java.lang.*;
public class JSONArray extends com.fr.json.JSONArray{
public JSONArray(){
}
public JSONArray(Collection collection){
super(collection);
}
public JSONArray(List list) {
super(list);
}
public JSONArray(Object array) {
super(array);
}
public JSONArray(String json) {
super(json);
}
}

11
src/main/java/com/fanruan/api/json/JSONKit.java

@ -0,0 +1,11 @@
package com.fanruan.api.json;
import com.fr.json.JSONObject;
public class JSONKit {
public static JSONObject create() {
return new JSONObject();
}
public static JSONObject create(String text) {
return new JSONObject(text);
}
}

16
src/main/java/com/fanruan/api/json/JSONObject.java

@ -1,16 +0,0 @@
package com.fanruan.api.json;
import java.util.*;
public class JSONObject extends com.fr.json.JSONObject{
public JSONObject(){
}
public JSONObject(Map map){
super(map);
}
public JSONObject(String json){
super(json);
}
}

10
src/main/java/com/fanruan/api/security/SecurityKit.java

@ -1,6 +1,7 @@
package com.fanruan.api.security; package com.fanruan.api.security;
import com.fr.security.SecurityToolbox; import com.fr.security.SecurityToolbox;
import com.fr.stable.CodeUtils;
/** /**
* @author richie * @author richie
@ -25,4 +26,13 @@ public class SecurityKit {
public static String decrypt(String cipherText) { public static String decrypt(String cipherText) {
return SecurityToolbox.decrypt(cipherText); return SecurityToolbox.decrypt(cipherText);
} }
/**
* 给字符串解密
* @param passwordText 待解密的字符串
* @return 解密后的字符串
*/
@Deprecated
public static String passwordDecode(String passwordText) {
return CodeUtils.passwordDecode(passwordText);
}
} }

Loading…
Cancel
Save