五院单点登陆修改

hs-api/src/main/java/com/hs/api/controller/SsoController.java

@@ -49,7 +49,7 @@ public class SsoController {
 
     @GetMapping("/index")
     public String Login(Model model, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        String token = request.getParameter("Token");
+        String token = request.getParameter("token");
         if (StringUtil.isNullOrEmpty(token)) {
             token = request.getParameter("token");
         }

hs-api/src/main/java/com/hs/api/controller/UserController.java

@@ -9,7 +9,9 @@ import com.hs.api.model.SysRole;
 import com.hs.api.model.SysUser;
 import com.hs.api.model.reqmodel.Disease;
 import com.hs.api.model.reqmodel.MenuReq;
+import com.hs.api.model.respmodel.LoginInfo;
 import com.hs.api.model.respmodel.SysMenuList;
+import com.hs.api.service.LoginService;
 import com.hs.api.service.SysMenuService;
 import com.hs.api.service.SysUserOrgRsService;
 import com.hs.api.service.SysUserRoleRsService;
@@ -34,6 +36,8 @@ public class UserController {
     private SysMenuService sysMenuService;
     @Autowired
     private SysUserOrgRsService sysUserOrgRsService;
+    @Autowired
+    private LoginService loginServiceImpl;
 
     /**
      * 根据token获取用户信息
@@ -44,7 +48,14 @@ public class UserController {
     public Object getByToken(HttpServletRequest request) {
         String token = request.getHeader(Constants.TOKEN_KEY);
         SysUser user = (SysUser) RedisUtil.get(token);
-        return Result.success(user);
+//        return Result.success(user);
+
+        LoginInfo loginInfo = loginServiceImpl.login(
+                user.getUserCode(), user.getPassword(), user.getMacAddress(), user.getLastIp());
+        if (loginInfo == null) {
+            return Result.error(Result.ErrorCode.USERERROR);
+        }
+        return Result.success(loginInfo);
     }
 
     @GetMapping()

hs-api/src/main/resources/application-test.properties

 #### \u6D4B\u8BD5\u73AF\u5883 ###################################################
-spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy2.1_org?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+#spring.datasource.url=jdbc:mysql://192.168.3.110:3366/hospital?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://192.192.185.122:3306/wy1103?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
 spring.datasource.username=root
-spring.datasource.password=Suvalue2016
+spring.datasource.password=HEshi@2020
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.druid.initial-size=1
 
@@ -9,9 +10,9 @@ project.path=localhost
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA40\uFF09
 spring.redis.database=1
-spring.redis.host=192.168.18.166
-spring.redis.port=6379
-spring.redis.password=ll123456
+spring.redis.host=127.0.0.1
+spring.redis.port=7379
+spring.redis.password=123456
 spring.redis.jedis.pool.max-active=8
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.jedis.pool.max-wait=-1

hs-api/src/main/resources/application.properties

@@ -27,7 +27,7 @@ token.interface-check=true
 token.description=${token.url}'s${token.interface-check}
 
 # 单点登录完成后跳转到我们的首页地址
-indexUri=http://www.baidu.com/
+indexUri=http://192.192.216.107:8088/drgsHospital/dss/page/menu/homeJgb.html
 # 验证平台单点登录token的地址和登录地址
-sso.checkUri=
-sso.loginUri=http://yihang.work/wdzx/index.html
+sso.checkUri=http://192.192.192.97:8001/api/tokenapi/GetUser
+sso.loginUri=http://192.192.192.97:8004/