Skip to content

Commit fb9d982

Browse files
TommyLemonTommyLemon
committed
Server:优化日志；优化RequestPaser#putValueByPath
1 parent 4960808 commit fb9d982

12 files changed

Lines changed: 118 additions & 108 deletions

File tree

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/JSON.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import com.alibaba.fastjson.parser.Feature;
2222
import com.alibaba.fastjson.serializer.SerializerFeature;
2323

24-
import zuo.biao.apijson.server.Log;
25-
2624
/**阿里FastJSON封装类 防止解析时异常
2725
* @author Lemon
2826
*/

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/JSONResponse.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import com.alibaba.fastjson.JSONArray;
2323
import com.alibaba.fastjson.JSONObject;
2424

25-
import zuo.biao.apijson.server.Log;
26-
2725
/**parser for response JSON String
2826
* @author Lemon
2927
* @see #getList

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Log.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/Log.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.server;
15+
package zuo.biao.apijson;
1616

1717
/**测试用Log
1818
* @modifier Lemon
@@ -27,7 +27,7 @@ public class Log {
2727
*/
2828
public static void d(String TAG, String msg) {
2929
if (DEBUG) {
30-
System.out.println(TAG + ".DEBUG: " + msg);
30+
System.err.println(TAG + ".DEBUG: " + msg);
3131
}
3232
}
3333

@@ -57,7 +57,7 @@ public static void i(String TAG, String msg) {
5757
*/
5858
public static void e(String TAG, String msg) {
5959
if (DEBUG) {
60-
System.out.println(TAG + ".ERROR: " + msg);
60+
System.err.println(TAG + ".ERROR: " + msg);
6161
}
6262
}
6363

@@ -67,7 +67,7 @@ public static void e(String TAG, String msg) {
6767
*/
6868
public static void w(String TAG, String msg) {
6969
if (DEBUG) {
70-
System.out.println(TAG + ".WARN: " + msg);
70+
System.err.println(TAG + ".WARN: " + msg);
7171
}
7272
}
7373

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/Pair.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.HashMap;
1919
import java.util.Map;
2020

21-
/**type:value
21+
/**key:value
2222
* @author Lemon
2323
*/
2424
public class Pair extends Entry<String, String> {

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/StringUtil.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
* @use StringUtil.
2626
*/
2727
public class StringUtil {
28-
28+
private static final String TAG = "StringUtil";
29+
2930
public StringUtil() {
3031
}
3132

@@ -315,7 +316,7 @@ public static boolean isNumer(String s) {
315316
*/
316317
public static boolean isAlpha(String s) {
317318
if (s == null) {
318-
System.out.println("isNumberOrAlpha inputed == null >> return false;");
319+
Log.i(TAG, "isNumberOrAlpha inputed == null >> return false;");
319320
return false;
320321
}
321322
Pattern pAlpha = Pattern.compile("[a-zA-Z]");
@@ -348,7 +349,7 @@ public static boolean isIDCard(String idCard) {
348349
}
349350
idCard = getString(idCard);
350351
if (idCard.length() == 15) {
351-
System.out.println("isIDCard idCard.length() == 15 old IDCard");
352+
Log.i(TAG, "isIDCard idCard.length() == 15 old IDCard");
352353
currentString = idCard;
353354
return true;
354355
}
@@ -518,7 +519,7 @@ public static String getNumber(String s, boolean onlyStart) {
518519
* @return
519520
*/
520521
public static String getCorrectUrl(String url) {
521-
System.out.println("getCorrectUrl : \n" + url);
522+
Log.i(TAG, "getCorrectUrl : \n" + url);
522523
if (isNotEmpty(url, true) == false) {
523524
return "";
524525
}
@@ -606,7 +607,7 @@ public static String getPrice(String price, int formatType) {
606607
}
607608
//单独写到getCorrectPrice? >>>>>>>>>>>>>>>>>>>>>>
608609

609-
System.out.println("getPrice <<<<<<<<<<<<<<<<<< correctPrice = " + correctPrice);
610+
Log.i(TAG, "getPrice <<<<<<<<<<<<<<<<<< correctPrice = " + correctPrice);
610611
if (correctPrice.contains(".")) {
611612
// if (correctPrice.startsWith(".")) {
612613
// correctPrice = 0 + correctPrice;
@@ -616,7 +617,7 @@ public static String getPrice(String price, int formatType) {
616617
}
617618
}
618619

619-
System.out.println("getPrice correctPrice = " + correctPrice + " >>>>>>>>>>>>>>>>");
620+
Log.i(TAG, "getPrice correctPrice = " + correctPrice + " >>>>>>>>>>>>>>>>");
620621
return isNotEmpty(correctPrice, true) ? getPrice(new BigDecimal(0 + correctPrice), formatType) : getPrice(0, formatType);
621622
}
622623
/**获取价格，保留两位小数

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Function.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import zuo.biao.apijson.Entry;
1111
import zuo.biao.apijson.FunctionList;
12+
import zuo.biao.apijson.Log;
1213
import zuo.biao.apijson.StringUtil;
1314
import zuo.biao.apijson.Pair;
1415
import zuo.biao.apijson.server.model.BaseModel;
@@ -52,18 +53,18 @@ public static void test() throws Exception {
5253

5354
} else if (key.endsWith("@function")) {//引用服务器方法
5455
long time0 = System.currentTimeMillis();
55-
System.out.println("" + time0);
56+
Log.i(TAG, "" + time0);
5657
Object result = invoke(jsonMap, function);
57-
System.out.println("" + result);
58-
System.out.println("duration=" + (System.currentTimeMillis()-time0));
58+
Log.i(TAG, "" + result);
59+
Log.i(TAG, "duration=" + (System.currentTimeMillis()-time0));
5960
}
6061

61-
System.out.println("plus = " + invoke(jsonMap, "plus(long:i0,long:i1)"));
62-
System.out.println("count = " + invoke(jsonMap, "count(Collection:collection)"));
63-
System.out.println("isContain = " + invoke(jsonMap, "isContain(Collection:collection,Object:id)"));
64-
System.out.println("get(Map:map,key) = " + invoke(jsonMap, "get(Map:map,key)"));
65-
System.out.println("get(Collection:collection,int:@position) = " + invoke(jsonMap, "get(Collection:collection,int:@position)"));
66-
System.out.println("Integer:get(Map:map,key) = " + invoke(jsonMap, "Integer:get(Map:map,key)"));
62+
Log.i(TAG, "plus = " + invoke(jsonMap, "plus(long:i0,long:i1)"));
63+
Log.i(TAG, "count = " + invoke(jsonMap, "count(Collection:collection)"));
64+
Log.i(TAG, "isContain = " + invoke(jsonMap, "isContain(Collection:collection,Object:id)"));
65+
Log.i(TAG, "get(Map:map,key) = " + invoke(jsonMap, "get(Map:map,key)"));
66+
Log.i(TAG, "get(Collection:collection,int:@position) = " + invoke(jsonMap, "get(Collection:collection,int:@position)"));
67+
Log.i(TAG, "Integer:get(Map:map,key) = " + invoke(jsonMap, "Integer:get(Map:map,key)"));
6768
}
6869

6970
/**反射调用
@@ -77,7 +78,7 @@ public static Object invoke(Map<String, Object> jsonMap, String function) throws
7778
int end = function.lastIndexOf(")");
7879
Entry<String, String> method = Pair.parseVariableEntry(function.substring(0, start));
7980
if (method == null || StringUtil.isNotEmpty(method.getValue(), true) == false) {
80-
System.out.println(TAG + "invoke method == null || StringUtil.isNotEmpty(method.getValue(), true) == false"
81+
Log.i(TAG, "invoke method == null || StringUtil.isNotEmpty(method.getValue(), true) == false"
8182
+ " >> return null;");
8283
return null;
8384
}

‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/QueryConfig.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.alibaba.fastjson.JSONObject;
3030

3131
import zuo.biao.apijson.JSONRequest;
32+
import zuo.biao.apijson.Log;
3233
import zuo.biao.apijson.RequestMethod;
3334
import zuo.biao.apijson.StringUtil;
3435
import zuo.biao.apijson.Table;
@@ -571,7 +572,7 @@ public String getSQL() throws Exception {
571572
*/
572573
public static String getSQL(QueryConfig config) throws Exception {
573574
if (config == null) {
574-
System.out.println("QueryConfig: getSQL config == null >> return null;");
575+
Log.i(TAG, "QueryConfig: getSQL config == null >> return null;");
575576
return null;
576577
}
577578
RequestMethod method = config.getMethod();

0 commit comments

Comments
 (0)