diff --git a/README.md b/README.md
index 7b486055..9495d996 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ magic-api 是一个基于Java的接口快速开发框架,编写接口将通过
org.ssssssss
magic-api-spring-boot-starter
- 1.4.4
+ 1.4.5
```
## 修改application.properties
diff --git a/magic-api-spring-boot-starter/pom.xml b/magic-api-spring-boot-starter/pom.xml
index d1dbf81c..15cf4988 100644
--- a/magic-api-spring-boot-starter/pom.xml
+++ b/magic-api-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
org.ssssssss
magic-api-parent
- 1.4.4
+ 1.4.5
magic-api-spring-boot-starter
jar
diff --git a/magic-api/pom.xml b/magic-api/pom.xml
index 54ca1883..99d20be4 100644
--- a/magic-api/pom.xml
+++ b/magic-api/pom.xml
@@ -6,7 +6,7 @@
org.ssssssss
magic-api-parent
- 1.4.4
+ 1.4.5
magic-api
jar
diff --git a/magic-editor/pom.xml b/magic-editor/pom.xml
index 5d7a8fd1..02dc6e20 100644
--- a/magic-editor/pom.xml
+++ b/magic-editor/pom.xml
@@ -6,7 +6,7 @@
org.ssssssss
magic-api-parent
- 1.4.4
+ 1.4.5
magic-editor
jar
diff --git a/magic-editor/src/console/package.json b/magic-editor/src/console/package.json
index 93815cfe..5954154b 100644
--- a/magic-editor/src/console/package.json
+++ b/magic-editor/src/console/package.json
@@ -1,6 +1,6 @@
{
"name": "magic-editor",
- "version": "1.4.4",
+ "version": "1.4.5",
"private": false,
"description": "magic-editor for magic-api",
"main": "dist/magic-editor.umd.min.js",
diff --git a/magic-editor/src/console/src/scripts/parsing/parser.js b/magic-editor/src/console/src/scripts/parsing/parser.js
index 0dbfd43c..42361a0e 100644
--- a/magic-editor/src/console/src/scripts/parsing/parser.js
+++ b/magic-editor/src/console/src/scripts/parsing/parser.js
@@ -792,7 +792,7 @@ export class Parser {
} else if (token.getTokenType() === TokenType.Identifier) {
let defineName = token.getText()
let define = ['var','let','const'].indexOf(token.getText()) > -1;
- if (define || (this.stream.hasMore() && this.stream.getToken().type === TokenType.Identifier)) {
+ if (define || (this.stream.hasMore() && this.stream.getToken().type === TokenType.Identifier && keywords.indexOf(defineName) === -1)) {
let varName = this.stream.consume().getText();
if (this.stream.match(TokenType.Assignment, true)) {
let isAsync = this.stream.match("async", true);
@@ -818,9 +818,6 @@ export class Parser {
}
if (returnJavaType) {
- if(expression instanceof VariableAccess){
- return env[expression.getVariable()];
- }
return expression && await expression.getJavaType(env);
}
return env;
diff --git a/pom.xml b/pom.xml
index b7b25980..fee55347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.ssssssss
magic-api-parent
- 1.4.4
+ 1.4.5
pom
magic-api-parent
auto generate http api
@@ -30,7 +30,7 @@
2.4.5
- 1.5.4
+ 1.5.5
1.21
2.7
1.6