Skip to content

Commit e72995c

Browse files
committed
优化代码;升级版本至 6.0.0
1 parent 8def022 commit e72995c

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.framework</groupId>
77
<artifactId>apijson-framework</artifactId>
8-
<version>5.5.0</version>
8+
<version>6.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONFramework</name>
@@ -34,8 +34,7 @@
3434
<dependency>
3535
<groupId>com.github.Tencent</groupId>
3636
<artifactId>APIJSON</artifactId>
37-
<version>5.5.0</version>
38-
<type>jar</type>
37+
<version>6.0.0</version>
3938
</dependency>
4039

4140
<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->

src/main/java/apijson/framework/APIJSONFunctionParser.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public static <T extends Object> JSONObject init(boolean shutdownWhenServerError
211211
}
212212

213213
//初始化默认脚本引擎,避免增量
214-
if(SCRIPT_EXECUTOR_MAP.get("js") == null || isAll) {
214+
if (isAll || SCRIPT_EXECUTOR_MAP.get("js") == null) {
215215
ScriptExecutor javaScriptExecutor = new JavaScriptExecutor();
216216
javaScriptExecutor.init();
217217
SCRIPT_EXECUTOR_MAP.put("js", javaScriptExecutor);
@@ -234,12 +234,12 @@ public static <T extends Object> JSONObject init(boolean shutdownWhenServerError
234234
continue;
235235
}
236236

237-
String n = item == null ? null : item.getString("name");
237+
String n = item.getString("name");
238238
if (StringUtil.isName(n) == false) {
239239
onServerError("Script 表字段 name 的值 " + n + " 不合法!必须为合法的方法名字符串!", shutdownWhenServerError);
240240
}
241241

242-
String s = item == null ? null : item.getString("script");
242+
String s = item.getString("script");
243243
if (StringUtil.isEmpty(s, true)) {
244244
onServerError("Script 表字段 script 的值 " + s + " 不合法!不能为空!", shutdownWhenServerError);
245245
}
@@ -282,7 +282,7 @@ public static <T extends Object> JSONObject init(boolean shutdownWhenServerError
282282
//加载脚本
283283
if (item.get("language") != null) {
284284
String language = item.getString("language");
285-
if(SCRIPT_EXECUTOR_MAP.get(language) == null) {
285+
if (SCRIPT_EXECUTOR_MAP.get(language) == null) {
286286
onServerError("找不到脚本语言 " + language + " 对应的执行引擎!请先依赖相关库并在后端 APIJSONFunctionParser 中注册!", shutdownWhenServerError);
287287
}
288288
ScriptExecutor scriptExecutor = SCRIPT_EXECUTOR_MAP.get(language);
@@ -554,7 +554,6 @@ public Object getFromObject(@NotNull JSONObject curObj, String object, String ke
554554
//根据键移除值 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
555555
/**移除
556556
** @param curObj
557-
* @param array
558557
* @param position 支持直接传数字,例如 getFromArray(array,0) ;或者引用当前对象的值,例如 "@position": 0, "result()": "getFromArray(array,@position)"
559558
* @return
560559
*/
@@ -570,7 +569,6 @@ public Object removeIndex(@NotNull JSONObject curObj, String position) {
570569
}
571570
/**移除
572571
* @param curObj
573-
* @param object
574572
* @param key
575573
* @return
576574
*/
@@ -650,8 +648,7 @@ public String getMethodArguments(@NotNull JSONObject curObj) throws IllegalArgum
650648
}
651649
/**获取方法参数的定义
652650
* @param curObj
653-
* @param requestKey
654-
* @param methodArgs
651+
* @param methodArgsKey
655652
* @return
656653
* @throws IllegalArgumentException
657654
* @throws ClassNotFoundException

0 commit comments

Comments
 (0)