diff --git a/README.md b/README.md index 1ed6c0e2..952bf2cc 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ magic-api 是一个基于Java的接口快速开发框架,编写接口将通过 org.ssssssss magic-api-spring-boot-starter - 1.4.1 + 1.4.2 ``` ## 修改application.properties diff --git a/magic-api-spring-boot-starter/pom.xml b/magic-api-spring-boot-starter/pom.xml index bf2337d5..8ba610b9 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.1 + 1.4.2 magic-api-spring-boot-starter jar diff --git a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java index 4b53162a..e0be609c 100644 --- a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java +++ b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ApplicationUriPrinter.java @@ -28,9 +28,11 @@ import java.util.Objects; public class ApplicationUriPrinter implements CommandLineRunner { @Resource private ConfigurableEnvironment springEnv; + @Autowired private MagicAPIProperties properties; - @Autowired + + @Autowired(required = false) private WebServerApplicationContext serverApplicationContext; @Override @@ -42,20 +44,20 @@ public class ApplicationUriPrinter implements CommandLineRunner { } catch (UnknownHostException e) { System.out.println("当前服务地址获取失败"); } - int port = serverApplicationContext.getWebServer().getPort(); + int port = serverApplicationContext != null ? serverApplicationContext.getWebServer().getPort() : Integer.parseInt(springEnv.getProperty("server.port", "9999")); String path = springEnv.getProperty("server.servlet.context-path", ""); String magicWebPath = properties.getWeb(); String schema = "http://"; - String localUrl = schema + PathUtils.replaceSlash(String.format("localhost:%s/%s/%s/",port,path, Objects.toString(properties.getPrefix(),""))); - String externUrl = schema + PathUtils.replaceSlash(String.format("%s:%s/%s/%s/",ip,port,path, Objects.toString(properties.getPrefix(),""))); + String localUrl = schema + PathUtils.replaceSlash(String.format("localhost:%s/%s/%s/", port, path, Objects.toString(properties.getPrefix(), ""))); + String externUrl = schema + PathUtils.replaceSlash(String.format("%s:%s/%s/%s/", ip, port, path, Objects.toString(properties.getPrefix(), ""))); System.out.println( "服务启动成功,magic-api已内置启动! Access URLs:\n\t" + - "接口本地地址: \t\t"+localUrl+"\n\t" + + "接口本地地址: \t\t" + localUrl + "\n\t" + "接口外部访问地址: \t" + externUrl ); if (!StringUtils.isEmpty(magicWebPath)) { - String webPath = schema + PathUtils.replaceSlash(String.format("%s:%s/%s/%s/index.html", ip, port, path, magicWebPath)); - System.out.println("\t接口配置平台: \t\t" + webPath); + String webPath = schema + PathUtils.replaceSlash(String.format("%s:%s/%s/%s/index.html", ip, port, path, magicWebPath)); + System.out.println("\t接口配置平台: \t\t" + webPath); } System.out.println("\t可通过配置关闭输出: \tmagic-api.show-url=false"); System.out.println("********************************************当前服务相关地址********************************************"); diff --git a/magic-api/pom.xml b/magic-api/pom.xml index 9940cbfa..89de7fda 100644 --- a/magic-api/pom.xml +++ b/magic-api/pom.xml @@ -6,7 +6,7 @@ org.ssssssss magic-api-parent - 1.4.1 + 1.4.2 magic-api jar diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/logging/MagicLoggerContext.java b/magic-api/src/main/java/org/ssssssss/magicapi/logging/MagicLoggerContext.java index 96b6c0f7..13a75239 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/logging/MagicLoggerContext.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/logging/MagicLoggerContext.java @@ -19,8 +19,6 @@ public interface MagicLoggerContext { String sessionId = SESSION.get(); if (sessionId != null) { WebSocketSessionManager.sendBySessionId(sessionId, MessageType.LOG, logInfo); - }else{ - WebSocketSessionManager.sendToAll(MessageType.LOG, logInfo); } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java index 46d39d1c..81469f31 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java @@ -374,7 +374,7 @@ public class NamedTable { @Comment("执行update语句") public int update(@Comment("各项列和值") Map data) { - return update(data, false); + return update(data, this.withBlank); } @Comment("查询条数") diff --git a/magic-editor/pom.xml b/magic-editor/pom.xml index 538dd142..ed904a66 100644 --- a/magic-editor/pom.xml +++ b/magic-editor/pom.xml @@ -6,7 +6,7 @@ org.ssssssss magic-api-parent - 1.4.1 + 1.4.2 magic-editor jar diff --git a/magic-editor/src/console/package.json b/magic-editor/src/console/package.json index cdfae08c..a50845e7 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.1", + "version": "1.4.2", "private": false, "description": "magic-editor for magic-api", "main": "dist/magic-editor.umd.min.js", diff --git a/magic-editor/src/console/src/scripts/beautifier/javascript/tokenizer.js b/magic-editor/src/console/src/scripts/beautifier/javascript/tokenizer.js index c0b64b33..00396c58 100644 --- a/magic-editor/src/console/src/scripts/beautifier/javascript/tokenizer.js +++ b/magic-editor/src/console/src/scripts/beautifier/javascript/tokenizer.js @@ -326,7 +326,7 @@ Tokenizer.prototype._read_comment = function(c) { return token; }; Tokenizer.prototype._read_multi_string = function() { - if(this._input.match(/"""/)){ + if(this._input.match(/"""/g)){ let result = this._input.readUntilAfter(/"""/g) return this._create_token(TOKEN.STRING, '"""' + result); } diff --git a/pom.xml b/pom.xml index 29197279..b4e1ef61 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.ssssssss magic-api-parent - 1.4.1 + 1.4.2 pom magic-api-parent auto generate http api @@ -30,7 +30,7 @@ 2.4.5 - 1.5.1 + 1.5.2 1.21 2.7 1.6