From e0e2f9bf6a4fb0d505001b3b569890154df677a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Thu, 2 Feb 2023 16:57:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E6=BF=80?=
=?UTF-8?q?=E6=B4=BB=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/busiz/web/DeviceApiController.java | 16 ++++++++++++++--
.../app/service/impl/AppPublishServiceImpl.java | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
index 6ccedf29..ef646abf 100644
--- a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+++ b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
@@ -1,5 +1,6 @@
package com.mortals.xhx.busiz.web;
+import cn.hutool.core.net.URLDecoder;
import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.URLUtil;
@@ -64,6 +65,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.net.URL;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -909,7 +911,9 @@ public class DeviceApiController {
String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.3.24:11078");
//domain+homeUrl;
- serverInfo.setHomeUrl(UrlBuilder.of(domain.trim()).addPath(homeUrl).toString());
+ String str = UrlBuilder.of(domain.trim()).addPath(homeUrl).build();
+ String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
+ serverInfo.setHomeUrl(decodeStr);
//serverInfo.setHomeUrl(domain + "/" + homeUrl);
log.info("homeurl:" + serverInfo.getHomeUrl());
serverInfo.setEventUrl(productEntity.getEventUrl());
@@ -935,7 +939,15 @@ public class DeviceApiController {
UrlBuilder urlBuilder = UrlBuilder.ofHttp(domain).addPath("test");
System.out.println(urlBuilder.build());
- //URL url = URLUtil.url(domain);
+
+ String str="http://10.12.185.213:11078/homeDeviceUrl%2Fdsj%2F1920x1080";
+
+ System.out.println(str);
+
+ String decode = URLDecoder.decode(str, Charset.defaultCharset());
+ System.out.println(decode);
+
+ //URL url = URLUtil.url(domain);
// System.out.println(StrUtil.removeAllLineBreaks(domain));
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppPublishServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppPublishServiceImpl.java
index ba1a8ffe..d545c65d 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppPublishServiceImpl.java
+++ b/device-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppPublishServiceImpl.java
@@ -97,7 +97,7 @@ public class AppPublishServiceImpl extends AbstractCRUDServiceImpl<AppPublishDao
@Override
public void active(AppPublishEntity appPublishEntity, Context context) {
if (AppTypeEnum.鍓嶇.getValue() == appPublishEntity.getAppType()) {
- String targetFilePath = uploadService.getFilePath(appPublishEntity.getFilePath());
+ String targetFilePath = appPublishEntity.getFilePath();
String disPath = "/home/publish/" + appPublishEntity.getAppCode();
boolean directory = FileUtil.isDirectory(new File(disPath));
if (directory) {
--
2.24.3