lilonglong/magic-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新版本号

Browse Source
This commit is contained in:
mxd 2020-11-13 22:55:46 +08:00
parent 2db34fe5f1
commit 1a7462753f
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -43,7 +43,7 @@
<dependency>
<groupId>org.ssssssss</groupId>
<artifactId>magic-api-spring-boot-starter</artifactId>
<version>0.4.5</version>
<version>0.4.6</version>
</dependency>
```
## 修改application.properties

4
pom.xml
View File

@ -11,7 +11,7 @@
</parent>
<groupId>org.ssssssss</groupId>
<artifactId>magic-api</artifactId>
<version>0.4.5</version>
<version>0.4.6</version>
<packaging>jar</packaging>
<name>magic-api</name>
<description>auto generate http api</description>
@ -38,7 +38,7 @@
<dependency>
<groupId>org.ssssssss</groupId>
<artifactId>magic-script</artifactId>
<version>1.2.9</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

12
src/main/java/org/ssssssss/magicapi/functions/BoundSql.java
View File

@ -4,9 +4,6 @@ import org.ssssssss.magicapi.cache.SqlCache;
import org.ssssssss.script.MagicScriptContext;
import org.ssssssss.script.functions.StreamExtension;
import org.ssssssss.script.parsing.GenericTokenParser;
import org.ssssssss.script.parsing.Parser;
import org.ssssssss.script.parsing.TokenStream;
import org.ssssssss.script.parsing.Tokenizer;
import org.ssssssss.script.parsing.ast.literal.BooleanLiteral;
import java.util.ArrayList;
@ -16,8 +13,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class BoundSql {
private static final Tokenizer tokenizer = new Tokenizer();
private static final GenericTokenParser concatTokenParser = new GenericTokenParser("${", "}", false);
private static final GenericTokenParser replaceTokenParser = new GenericTokenParser("#{", "}", true);
@ -39,7 +34,7 @@ public class BoundSql {
this.sql = ifTokenParser.parse(sql.trim(), text -> {
AtomicBoolean ifTrue = new AtomicBoolean(false);
String val = ifParamTokenParser.parse("?{" + text, param -> {
ifTrue.set(BooleanLiteral.isTrue(Parser.parseExpression(new TokenStream(tokenizer.tokenize(param))).evaluate(context)));
ifTrue.set(BooleanLiteral.isTrue(context.eval(param)));
return null;
});
if (ifTrue.get()) {
@ -48,10 +43,10 @@ public class BoundSql {
return "";
});
// 处理${}参数
this.sql = concatTokenParser.parse(this.sql, text -> String.valueOf(Parser.parseExpression(new TokenStream(tokenizer.tokenize(text))).evaluate(context)));
this.sql = concatTokenParser.parse(this.sql, text -> String.valueOf(context.eval(text)));
// 处理#{}参数
this.sql = replaceTokenParser.parse(this.sql, text -> {
Object value = Parser.parseExpression(new TokenStream(tokenizer.tokenize(text))).evaluate(context);
Object value = context.eval(text);
try {
//对集合自动展开
List<Object> objects = StreamExtension.arrayLikeToList(value);
@ -69,6 +64,7 @@ public class BoundSql {
return "?";
}
});
this.sql = this.sql == null ? null : this.sql.trim();
}
/**

6
src/main/resources/magicapi-support/index.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>MagicAPI v0.4.5 - Powered by ssssssss-team</title>
<title>MagicAPI v0.4.6 - Powered by ssssssss-team</title>
<link rel="icon" href="images/favicon.png" />
<style type="text/css">.loading-wrapper{position:fixed;top:0;bottom:0;left:0;right:0;z-index:2147483647;text-align:center;background:#fff}.loading{position:absolute;top:50%;left:50%;width:500px;height:100px;margin-left:-250px;margin-top:-50px;text-align:center}.loading .title{font-size:0;color:#0075ff;letter-spacing:0}.loading .title label{font-size:36px;display:inline-block;margin-top:5px;vertical-align:top}.loading .title span{font-size:72px;display:inline-block;padding:0 3px;animation:stretch 1s infinite}.loading .title span:nth-child(1){animation-delay:calc(1s / 8 * 0 / 2)}.loading .title span:nth-child(2){animation-delay:calc(1s / 8 * 1 / 2)}.loading .title span:nth-child(3){animation-delay:calc(1s / 8 * 2 / 2)}.loading .title span:nth-child(4){animation-delay:calc(1s / 8 * 3 / 2)}.loading .title span:nth-child(5){animation-delay:calc(1s / 8 * 4 / 2)}.loading .title span:nth-child(6){animation-delay:calc(1s / 8 * 5 / 2)}.loading .title span:nth-child(7){animation-delay:calc(1s / 8 * 6 / 2)}.loading .title span:nth-child(8){animation-delay:calc(1s / 8 * 7 / 2)}.loading .loading-text{text-align:center;font-weight:bolder;font-style:italic;color:#889aa4;font-size:32px;animation:blink-loading 2s ease-in infinite}@keyframes stretch{0%{transform:scale(1)}25%{transform:scale(1.2)}50%{transform:scale(1)}100%{transform:scale(1)}}@keyframes blink-loading{0%{opacity:100%}50%{opacity:50%}100%{opacity:100%}}</style>
<link rel="stylesheet" href="css/index.css" />
@ -26,7 +26,7 @@
<span>A</span>
<span>P</span>
<span>I</span>
<label>v0.4.5</label>
<label>v0.4.6</label>
</div>
<div class="loading-text">Loading...</div>
</div>
@ -35,7 +35,7 @@
<div class="header">
<img src="images/logo.png"/>
<label>magic-api</label>
<label class="version">v0.4.5</label>
<label class="version">v0.4.6</label>
</div>
<span class="button-run" title="运行（Ctrl+Q）"><i class="iconfont icon-run"></i></span>
<span class="button-save" title="保存（Ctrl+S）"><i class="iconfont icon-save"></i></span>

4
src/main/resources/magicapi-support/js/index.js
View File

@ -284,7 +284,7 @@ var MagicEditor = {
var _this = this;
element.onload = element.onreadystatechange = function(){
if(!this.readyState||this.readyState=='loaded'||this.readyState=='complete') {
_this.report('v0_4_5');
_this.report('v0_4_6');
}
}
@ -973,7 +973,7 @@ var MagicEditor = {
url : 'https://img.shields.io/maven-central/v/org.ssssssss/magic-api.json',
dataType : 'json',
success : function(data){
if(data.value != 'v0.4.5'){
if(data.value != 'v0.4.6'){
if(ignoreVersion != data.value){
_this.createDialog({
title : '更新提示',