From 1efbeb3d5f0579f92d1bd766181b6dcade01b250 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Fri, 26 Oct 2018 17:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20=20=20?=
 =?UTF-8?q?=20=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=20=20=20=20=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90=20?=
 =?UTF-8?q?=20=20=20=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

权限
    用户管理           功能完成
    用户登录           功能完成
---
 modules/i3plus-pojo-base/pom.xml                   | 10 ++++------
 .../i3plus/pojo/model/flatform/UserModel.java      | 14 +++-----------
 modules/i3plus-pojo-platform/pom.xml               |  4 ----
 pom.xml                                            | 22 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 1351011..a397cee 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -14,17 +14,15 @@
     <packaging>jar</packaging>
 
 
-
     <dependencies>
         <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-model</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
 
 
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java
index bc8a084..b686a24 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Set;
 
 
@@ -33,16 +34,7 @@ public class UserModel {
     private SysUserInfo userInfo;
 
     @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合")
-    private Set<SysRole> roles;
-
-    @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合")
-    private Set<Position> positions;
-
-    @ApiParam(value = "部门信息",access = "用户所有用部门信息集合")
-    private Set<Department> departments;
-
-    @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合")
-    private Set<Organize> organizes;
+    private List<SysRole> roles;
 
     @ApiParam(value = "角色信息",access = "用户所拥有岗位信息")
     private SysRole role;
@@ -50,7 +42,7 @@ public class UserModel {
     @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息")
     private Position position;
 
-    @ApiParam(value = "部门信息",access = "用户所有用部门信息")
+    @ApiParam(value = "部门信息",access = "用户所拥有部门信息")
     private Department department;
 
     @ApiParam(value = "组织信息",access = "用户所拥有的组织信息")
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index ccd1a0c..de63812 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -16,10 +16,6 @@
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 2bf10d9..6cc1e7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,4 +137,26 @@
         </snapshotRepository>
     </distributionManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <!--  添加编译插件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>
\ No newline at end of file