From fa2dc9559ced18f4681569a25da67cb39b42362b Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Wed, 19 Apr 2017 18:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/base/common/service/user/UsersService.java   | 1 +
 .../com/lyms/base/common/service/user/impl/UsersServiceImpl.java    | 1 +
 .../src/main/java/com/lyms/cm/controller/LoginController.java       | 6 +++++-
 parent/center.manager/src/main/resources/xml/app-datasource.xml     | 3 +--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java
index 4a38b01..0509dda 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java
@@ -3,6 +3,7 @@ package com.lyms.base.common.service.user;
 import java.io.Serializable;
 import java.util.List;
 
+import com.lyms.annotation.DataSourceChange;
 import com.lyms.base.common.entity.role.UserRoleMaps;
 import com.lyms.base.common.entity.user.Users;
 import com.lyms.exception.SystemException;
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java
index 4f702b6..3e6233d 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java
@@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.annotation.DataSourceChange;
 import com.lyms.base.common.dao.user.UsersMapper;
 import com.lyms.base.common.entity.role.UserRoleMaps;
 import com.lyms.base.common.entity.user.Users;
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 d1305e9..c4b50ab 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
@@ -24,11 +24,13 @@ 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.base.common.service.user.UsersService;
 import com.lyms.cm.controller.sys.SysUsersController;
 import com.lyms.constants.Constants;
 import com.lyms.shiro.ShiroWebUtils;
 import com.lyms.util.StrUtils;
 import com.lyms.web.controller.BaseController;
+import com.qiniu.util.Json;
 
 @Controller
 public class LoginController extends BaseController {
@@ -37,6 +39,8 @@ public class LoginController extends BaseController {
 
 	@Autowired
 	private PermissionsService sysPermissionsService;
+	@Autowired
+	private UsersService usersService;
 
 	@RequestMapping("/")
 	public String index(Model model) {
@@ -69,7 +73,7 @@ public class LoginController extends BaseController {
 		model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid());
 		return VIEW_LOGIN;
 	}
-
+	
 	/**
 	 * <li>@Description:登录验证方法,详细查看ShiroRealm.class
 	 * <li>@param req
diff --git a/parent/center.manager/src/main/resources/xml/app-datasource.xml b/parent/center.manager/src/main/resources/xml/app-datasource.xml
index 5455f53..77e7a28 100644
--- a/parent/center.manager/src/main/resources/xml/app-datasource.xml
+++ b/parent/center.manager/src/main/resources/xml/app-datasource.xml
@@ -42,14 +42,13 @@
     </bean>
     
     <!-- 主库 -->
-    <bean id="master-dataSource" name="master-dataSource" parent="baseDataSource" init-method="init" primary="true" >
+    <bean id="master-dataSource" name="master-dataSource" parent="baseDataSource" init-method="init">
         <property name="url" value="${jdbc.url}" />
         <!-- <property name="driverClassName" value="com.mysql.jdbc.Driver" />   -->
         <property name="username" value="${jdbc.username}" />
         <property name="password" value="${jdbc.password}" />
     </bean>
     
-    
     <!--数据源切面注入spring-->
     <bean id="dsChangeAspect" class="com.lyms.aop.DataSourceAspect"/>
 
-- 
1.8.3.1