From fd3558e8bab821689de106b0d956ae4d555f9b63 Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Tue, 28 Mar 2017 18:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9groupid=E5=92=8Cversionid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parent/base.common/pom.xml                                          | 5 ++---
 parent/center.manager/pom.xml                                       | 6 +++---
 .../src/main/java/com/lyms/cm/controller/LoginController.java       | 5 +++++
 parent/core.sdk/pom.xml                                             | 2 +-
 parent/hospital.mac/pom.xml                                         | 2 +-
 parent/hospital.web/pom.xml                                         | 6 +++---
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/parent/base.common/pom.xml b/parent/base.common/pom.xml
index 561e9f9..165413b 100644
--- a/parent/base.common/pom.xml
+++ b/parent/base.common/pom.xml
@@ -6,7 +6,6 @@
 		<artifactId>parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>com.lyms.base.common</groupId>
 	<artifactId>base.common</artifactId>
 
 	<properties>
@@ -18,7 +17,7 @@
 		<dependency>
 			<groupId>com.lyms</groupId>
 			<artifactId>core.sdk</artifactId>
-			<version>core.sdk-1.0</version>
+			<version>1.0</version>
 		</dependency>
 	</dependencies>
 
@@ -37,5 +36,5 @@
 		</plugins>
 	</build>
 	
-	<version>base.common-1.0</version>
+	<version>1.0</version>
 </project>
\ No newline at end of file
diff --git a/parent/center.manager/pom.xml b/parent/center.manager/pom.xml
index ef09cf3..6ac02bb 100644
--- a/parent/center.manager/pom.xml
+++ b/parent/center.manager/pom.xml
@@ -20,15 +20,15 @@
 	<dependencies>
 	
 		<dependency>
-			<groupId>com.lyms.base.common</groupId>
+			<groupId>com.lyms</groupId>
 			<artifactId>base.common</artifactId>
-			<version>base.common-1.0</version>
+			<version>1.0</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>com.lyms</groupId>
 			<artifactId>core.sdk</artifactId>
-			<version>core.sdk-1.0</version>
+			<version>1.0</version>
 		</dependency>
 
 		<!-- swagger2 need begin -->
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
index 008c47b..d1305e9 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
@@ -12,14 +12,19 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.lyms.base.common.entity.role.TreeNode;
 import com.lyms.base.common.entity.user.Users;
 import com.lyms.base.common.enums.PermissionEnum;
 import com.lyms.base.common.service.role.PermissionsService;
+import com.lyms.cm.controller.sys.SysUsersController;
 import com.lyms.constants.Constants;
 import com.lyms.shiro.ShiroWebUtils;
 import com.lyms.util.StrUtils;
diff --git a/parent/core.sdk/pom.xml b/parent/core.sdk/pom.xml
index 70b0838..c5c38c7 100644
--- a/parent/core.sdk/pom.xml
+++ b/parent/core.sdk/pom.xml
@@ -30,5 +30,5 @@
 		
 	</dependencies>
 	
-	<version>core.sdk-1.0</version>
+	<version>1.0</version>
 </project>
\ No newline at end of file
diff --git a/parent/hospital.mac/pom.xml b/parent/hospital.mac/pom.xml
index 45f7dd2..8b4f8c6 100644
--- a/parent/hospital.mac/pom.xml
+++ b/parent/hospital.mac/pom.xml
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>com.lyms</groupId>
 			<artifactId>core.sdk</artifactId>
-			<version>core.sdk-1.0</version>
+			<version>1.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/parent/hospital.web/pom.xml b/parent/hospital.web/pom.xml
index 9665e50..f3ae6f4 100644
--- a/parent/hospital.web/pom.xml
+++ b/parent/hospital.web/pom.xml
@@ -19,12 +19,12 @@
 		<dependency>
 			<groupId>com.lyms</groupId>
 			<artifactId>core.sdk</artifactId>
-			<version>core.sdk-1.0</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
-			<groupId>com.lyms.base.common</groupId>
+			<groupId>com.lyms</groupId>
 			<artifactId>base.common</artifactId>
-			<version>base.common-1.0</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.lyms</groupId>
-- 
1.8.3.1