zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	agent/src/main/java/io/wdd/agent/initial/bootup/reference/collectSystemInfo.java
This commit is contained in:
zeaslity
2022-11-28 18:02:12 +08:00
parent 9de74ee535 b24ea971b3
commit 8877c67c3e
2 changed files with 11 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-push-docker.yml vendored
View File

@@ -101,7 +101,7 @@ jobs:
with: with:
context: ./ context: ./
# Path to the Dockerfile # Path to the Dockerfile
file: ./localEnvironment/src/main/java/io/wdd/localenviroment/build-my-own-base-image.dockerfile file: ./source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: true push: true
tags: ${{ steps.docker_tags_base.outputs.tags }} tags: ${{ steps.docker_tags_base.outputs.tags }}

52
agent/src/main/java/io/wdd/agent/initial/bootup/reference/collectSystemInfo.java
View File

@@ -1,30 +1,24 @@
package io.wdd.agent.initial.bootup.reference; package io.wdd.agent.initial.bootup;
import io.wdd.agent.initial.beans.ServerInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.Map;
import java.util.Properties; import java.util.Properties;
@Configuration @Configuration
@Slf4j public class collectSystemInfo {
public class collectSystemInfo implements ApplicationContextAware {
@Resource @Resource
Environment environment; Environment environment;
private ApplicationContext context;
@Bean @Bean
public void initialReadingEnvironment(){ public void initialReadingEnvironment(){
@@ -39,25 +33,16 @@ public class collectSystemInfo implements ApplicationContextAware {
Properties props =System.getProperties(); Properties props =System.getProperties();
System.out.println("props = " + props); System.out.println("props = " + props);
System.out.println();
Map<String, String> getenv = System.getenv();
System.out.println("getenv = " + getenv);
System.out.println();
System.out.println("environment = " + environment);
InetAddress loopbackAddress = InetAddress.getLoopbackAddress();
System.out.println("loopbackAddress = " + loopbackAddress);
InetAddress ip = InetAddress.getLocalHost(); InetAddress ip = InetAddress.getLocalHost();
String localName = ip.getHostName();
System.out.println("ip = " + ip); System.out.println("ip = " + ip);
System.out.println("environment = " + environment);
String localName = ip.getHostName();
String osName = System.getProperty("os.name"); String osName = System.getProperty("os.name");
String userName = System.getProperty("user.name"); String userName = System.getProperty("user.name");
String osVersion = System.getProperty("os.version"); String osVersion = System.getProperty("os.version");
@@ -70,27 +55,10 @@ public class collectSystemInfo implements ApplicationContextAware {
System.out.println("主机系统：" + osName); System.out.println("主机系统：" + osName);
System.out.println("系统版本：" + osVersion); System.out.println("系统版本：" + osVersion);
System.out.println("系统架构：" + osArch); System.out.println("系统架构：" + osArch);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@PostConstruct
private void getInjectServerInfo(){
log.info("getInjectServerInfo");
ServerInfo serverInfo = (ServerInfo) context.getBean("serverInfo");
System.out.println("serverInfo = " + serverInfo);
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.context = applicationContext;
}
} }