更新资源部署

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -216,7 +216,7 @@ public class DeviceApiController {
             URI uri = new URI(platformEntity.getSendUrl());
             int port = uri.getPort();
             if (port != -1 && !ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
-                String serverUrl = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
+                String serverUrl = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(port > 0 ? port : 11078).build();
                 //String serverUrl = UrlBuilder.ofHttp(serverName).setPort(port).build();
                 serverInfo.setServerUrl(serverUrl);
             } else {
@@ -466,7 +466,18 @@ public class DeviceApiController {
             serverInfo.setScheme(scheme);
             // buildHomeUrl(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
+
+            URI uri = new URI(platformEntity.getSendUrl());
+            int port = uri.getPort();
+            if (port != -1 && !ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
+                String serverUrl = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(port > 0 ? port : 11078).build();
+                //String serverUrl = UrlBuilder.ofHttp(serverName).setPort(port).build();
+                serverInfo.setServerUrl(serverUrl);
+            } else {
                 serverInfo.setServerUrl(platformEntity.getSendUrl());
+            }
+
+            //serverInfo.setServerUrl(platformEntity.getSendUrl());
             //String phpUrl=GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://10.12.185.213:8090");
             //serverInfo.setServerUrl(phpUrl);
             registerResp.setServiceInfo(serverInfo);

device-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -17,6 +17,11 @@
     "baseLogin": "https://192.168.0.98:31078/base"
   },
 
+  "test-https-1": {
+    "baseUrl": "https://192.168.0.98:31091/m",
+    "baseLogin": "https://192.168.0.98:31078/base"
+  },
+
   "test1": {
     "baseUrl": "http://8.136.255.30:11078/m",
     "baseLogin": "http://192.168.0.98:11078/base"