From 21627cd87871115e0ede60dbf546a2541335e55d Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Mon, 10 Aug 2020 18:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=BA=E5=91=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../routes/common}/CommonRouteController.java |  2 +-
 .../templates/common/list-select-user.html    |  0
 pom.xml                                       | 32 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 rename {cloud-common/src/main/java/com/cm/common/controller/route => cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/common}/CommonRouteController.java (94%)
 rename {cloud-common => cloud-common-plugin}/src/main/resources/templates/common/list-select-user.html (100%)

diff --git a/cloud-common/src/main/java/com/cm/common/controller/route/CommonRouteController.java b/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/common/CommonRouteController.java
similarity index 94%
rename from cloud-common/src/main/java/com/cm/common/controller/route/CommonRouteController.java
rename to cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/common/CommonRouteController.java
index c30d963..b1867b2 100644
--- a/cloud-common/src/main/java/com/cm/common/controller/route/CommonRouteController.java
+++ b/cloud-common-plugin/src/main/java/com/cm/common/plugin/controller/routes/common/CommonRouteController.java
@@ -1,4 +1,4 @@
-package com.cm.common.controller.route;
+package com.cm.common.plugin.controller.routes.common;
 
 import com.cm.common.constants.ISystemConstant;
 import io.swagger.annotations.Api;
diff --git a/cloud-common/src/main/resources/templates/common/list-select-user.html b/cloud-common-plugin/src/main/resources/templates/common/list-select-user.html
similarity index 100%
rename from cloud-common/src/main/resources/templates/common/list-select-user.html
rename to cloud-common-plugin/src/main/resources/templates/common/list-select-user.html
diff --git a/pom.xml b/pom.xml
index aa434ea..b3d03ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,11 @@
         <knife4j.version>2.0.4</knife4j.version>
         <jwt.version>1.0.9.RELEASE</jwt.version>
         <email.version>1.6.2</email.version>
+        <oshi-core.version>5.2.2</oshi-core.version>
+        <jna.version>5.6.0</jna.version>
+        <jna-platform.version>5.6.0</jna-platform.version>
+        <spring-security-jwt.version>1.0.9.RELEASE</spring-security-jwt.version>
+        <netty.version>4.1.50.Final</netty.version>
     </properties>
 
     <!-- 依赖管理 -->
@@ -380,7 +385,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-jwt</artifactId>
-                <version>1.0.9.RELEASE</version>
+                <version>${spring-security-jwt.version}</version>
             </dependency>
 
             <!-- sauronsoftware start -->
@@ -398,6 +403,31 @@
                 <version>${email.version}</version>
             </dependency>
             <!-- email end -->
+
+            <!-- 设备信息 start -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${jna-platform.version}</version>
+            </dependency>
+            <!-- 设备信息 end -->
+            <!-- netty start -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <!-- netty end -->
         </dependencies>
     </dependencyManagement>