|
@@ -4,6 +4,7 @@ import lombok.SneakyThrows;
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
import org.hswebframework.expands.script.engine.DynamicScriptEngine;
|
|
import org.hswebframework.expands.script.engine.DynamicScriptEngine;
|
|
import org.hswebframework.expands.script.engine.DynamicScriptEngineFactory;
|
|
import org.hswebframework.expands.script.engine.DynamicScriptEngineFactory;
|
|
|
|
+import org.jetlinks.community.ValueObject;
|
|
import org.jetlinks.core.Value;
|
|
import org.jetlinks.core.Value;
|
|
import org.jetlinks.core.Values;
|
|
import org.jetlinks.core.Values;
|
|
import org.jetlinks.community.network.tcp.parser.PayloadParser;
|
|
import org.jetlinks.community.network.tcp.parser.PayloadParser;
|
|
@@ -21,12 +22,10 @@ public class ScriptPayloadParserBuilder implements PayloadParserBuilderStrategy
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@SneakyThrows
|
|
@SneakyThrows
|
|
- public PayloadParser build(Values config) {
|
|
|
|
- String script = config.getValue("script")
|
|
|
|
- .map(Value::asString)
|
|
|
|
|
|
+ public PayloadParser build(ValueObject config) {
|
|
|
|
+ String script = config.getString("script")
|
|
.orElseThrow(() -> new IllegalArgumentException("script不能为空"));
|
|
.orElseThrow(() -> new IllegalArgumentException("script不能为空"));
|
|
- String lang = config.getValue("lang")
|
|
|
|
- .map(Value::asString)
|
|
|
|
|
|
+ String lang = config.getString("lang")
|
|
.orElseThrow(() -> new IllegalArgumentException("lang不能为空"));
|
|
.orElseThrow(() -> new IllegalArgumentException("lang不能为空"));
|
|
|
|
|
|
DynamicScriptEngine engine = DynamicScriptEngineFactory.getEngine(lang);
|
|
DynamicScriptEngine engine = DynamicScriptEngineFactory.getEngine(lang);
|