更新资源部署

device-manager-ui/admin/src/views/device/module/distribute/dialogshow.vue

@@ -102,7 +102,6 @@
             /**获取数据后弹框 */
             afterRender(data) {
               this.form.siteId=session.getSession("siteid")
-              console.log(this.form)
                 this.open = true;
             },
 

device-manager/src/main/java/com/mortals/xhx/busiz/rsp/ServerInfo.java

@@ -12,6 +12,9 @@ public class ServerInfo implements Serializable {
 
     private Integer port;
 
+
+    private String scheme;
+
     /**
      * 设备注册API
      */

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

@@ -150,10 +150,12 @@ public class DeviceApiController {
         log.info("【设备注册】【请求体】-->  " + JSONObject.toJSONString(req));
         String serverName = request.getHeader("server-name");
         Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
-        //        String serverName = request.getServerName();
-//        Integer serverPort = request.getServerPort();
         String xforwardedfor = request.getHeader("x-forwarded-for");
-        log.info("request uri:{},request url:{},serverName:{},serverPort:{},xforwardedfor:{}", request.getRequestURI(), request.getRequestURL(), serverName, serverPort, xforwardedfor);
+        String scheme = request.getScheme();
+        if (ObjectUtils.isEmpty(scheme)) {
+            scheme = "http";
+        }
+        log.info("scheme:{},request uri:{},request url:{},serverName:{},serverPort:{},xforwardedfor:{}", scheme, request.getRequestURI(), request.getRequestURL(), serverName, serverPort, xforwardedfor);
         ApiResp<DeviceResp> rsp = new ApiResp<>();
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         DeviceResp deviceResp = new DeviceResp();
@@ -206,15 +208,16 @@ public class DeviceApiController {
             RegisterResp registerResp = new RegisterResp();
             registerResp.setRabbmitInfo(authInfo);
             ServerInfo serverInfo = new ServerInfo();
+            serverInfo.setScheme(request.getScheme());
             //判断设备是否设置了url 如果设置了，则用设备的 否则用产品的
-
-          //buildHomeUrl(deviceEntity, productEntity, serverInfo, serverName, serverPort);
+            //buildHomeUrl(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             //对外地址，访问ip+端口 端口号由platformEntity.getSendUrl()获取
             URI uri = new URI(platformEntity.getSendUrl());
             int port = uri.getPort();
             if (port != -1 && !ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
-                String serverUrl = UrlBuilder.ofHttp(serverName).setPort(port).build();
+                String serverUrl = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
+                //String serverUrl = UrlBuilder.ofHttp(serverName).setPort(port).build();
                 serverInfo.setServerUrl(serverUrl);
             } else {
                 serverInfo.setServerUrl(platformEntity.getSendUrl());
@@ -246,7 +249,6 @@ public class DeviceApiController {
             entity.setOnlineTime(new Date());
             entity.setDeviceStatus(DeviceStatusEnum.在线.getValue());
             Long lpush = cacheService.lpush(RedisKey.KEY_DEVICE_ONLINE_QUEUE, entity);
-            //log.info("lpush:{}",lpush);
 
             //deviceService.getDeviceDao().update(deviceEntity);
             rsp.setData(deviceResp);
@@ -389,6 +391,10 @@ public class DeviceApiController {
     public String deviceUpdateApi(HttpServletRequest request, @RequestBody DeviceReq req) {
         String serverName = request.getHeader("server-name");
         Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
+        String scheme = request.getScheme();
+        if (ObjectUtils.isEmpty(scheme)) {
+            scheme = "http";
+        }
 //        String serverName = request.getServerName();
 //        int serverPort = request.getServerPort();
         log.info("【设备前端新增或更新】【请求体】-->{}  ,serverName:{}", JSONObject.toJSONString(req), serverName);
@@ -457,7 +463,8 @@ public class DeviceApiController {
             registerResp.setRabbmitInfo(authInfo);
 
             ServerInfo serverInfo = new ServerInfo();
-           // buildHomeUrl(deviceEntity, productEntity, serverInfo, serverName, serverPort);
+            serverInfo.setScheme(scheme);
+            // buildHomeUrl(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             serverInfo.setServerUrl(platformEntity.getSendUrl());
             //String phpUrl=GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://10.12.185.213:8090");
@@ -948,6 +955,8 @@ public class DeviceApiController {
     }
 
     private void buildHomeUrlBySite(DeviceEntity deviceEntity, ProductEntity productEntity, ServerInfo serverInfo, String serverName, Integer serverPort) {
+        String scheme = serverInfo.getScheme();
+
         String homeUrl = "";
         //根据站点与资源部署来生成homeurl
 
@@ -970,7 +979,8 @@ public class DeviceApiController {
                 //根据部署的资源 生成homeurl
                 String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
                 if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
-                    String str = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
+                    String str = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
+                    // String str = UrlBuilder.of().setScheme("http").ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
                     String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
                     serverInfo.setHomeUrl(decodeStr);
                     serverInfo.setEventUrl(productEntity.getEventUrl());
@@ -991,7 +1001,8 @@ public class DeviceApiController {
             //根据部署的资源 生成homeurl
             String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
             if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
-                String str = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
+                String str = UrlBuilder.of().setScheme(scheme).setHost(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
+//                String str = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).addPath(homeUrl).build();
                 String decodeStr = URLDecoder.decode(str, Charset.defaultCharset());
                 serverInfo.setHomeUrl(decodeStr);
                 serverInfo.setEventUrl(productEntity.getEventUrl());
@@ -1061,6 +1072,12 @@ public class DeviceApiController {
 
 
     public static void main(String[] args) throws Exception {
+
+        UrlBuilder testPath = UrlBuilder.of().setScheme("https").setHost("10.12.185.213").setPort(31078).addPath("test/a");
+
+        System.out.println(testPath.build());
+
+
         String domain = "http://10.12.185.213:11078";
 
         UrlBuilder urlBuilder = UrlBuilder.ofHttp(domain).addPath("test");

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

@@ -12,6 +12,11 @@
     "baseLogin": "http://192.168.0.98:11078/base"
   },
 
+  "test-https": {
+    "baseUrl": "https://192.168.0.98:31078/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"