添加应用主题

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -115,22 +115,45 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
             String domainUrl = "";
             if (!ObjectUtils.isEmpty(params.getServerName()) && Validator.isIpv4(params.getServerName())) {
                 domainUrl = UrlBuilder.ofHttp(params.getServerName()).setPort(params.getServerPort() > 0 ? params.getServerPort() : 11078).build();
+                domainUrl = StrUtil.sub(domainUrl, 0, domainUrl.length() - 1);
+
+            }else {
+               // domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
+
+                domainUrl="";
             }
 
             if (!ObjectUtils.isEmpty(siteEntity)) {
                 //请求地址 http://domian/app/siteCode/appcode/html
-                item.setCustUrl(UrlBuilder.ofHttp(params.getServerName()).setPort(params.getServerPort() > 0 ? params.getServerPort() : 11078)
-                        .addPath(CUSTAPP_ROOT_PATH)
-                        .addPath(siteEntity.getSiteCode())
-                        .addPath(item.getAppCode())
-                        .addPath(item.getVersion().toString())
-                        .build());
+
+                if(!ObjectUtils.isEmpty(domainUrl)){
+                    item.setCustUrl(UrlBuilder.ofHttp(domainUrl)
+                            .addPath(CUSTAPP_ROOT_PATH)
+                            .addPath(siteEntity.getSiteCode())
+                            .addPath(item.getAppCode())
+                            .addPath(item.getVersion().toString())
+                            .build());
+                }else{
+                    item.setCustUrl(UrlBuilder.of(domainUrl)
+                            .addPath(CUSTAPP_ROOT_PATH)
+                            .addPath(siteEntity.getSiteCode())
+                            .addPath(item.getAppCode())
+                            .addPath(item.getVersion().toString())
+                            .build());
+                }
+
             } else {
                 item.setCustUrl("");
             }
             //构建图标地址
-            item.setAppIconUrl(UrlBuilder.ofHttp(params.getServerName()).setPort(params.getServerPort() > 0 ? params.getServerPort() : 11078)
-                    .addPath(item.getAppIconPath()).build());
+            if(!ObjectUtils.isEmpty(domainUrl)){
+                item.setAppIconUrl(UrlBuilder.ofHttp(domainUrl)
+                        .addPath(item.getAppIconPath()).build());
+            }else{
+                item.setAppIconUrl(UrlBuilder.of(domainUrl)
+                        .addPath(item.getAppIconPath()).build());
+            }
+
         });
         super.findAfter(params, pageInfo, context, list);
     }

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -53,6 +53,28 @@ Content-Type: application/json
 "url":"http://172.15.28.113:8900"
 }
 
+###参数信息更新与保存
+POST {{baseUrl}}/param/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "name":"upd19g",
+  "firstOrganize":"2pdzk6",
+  "secondOrganize":"4glkoo",
+  "paramKey":"isynj7",
+  "paramValue":"t09yd7",
+  "validStatus":1,
+  "modStatus":4,
+  "displayType":0,
+  "remark":"z5lbzt",
+  "createUserName":"75on7u"
+}
+
+> {%
+client.global.set("Param_id", JSON.parse(response.body).data.id);
+%}
+
 ###test Cookie
 POST {{baseUrl}}/test/testCookie
 Content-Type: application/json