[+] 判断是否安全模式

hykilpikonna · hykilpikonna · commit 2d2e3e146337 · 2018-09-07T17:21:13.000-04:00
diff --git a/src/main/java/cc/moecraft/utils/HyExpressionResolver.java b/src/main/java/cc/moecraft/utils/HyExpressionResolver.java
@@ -147,7 +147,7 @@ public static String resolve(String raw, boolean safeMode)
             raw = patterns.replace.rp.matcher(raw).replaceFirst(text);
         }
 
-        return resolveComplex(raw, new ScriptEngineManager().getEngineByName("js"));
+        return safeMode ? resolveComplexSafe(raw, new HashMap<>()) : resolveComplexJS(raw, new ScriptEngineManager().getEngineByName("js"));
     }
 
     private static String resolveComplexSafe(String raw, Map<String, Argument> variables)

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public static String resolve(String raw, boolean safeMode)`
`147`	`147`	`raw = patterns.replace.rp.matcher(raw).replaceFirst(text);`
`148`	`148`	`}`
`149`	`149`
`150`		`- return resolveComplex(raw, new ScriptEngineManager().getEngineByName("js"));`
	`150`	`+ return safeMode ? resolveComplexSafe(raw, new HashMap<>()) : resolveComplexJS(raw, new ScriptEngineManager().getEngineByName("js"));`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`private static String resolveComplexSafe(String raw, Map<String, Argument> variables)`