From 574187f2e1eedb8c355090af37be3d9ccc08a585 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 一月 2024 08:52:54 +0800
Subject: [PATCH] 远程部署服务部分代码编写，主题库定义分类授权界面增加全选按钮功能
---
Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/vo/DeployAppsVO.java | 27 +++
Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml | 4
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/DeployApplication.java | 19 ++
Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/DeployApps.java | 46 +++++
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/SystemApplication.java | 1
Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/Instance.java | 47 +++++
Source/UBCS/ubcs-service/ubcs-deploy/pom.xml | 43 +++++
Source/UBCS/ubcs-service/pom.xml | 1
Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/CmdConfig.java | 19 ++
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java | 40 +++++
Source/UBCS-WEB/src/page/login/userlogin.vue | 1
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java | 106 +++++++++++++
Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue | 4
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java | 20 ++
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/mapper/DeployAppsMapper.java | 13 +
Source/UBCS/ubcs-service-api/pom.xml | 1
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 1
Source/UBCS/ubcs-service-api/ubcs-deploy-api/pom.xml | 26 +++
Source/UBCS-WEB/src/page/login/sso.vue | 2
19 files changed, 414 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
index afb086d..0824414 100644
--- a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
@@ -301,9 +301,9 @@
}
this.classifyAuthButton.forEach(item => {
//console.log("item",item);
- Vue.set(this.classifyAuthData[0], item.id, true);
+ Vue.set(this.selectList[0], item.id, true);
});
- //console.log("this.classifyAuthData",this.classifyAuthData);
+ //console.log("this.selectList",this.selectList);
},
},
};
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index b6cc3f3..4017299 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -329,7 +329,6 @@
condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
}
}
-
}
// 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝灏变紶閫掔粰鐖剁粍浠�
//console.log(condtionParam);
diff --git a/Source/UBCS-WEB/src/page/login/sso.vue b/Source/UBCS-WEB/src/page/login/sso.vue
index 54c3430..73ea181 100644
--- a/Source/UBCS-WEB/src/page/login/sso.vue
+++ b/Source/UBCS-WEB/src/page/login/sso.vue
@@ -28,7 +28,7 @@
//console.log(this.$route);
//console.log(this.PathString);
this.$store.dispatch("LoginBySso", { PathString: this.PathString }).then((res) => {
- console.log('res', res)
+ //console.log('res', res)
this.$router.push({ path: this.tagWel.value });
})
}
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 3fcd87b..f379bce 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -67,7 +67,6 @@
</div>
</el-dialog>
</div>
-
</template>
<script>
diff --git a/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
index ea894bc..a23ff77 100644
--- a/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
@@ -33,8 +33,8 @@
# 鑷畾涔夌櫥褰曠敤鎴峰悕瀵嗙爜
security:
user:
- name: Admin
- password: Admin
+ name: admin
+ password: admin
# 鐩戞帶鐨勭浉鍏抽厤缃�
monitor:
diff --git a/Source/UBCS/ubcs-service-api/pom.xml b/Source/UBCS/ubcs-service-api/pom.xml
index f58b75c..34ef77f 100644
--- a/Source/UBCS/ubcs-service-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/pom.xml
@@ -28,6 +28,7 @@
<module>ubcs-applyjtcodeservice-api</module>
<module>ubcs-workflow-api</module>
<module>ubcs-file-api</module>
+ <module>ubcs-deploy-api</module>
</modules>
<dependencies>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-deploy-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/pom.xml
new file mode 100644
index 0000000..81d7eb2
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>ubcs-service-api</artifactId>
+ <groupId>com.vci.ubcs</groupId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>ubcs-deploy-api</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-server</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/CmdConfig.java b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/CmdConfig.java
new file mode 100644
index 0000000..60cc7ae
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/CmdConfig.java
@@ -0,0 +1,19 @@
+package com.vci.ubcs.deploy.entity;
+
+import lombok.Data;
+
+/**
+ * 杩滅▼閮ㄧ讲鑳藉鎵ц鐨勫懡浠�
+ * @author ludc
+ * @date 2024/1/7 21:37
+ */
+@Data
+public class CmdConfig {
+
+ private String startCmd;
+
+ private String restartCmd;
+
+ private String stopCmd;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/DeployApps.java b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/DeployApps.java
new file mode 100644
index 0000000..460d1d6
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/DeployApps.java
@@ -0,0 +1,46 @@
+package com.vci.ubcs.deploy.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 杩滅▼閮ㄧ讲鍔熻兘
+ * @author ludc
+ * @date 2024/1/7 19:55
+ */
+@Data
+@TableName("PL_SYS_DEPLOY_CONFIG")
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeployApps {
+
+ /**
+ * 涓婚敭
+ */
+ @TableId("OID")
+ private String oid;
+
+ /**
+ * 鏈嶅姟鍚嶇О
+ */
+ private String serverName;
+
+ /**
+ * 鏈嶅姟jar瀛樻斁鐨勮矾寰�
+ */
+ private String serverPath;
+
+ /**
+ * 鏃ュ織鏂囦欢瀛樻斁浣嶇疆
+ */
+ private String logPath;
+
+ /**
+ * 鍛戒护閰嶇疆
+ */
+ private CmdConfig cmdCofig;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/Instance.java b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/Instance.java
new file mode 100644
index 0000000..ecf2a5e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/entity/Instance.java
@@ -0,0 +1,47 @@
+package com.vci.ubcs.deploy.entity;
+
+import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
+import de.codecentric.boot.admin.server.domain.values.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.*;
+
+/**
+ * @author ludc
+ * @date 2024/1/8 0:23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Instance implements Serializable {
+
+ private InstanceId id;
+
+ private long version;
+
+ @Nullable
+ private Registration registration;
+
+ private boolean registered;
+
+ private StatusInfo statusInfo;
+
+ private Instant statusTimestamp;
+
+ private Info info;
+
+ private List<InstanceEvent> unsavedEvents;
+
+ private Endpoints endpoints;
+
+ @Nullable
+ private BuildVersion buildVersion;
+
+ private Tags tags;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/vo/DeployAppsVO.java b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/vo/DeployAppsVO.java
new file mode 100644
index 0000000..f802790
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-deploy-api/src/main/java/com/vci/ubcs/deploy/vo/DeployAppsVO.java
@@ -0,0 +1,27 @@
+package com.vci.ubcs.deploy.vo;
+
+import com.vci.ubcs.deploy.entity.DeployApps;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author ludc
+ * @date 2024/1/7 23:26
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeployAppsVO extends DeployApps {
+
+ private String name;
+
+ private String status;
+
+ private String statusTimestamp;
+
+ private String port;
+
+ private Integer serviceNum;
+
+}
diff --git a/Source/UBCS/ubcs-service/pom.xml b/Source/UBCS/ubcs-service/pom.xml
index 3da8a0c..17a93b0 100644
--- a/Source/UBCS/ubcs-service/pom.xml
+++ b/Source/UBCS/ubcs-service/pom.xml
@@ -25,6 +25,7 @@
<module>ubcs-omd</module>
<module>ubcs-ddl</module>
<module>ubcs-applyjtcodeservice</module>
+ <module>ubcs-deploy</module>
</modules>
<dependencies>
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/pom.xml b/Source/UBCS/ubcs-service/ubcs-deploy/pom.xml
new file mode 100644
index 0000000..c35a4c6
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-service</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>ubcs-deploy</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-boot</artifactId>
+ <!--<exclusions>
+ <exclusion>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-mybatis</artifactId>
+ </exclusion>
+ </exclusions>-->
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-deploy-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/DeployApplication.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/DeployApplication.java
new file mode 100644
index 0000000..bdca20a
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/DeployApplication.java
@@ -0,0 +1,19 @@
+package com.vci.ubcs.deploy;
+
+import org.springblade.core.cloud.client.UbcsCloudApplication;
+import org.springblade.core.launch.UbcsApplication;
+import org.springblade.core.launch.constant.AppConstant;
+
+/**
+ * 杩滅▼閮ㄧ讲鏈嶅姟
+ * @author ludc
+ * @date 2024/1/7 23:19
+ */
+@UbcsCloudApplication
+public class DeployApplication {
+
+ public static void main(String[] args) {
+ UbcsApplication.run(AppConstant.APPLICATION_NAME_PREFIX+"deploy", DeployApplication.class, args);
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
new file mode 100644
index 0000000..738ed1b
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
@@ -0,0 +1,40 @@
+package com.vci.ubcs.deploy.controller;
+
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
+import com.vci.ubcs.deploy.entity.DeployApps;
+import com.vci.ubcs.deploy.service.IDeployAppsService;
+import com.vci.ubcs.deploy.vo.DeployAppsVO;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.apache.http.auth.AuthenticationException;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.ServletRequest;
+import java.util.List;
+
+/**
+ * 鏈嶅姟杩滅▼鏇存柊閮ㄧ讲
+ * @author ludc
+ * @date 2024/1/7 0:24
+ */
+@NonDS
+@RestController
+@AllArgsConstructor
+@RequestMapping("/deploy")
+@ApiIgnore
+@Api(value = "搴旂敤绠＄悊", tags = "鎺ュ彛")
+public class DeployAppsController {
+
+ private final IDeployAppsService deployAppsService;
+
+ @GetMapping("/applications")
+ public R<List<DeployAppsVO>> getApplications(ServletRequest servletRequest) throws ServiceException {
+ return R.data(deployAppsService.getApplications(servletRequest));
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/mapper/DeployAppsMapper.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/mapper/DeployAppsMapper.java
new file mode 100644
index 0000000..5a86c90
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/mapper/DeployAppsMapper.java
@@ -0,0 +1,13 @@
+package com.vci.ubcs.deploy.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.deploy.entity.DeployApps;
+
+/**
+ * @author ludc
+ * @date 2024/1/7 19:55
+ */
+public interface DeployAppsMapper extends BaseMapper<DeployApps> {
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java
new file mode 100644
index 0000000..7bb3df5
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java
@@ -0,0 +1,20 @@
+package com.vci.ubcs.deploy.service;
+
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.deploy.entity.DeployApps;
+import com.vci.ubcs.deploy.vo.DeployAppsVO;
+import org.apache.http.auth.AuthenticationException;
+
+import javax.servlet.ServletRequest;
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2024/1/7 19:54
+ */
+public interface IDeployAppsService extends IService<DeployApps> {
+
+ List<DeployAppsVO> getApplications(ServletRequest servletRequest) throws ServiceException;
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
new file mode 100644
index 0000000..6913f3f
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
@@ -0,0 +1,106 @@
+package com.vci.ubcs.deploy.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.deploy.entity.DeployApps;
+import com.vci.ubcs.deploy.entity.Instance;
+import com.vci.ubcs.deploy.mapper.DeployAppsMapper;
+import com.vci.ubcs.deploy.service.IDeployAppsService;
+import com.vci.ubcs.deploy.vo.DeployAppsVO;
+import com.vci.ubcs.starter.util.HttpUtils;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.UrlUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2024/1/7 19:54
+ */
+@Service
+public class DeployAppsServiceImpl extends ServiceImpl<DeployAppsMapper, DeployApps> implements IDeployAppsService {
+
+ @Autowired
+ private DeployAppsMapper deployAppsMapper;
+
+ @Value("${password-free.pwd-free-addr:localhost}")
+ private String pwdFreeAddr;
+
+ // 閫氳繃鏈嶅姟娉ㄥ唽涓績鑾峰彇缃戝叧鐨勭鍙ｅ彿
+ @Autowired
+ private DiscoveryClient discoveryClient;
+
+ @Override
+ public List<DeployAppsVO> getApplications(ServletRequest servletRequest) throws ServiceException {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ String baldeAuth = request.getHeaders("Blade-Auth").nextElement();
+ String cookie = request.getHeaders("Cookie").nextElement();
+ // 鍏嶅瘑鐧诲綍鎺ュ彛鍦板潃
+ String loginUrl = "http://"+pwdFreeAddr+":"+this.getGatewayPort("ubcs-gateway")+"/ubcs-admin/applications";
+ log.debug("鑾峰彇鏈嶅姟淇℃伅璋冪敤鍦板潃锛�"+loginUrl);
+ // 璇锋眰ubcs-admin鑾峰彇鏈嶅姟淇℃伅
+ HttpHeaders headers = new HttpHeaders();
+ ArrayList<MediaType> mediaTypes = new ArrayList<>();
+ mediaTypes.add(MediaType.APPLICATION_JSON);
+ headers.set("Authorization","Basic c2FiZXI6c2FiZXJfc2VjcmV0");
+ headers.set("Blade-Auth",baldeAuth);
+ headers.set("Cookie",cookie);
+ headers.setAccept(mediaTypes);
+ List<DeployAppsVO> deployAppsVOList = new ArrayList<>();
+ try {
+ // 鍙戦�丟ET璇锋眰
+ String responseBody = HttpUtils.get(loginUrl, headers);
+ if(Func.isNotEmpty(responseBody)){
+ // 灏� JSON 瀛楃涓茶浆鎹负 JSONArray
+ JSONArray jsonArray = JSON.parseArray(responseBody);
+ for (Object obj : jsonArray) {
+ DeployAppsVO deployAppsVO = new DeployAppsVO();
+ JSONObject jsonObject = (JSONObject) obj;
+ List instances = ((List) jsonObject.get("instances"));
+ deployAppsVO.setName(jsonObject.get("name").toString());
+ String serviceUrl = ((JSONObject) ((JSONObject) instances.get(0)).get("registration")).get("serviceUrl").toString();
+ deployAppsVO.setPort(String.valueOf(new URL(serviceUrl).getPort()));
+ deployAppsVO.setServiceNum(instances.size());
+ deployAppsVO.setStatus(jsonObject.get("status").toString());
+ deployAppsVO.setStatusTimestamp(jsonObject.get("statusTimestamp").toString());
+ deployAppsVOList.add(deployAppsVO);
+ }
+
+ }
+ }catch (Exception e){
+ throw new ServiceException("璋冪敤ubcs-admin鑾峰彇鏈嶅姟淇℃伅澶辫触锛屽師鍥狅細"+e.getMessage());
+ }
+ return deployAppsVOList;
+ }
+
+ /**
+ * 鏍规嵁鏈嶅姟鍚嶈幏鍙栫鍙ｅ彿
+ * @param serviceId
+ * @return
+ */
+ public String getGatewayPort(String serviceId) {
+ List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
+ if (!instances.isEmpty()) {
+ ServiceInstance gatewayInstance = instances.get(0);
+ return String.valueOf(gatewayInstance.getPort());
+ }
+ return "8080";
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/SystemApplication.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/SystemApplication.java
index ad3daac..7ca8d30 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/SystemApplication.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/SystemApplication.java
@@ -19,6 +19,7 @@
import org.springblade.core.cloud.client.UbcsCloudApplication;
import org.springblade.core.launch.UbcsApplication;
import org.springblade.core.launch.constant.AppConstant;
+import org.springframework.context.annotation.ComponentScan;
/**
* 绯荤粺妯″潡鍚姩鍣�
--
Gitblit v1.9.3