yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

yshop-monitor/pom.xml

@@ -0,0 +1,82 @@
+<?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>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.0.RELEASE</version>
+		<relativePath/>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>yshop-monitor</artifactId>
+	<version>1.7</version>
+
+	<name>客户端监控模块</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.hyperic/sigar -->
+		<dependency>
+			<groupId>org.hyperic</groupId>
+			<artifactId>sigar</artifactId>
+			<version>1.6.5.132</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>public</id>
+			<name>aliyun nexus</name>
+			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<!-- 跳过单元测试 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+					<excludes>
+
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<excludes>
+					<exclude>sigar-lib/**</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+</project>

yshop-monitor/src/main/java/co/yixiang/MonitorRun.java

@@ -0,0 +1,21 @@
+package co.yixiang;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ *
+ * @author: Zhang houying
+ * @date: 2019/11/3
+ */
+@EnableAsync
+@SpringBootApplication
+public class MonitorRun {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MonitorRun.class, args);
+        System.out.println("javapath:"+System.getProperty("java.library.path"));
+    }
+
+}

yshop-monitor/src/main/java/co/yixiang/res/ServerMonitorController.java

@@ -0,0 +1,61 @@
+package co.yixiang.res;
+
+import org.hyperic.sigar.CpuInfo;
+import org.hyperic.sigar.FileSystem;
+import org.hyperic.sigar.FileSystemUsage;
+import org.hyperic.sigar.Sigar;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Zhang houying
+ * @date 2019-11-03
+ */
+@RestController
+@RequestMapping("/api/serverMonitor")
+public class ServerMonitorController {
+
+	private Sigar sigar = new Sigar();
+	private static final double GB = 1024*1024*1024.00;
+
+	@GetMapping
+    public ResponseEntity<Object> getServerInfo(){
+    	Map<String,Object> resultMap = new HashMap<>(8);
+		try {
+			CpuInfo[] infoList = sigar.getCpuInfoList();
+			resultMap.put("cpuRate",sigar.getCpuPerc().getCombined());
+			resultMap.put("cpuCore",infoList.length);
+			resultMap.put("memTotal",sigar.getMem().getTotal()/GB);
+			resultMap.put("memUsed",sigar.getMem().getUsed()/GB);
+			FileSystem[] fsArray = sigar.getFileSystemList();
+			double diskTotal = 0;
+			double diskUsed = 0;
+			for (FileSystem fileSystem : fsArray) {
+				try {
+					FileSystemUsage usage = null;
+					usage = sigar.getFileSystemUsage(fileSystem.getDirName());
+					// 本地硬盘
+					if (fileSystem.getType() == 2) {
+						diskTotal += usage.getTotal() / GB * 1024;
+						diskUsed += usage.getUsed() / GB * 1024;
+					}
+				} catch (Exception ignored) {
+				}
+			}
+			resultMap.put("diskTotal",diskTotal);
+			resultMap.put("diskUsed",diskUsed);
+			resultMap.put("swapTotal",sigar.getSwap().getTotal()/GB);
+			resultMap.put("swapUsed",sigar.getSwap().getUsed()/GB);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return new ResponseEntity<>(resultMap, HttpStatus.OK);
+    }
+
+}

yshop-monitor/src/main/java/co/yixiang/utils/SigarUtil.java

@@ -0,0 +1,279 @@
+package co.yixiang.utils;
+
+import org.hyperic.sigar.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author ZhangHouYing
+ * @date 2019-11-03 15:04
+ */
+public class SigarUtil {
+
+	public static void main(String[] args) {
+		try {
+			// System信息，从jvm获取
+			property();
+			System.out.println("----------------------------------");
+			// cpu信息
+			cpu();
+			System.out.println("----------------------------------");
+			// 内存信息
+			memory();
+			System.out.println("----------------------------------");
+			// 操作系统信息
+			os();
+			System.out.println("----------------------------------");
+			// 用户信息
+			who();
+			System.out.println("----------------------------------");
+			// 文件系统信息
+			file();
+			System.out.println("----------------------------------");
+			// 网络信息
+			net();
+			System.out.println("----------------------------------");
+			// 以太网信息
+			ethernet();
+			System.out.println("----------------------------------");
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	private static void property() throws UnknownHostException {
+		Runtime r = Runtime.getRuntime();
+		Properties props = System.getProperties();
+		InetAddress addr;
+		addr = InetAddress.getLocalHost();
+		String ip = addr.getHostAddress();
+		Map<String, String> map = System.getenv();
+		// 获取用户名
+		String userName = map.get("USERNAME");
+		// 获取计算机名
+		String computerName = map.get("COMPUTERNAME");
+		// 获取计算机域名
+		String userDomain = map.get("USERDOMAIN");
+		System.out.println("用户名:    " + userName);
+		System.out.println("计算机名:    " + computerName);
+		System.out.println("计算机域名:    " + userDomain);
+		System.out.println("本地ip地址:    " + ip);
+		System.out.println("本地主机名:    " + addr.getHostName());
+		System.out.println("JVM可以使用的总内存:    " + r.totalMemory());
+		System.out.println("JVM可以使用的剩余内存:    " + r.freeMemory());
+		System.out.println("JVM可以使用的处理器个数:    " + r.availableProcessors());
+		System.out.println("Java的运行环境版本：    " + props.getProperty("java.version"));
+		System.out.println("Java的运行环境供应商：    " + props.getProperty("java.vendor"));
+		System.out.println("Java供应商的URL：    " + props.getProperty("java.vendor.url"));
+		System.out.println("Java的安装路径：    " + props.getProperty("java.home"));
+		System.out.println("Java的虚拟机规范版本：    " + props.getProperty("java.vm.specification.version"));
+		System.out.println("Java的虚拟机规范供应商：    " + props.getProperty("java.vm.specification.vendor"));
+		System.out.println("Java的虚拟机规范名称：    " + props.getProperty("java.vm.specification.name"));
+		System.out.println("Java的虚拟机实现版本：    " + props.getProperty("java.vm.version"));
+		System.out.println("Java的虚拟机实现供应商：    " + props.getProperty("java.vm.vendor"));
+		System.out.println("Java的虚拟机实现名称：    " + props.getProperty("java.vm.name"));
+		System.out.println("Java运行时环境规范版本：    " + props.getProperty("java.specification.version"));
+		System.out.println("Java运行时环境规范供应商：    " + props.getProperty("java.specification.vender"));
+		System.out.println("Java运行时环境规范名称：    " + props.getProperty("java.specification.name"));
+		System.out.println("Java的类格式版本号：    " + props.getProperty("java.class.version"));
+		System.out.println("Java的类路径：    " + props.getProperty("java.class.path"));
+		System.out.println("加载库时搜索的路径列表：    " + props.getProperty("java.library.path"));
+		System.out.println("默认的临时文件路径：    " + props.getProperty("java.io.tmpdir"));
+		System.out.println("一个或多个扩展目录的路径：    " + props.getProperty("java.ext.dirs"));
+		System.out.println("操作系统的名称：    " + props.getProperty("os.name"));
+		System.out.println("操作系统的构架：    " + props.getProperty("os.arch"));
+		System.out.println("操作系统的版本：    " + props.getProperty("os.version"));
+		System.out.println("文件分隔符：    " + props.getProperty("file.separator"));
+		System.out.println("路径分隔符：    " + props.getProperty("path.separator"));
+		System.out.println("行分隔符：    " + props.getProperty("line.separator"));
+		System.out.println("用户的账户名称：    " + props.getProperty("user.name"));
+		System.out.println("用户的主目录：    " + props.getProperty("user.home"));
+		System.out.println("用户的当前工作目录：    " + props.getProperty("user.dir"));
+	}
+
+	private static void memory() throws SigarException {
+		Sigar sigar = new Sigar();
+		Mem mem = sigar.getMem();
+		// 内存总量
+		System.out.println("内存总量:    " + mem.getTotal() / 1024L + "K av");
+		// 当前内存使用量
+		System.out.println("当前内存使用量:    " + mem.getUsed() / 1024L + "K used");
+		// 当前内存剩余量
+		System.out.println("当前内存剩余量:    " + mem.getFree() / 1024L + "K free");
+		Swap swap = sigar.getSwap();
+		// 交换区总量
+		System.out.println("交换区总量:    " + swap.getTotal() / 1024L + "K av");
+		// 当前交换区使用量
+		System.out.println("当前交换区使用量:    " + swap.getUsed() / 1024L + "K used");
+		// 当前交换区剩余量
+		System.out.println("当前交换区剩余量:    " + swap.getFree() / 1024L + "K free");
+	}
+
+	private static void cpu() throws SigarException {
+		Sigar sigar = new Sigar();
+		CpuInfo[] infos = sigar.getCpuInfoList();
+		CpuPerc[] cpuList;
+
+		System.out.println("cpu 总量参数情况:" + sigar.getCpu());
+		System.out.println("cpu 总百分比情况:" + sigar.getCpuPerc());
+
+		cpuList = sigar.getCpuPercList();
+		// 不管是单块CPU还是多CPU都适用
+		for (int i = 0; i < infos.length; i++) {
+			CpuInfo info = infos[i];
+			System.out.println("第" + (i + 1) + "块CPU信息");
+			// CPU的总量MHz
+			System.out.println("CPU的总量MHz:    " + info.getMhz());
+			// 获得CPU的卖主，如：Intel
+			System.out.println("CPU生产商:    " + info.getVendor());
+			// 获得CPU的类别
+			System.out.println("CPU类别:    " + info.getModel());
+			// 缓冲存储器数量
+			System.out.println("CPU缓存数量:    " + info.getCacheSize());
+			printCpuPerc(cpuList[i]);
+		}
+	}
+
+	private static void printCpuPerc(CpuPerc cpu) {
+		System.out.println("CPU用户使用率:    " + CpuPerc.format(cpu.getUser()));
+		System.out.println("CPU系统使用率:    " + CpuPerc.format(cpu.getSys()));
+		System.out.println("CPU当前等待率:    " + CpuPerc.format(cpu.getWait()));
+		System.out.println("CPU当前错误率:    " + CpuPerc.format(cpu.getNice()));
+		System.out.println("CPU当前空闲率:    " + CpuPerc.format(cpu.getIdle()));
+		System.out.println("CPU总的使用率:    " + CpuPerc.format(cpu.getCombined()));
+	}
+
+	private static void os() {
+		OperatingSystem os = OperatingSystem.getInstance();
+		// 操作系统内核类型如： 386、486、586等x86
+		System.out.println("操作系统:    " + os.getArch());
+		System.out.println("操作系统CpuEndian():    " + os.getCpuEndian());
+		System.out.println("操作系统DataModel():    " + os.getDataModel());
+		// 系统描述
+		System.out.println("操作系统的描述:    " + os.getDescription());
+		// 操作系统类型
+		 System.out.println("OS.getName():    " + os.getName());
+		 System.out.println("OS.getPatchLevel():    " + os.getPatchLevel());
+		// 操作系统的卖主
+		System.out.println("操作系统的卖主:    " + os.getVendor());
+		// 卖主名称
+		System.out.println("操作系统的卖主名:    " + os.getVendorCodeName());
+		// 操作系统名称
+		System.out.println("操作系统名称:    " + os.getVendorName());
+		// 操作系统卖主类型
+		System.out.println("操作系统卖主类型:    " + os.getVendorVersion());
+		// 操作系统的版本号
+		System.out.println("操作系统的版本号:    " + os.getVersion());
+	}
+
+	private static void who() throws SigarException {
+		Sigar sigar = new Sigar();
+		Who[] whos = sigar.getWhoList();
+		if (whos != null && whos.length > 0) {
+			for (Who who : whos) {
+				System.out.println("用户控制台:    " + who.getDevice());
+				System.out.println("用户host:    " + who.getHost());
+				// 当前系统进程表中的用户名
+				System.out.println("当前系统进程表中的用户名:    " + who.getUser());
+			}
+		}
+	}
+
+	private static void file() throws Exception {
+		Sigar sigar = new Sigar();
+		FileSystem[] fsList = sigar.getFileSystemList();
+		for (int i = 0; i < fsList.length; i++) {
+			System.out.println("分区的盘符名称" + i);
+			FileSystem fs = fsList[i];
+			// 分区的盘符名称
+			System.out.println("盘符名称:    " + fs.getDevName());
+			// 分区的盘符名称
+			System.out.println("盘符路径:    " + fs.getDirName());
+			System.out.println("盘符标志:    " + fs.getFlags());
+			// 文件系统类型，比如 FAT32、NTFS
+			System.out.println("盘符类型:    " + fs.getSysTypeName());
+			// 文件系统类型名，比如本地硬盘、光驱、网络文件系统等
+			System.out.println("盘符类型名:    " + fs.getTypeName());
+			// 文件系统类型
+			System.out.println("盘符文件系统类型:    " + fs.getType());
+			FileSystemUsage usage;
+			usage = sigar.getFileSystemUsage(fs.getDirName());
+			switch (fs.getType()) {
+				// TYPE_UNKNOWN ：未知
+				case 0: break;
+				// TYPE_NONE
+				case 1: break;
+				// TYPE_LOCAL_DISK : 本地硬盘
+				case 2:
+					// 文件系统总大小
+					System.out.println(fs.getDevName() + "总大小:    " + usage.getTotal() + "KB");
+					// 文件系统剩余大小
+					System.out.println(fs.getDevName() + "剩余大小:    " + usage.getFree() + "KB");
+					// 文件系统可用大小
+					System.out.println(fs.getDevName() + "可用大小:    " + usage.getAvail() + "KB");
+					// 文件系统已经使用量
+					System.out.println(fs.getDevName() + "已经使用量:    " + usage.getUsed() + "KB");
+					double usePercent = usage.getUsePercent() * 100D;
+					// 文件系统资源的利用率
+					System.out.println(fs.getDevName() + "资源的利用率:    " + usePercent + "%");
+					break;
+				// TYPE_NETWORK ：网络
+				case 3: break;
+				// TYPE_RAM_DISK ：闪存
+				case 4: break;
+				// TYPE_CD_ROM ：光驱
+				case 5: break;
+				// TYPE_SWAP ：页面交换
+				case 6: break;
+				default: break;
+			}
+			System.out.println(fs.getDevName() + "读出：" + usage.getDiskReads());
+			System.out.println(fs.getDevName() + "写入：" + usage.getDiskWrites());
+		}
+	}
+
+	private static void net() throws Exception {
+		Sigar sigar = new Sigar();
+		String[] ifNames = sigar.getNetInterfaceList();
+		for (String name : ifNames) {
+			NetInterfaceConfig ifconfig = sigar.getNetInterfaceConfig(name);
+			System.out.println("网络设备名:    " + name);
+			System.out.println("IP地址:    " + ifconfig.getAddress());
+			System.out.println("子网掩码:    " + ifconfig.getNetmask());
+			if ((ifconfig.getFlags() & 1L) <= 0L) {
+				System.out.println("!IFF_UP...skipping getNetInterfaceStat");
+				continue;
+			}
+			NetInterfaceStat ifstat = sigar.getNetInterfaceStat(name);
+			System.out.println(name + "接收的总包裹数:" + ifstat.getRxPackets());
+			System.out.println(name + "发送的总包裹数:" + ifstat.getTxPackets());
+			System.out.println(name + "接收到的总字节数:" + ifstat.getRxBytes());
+			System.out.println(name + "发送的总字节数:" + ifstat.getTxBytes());
+			System.out.println(name + "接收到的错误包数:" + ifstat.getRxErrors());
+			System.out.println(name + "发送数据包时的错误数:" + ifstat.getTxErrors());
+			System.out.println(name + "接收时丢弃的包数:" + ifstat.getRxDropped());
+			System.out.println(name + "发送时丢弃的包数:" + ifstat.getTxDropped());
+		}
+	}
+
+	private static void ethernet() throws SigarException {
+		Sigar sigar;
+		sigar = new Sigar();
+		String[] ifAces = sigar.getNetInterfaceList();
+		for (String ifAce : ifAces) {
+			NetInterfaceConfig cfg = sigar.getNetInterfaceConfig(ifAce);
+			if (NetFlags.LOOPBACK_ADDRESS.equals(cfg.getAddress()) || (cfg.getFlags() & NetFlags.IFF_LOOPBACK) != 0
+					|| NetFlags.NULL_HWADDR.equals(cfg.getHwaddr())) {
+				continue;
+			}
+			System.out.println(cfg.getName() + "IP地址:" + cfg.getAddress());
+			System.out.println(cfg.getName() + "网关广播地址:" + cfg.getBroadcast());
+			System.out.println(cfg.getName() + "网卡MAC地址:" + cfg.getHwaddr());
+			System.out.println(cfg.getName() + "子网掩码:" + cfg.getNetmask());
+			System.out.println(cfg.getName() + "网卡描述信息:" + cfg.getDescription());
+			System.out.println(cfg.getName() + "网卡类型" + cfg.getType());
+		}
+	}
+}

yshop-monitor/src/main/resources/banner.txt

@@ -0,0 +1,15 @@
+
+ __    __ ___  _    _   ___   _ __
+ \ \  / // __|| |  | | / _ \ | '_ \
+  \ \/ / \__ \| |--| || (_) || |_) |
+   \/ /  |___/|_|  |_| \___/ | .__/
+   / /                       | |
+  /_/                        |_|
+
+
+
+ :: Spring Boot ::       (v2.1.0.RELEASE)
+
+
+
+

yshop-monitor/src/main/resources/config/application.yml

@@ -0,0 +1,2 @@
+server:
+  port: 8777

yshop-monitor/src/main/resources/logback.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <contextName>yshop Monitor</contextName>
+
+    <!--输出到控制台-->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <!--普通日志输出到控制台-->
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>
+</configuration>