Merge branch 'dev'

ssssssss-team · Sep 21, 2021 · 2b07171 · 2b07171
2 parents a02d7f7 + c10d6ac
commit 2b07171
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ magic-api 是一个基于Java的接口快速开发框架，编写接口将通过
 <dependency>
 	<groupId>org.ssssssss</groupId>
     <artifactId>magic-api-spring-boot-starter</artifactId>
-    <version>1.4.4</version>
+    <version>1.4.5</version>
 </dependency>
 ```
 ## 修改application.properties

diff --git a/magic-api-spring-boot-starter/pom.xml b/magic-api-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>magic-api-spring-boot-starter</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api/pom.xml b/magic-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>magic-api</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-editor/pom.xml b/magic-editor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>magic-editor</artifactId>
     <packaging>jar</packaging>

diff --git 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
@@ -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
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.ssssssss</groupId>
     <artifactId>magic-api-parent</artifactId>
-    <version>1.4.4</version>
+    <version>1.4.5</version>
     <packaging>pom</packaging>
     <name>magic-api-parent</name>
     <description>auto generate http api</description>
@@ -30,7 +30,7 @@
     </scm>
     <properties>
         <spring-boot.version>2.4.5</spring-boot.version>
-        <magic-script.version>1.5.4</magic-script.version>
+        <magic-script.version>1.5.5</magic-script.version>
         <commons-compress.version>1.21</commons-compress.version>
         <commons-io.version>2.7</commons-io.version>
         <commons-text.version>1.6</commons-text.version>