ahdoawhfo/netdisk-fast-download
1
0
Fork 0
mirror of https://github.com/qaiu/netdisk-fast-download.git synced 2025-12-16 12:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	lz-cow-api-web/src/main/java/cn/qaiu/lz/common/util/LzTool.java
#	lz-cow-api-web/src/main/resources/logback.xml
This commit is contained in:
qaiu
2023-05-07 17:19:35 +08:00
parent a558e38368 905004b0ac
commit 94f2b104f6
20 changed files with 574 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/cn/qaiu/vx/core/Deploy.java
View File

@@ -3,12 +3,11 @@ package cn.qaiu.vx.core;
import cn.qaiu.vx.core.util.ConfigUtil;
import cn.qaiu.vx.core.util.VertxHolder;
import cn.qaiu.vx.core.verticle.ReverseProxyVerticle;
import cn.qaiu.vx.core.verticle.ServiceVerticle;
import cn.qaiu.vx.core.verticle.RouterVerticle;
import cn.qaiu.vx.core.verticle.ServiceVerticle;
import io.vertx.core.*;
import io.vertx.core.json.JsonObject;
import io.vertx.core.shareddata.LocalMap;
import io.vertx.core.shareddata.SharedData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +52,7 @@ public final class Deploy {
private void readConf(JsonObject conf) {
outLogo(conf);
String activeMode = conf.getString("active");
var activeMode = conf.getString("active");
if ("dev".equals(activeMode)) {
LOGGER.info("---------------> development environment <--------------\n");
System.setProperty("vertxweb.environment","dev");
@@ -67,7 +66,7 @@ public final class Deploy {
* 打印logo
*/
private void outLogo(JsonObject conf) {
Calendar calendar = Calendar.getInstance();
var calendar = Calendar.getInstance();
calendar.setTime(new Date());
var year = calendar.get(Calendar.YEAR);
var logoTemplete = """
@@ -101,20 +100,20 @@ public final class Deploy {
LOGGER.info("配置读取成功");
customConfig = globalConfig.getJsonObject("custom");
VertxOptions vertxOptions = new VertxOptions(globalConfig.getJsonObject("vertx"));
Vertx vertx = Vertx.vertx(vertxOptions);
var vertxOptions = new VertxOptions(globalConfig.getJsonObject("vertx"));
var vertx = Vertx.vertx(vertxOptions);
VertxHolder.init(vertx);
//配置保存在共享数据中
SharedData sharedData = vertx.sharedData();
var sharedData = vertx.sharedData();
LocalMap<String, Object> localMap = sharedData.getLocalMap("local");
localMap.put("globalConfig", globalConfig);
localMap.put("customConfig", customConfig);
localMap.put("server", globalConfig.getJsonObject("server"));
handle.handle(globalConfig);
Future<String> future1 = vertx.deployVerticle(RouterVerticle.class, getWorkDeploymentOptions("Router"));
Future<String> future2 = vertx.deployVerticle(ServiceVerticle.class, getWorkDeploymentOptions("Service"));
Future<String> future3 = vertx.deployVerticle(ReverseProxyVerticle.class, getWorkDeploymentOptions("proxy"));
var future1 = vertx.deployVerticle(RouterVerticle.class, getWorkDeploymentOptions("Router"));
var future2 = vertx.deployVerticle(ServiceVerticle.class, getWorkDeploymentOptions("Service"));
var future3 = vertx.deployVerticle(ReverseProxyVerticle.class, getWorkDeploymentOptions("proxy"));
CompositeFuture.all(future1, future2, future3)
.onSuccess(this::deployWorkVerticalSuccess)
@@ -137,8 +136,8 @@ public final class Deploy {
* @param compositeFuture future wraps a list
*/
private void deployWorkVerticalSuccess(CompositeFuture compositeFuture) {
double t1 = ((double) (System.currentTimeMillis() - startTime)) / 1000;
double t2 = ((double) System.currentTimeMillis() - ManagementFactory.getRuntimeMXBean().getStartTime()) / 1000;
var t1 = ((double) (System.currentTimeMillis() - startTime)) / 1000;
var t2 = ((double) System.currentTimeMillis() - ManagementFactory.getRuntimeMXBean().getStartTime()) / 1000;
LOGGER.info("web服务启动成功 -> 用时: {}s, jvm启动用时: {}s", t1, t2);
}