Просмотр исходного кода

[登录][修改]:登录修改

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
7bb44f67ae
6 измененных файлов: 10 добавлений и 42 удалений
  1. +5
    -2
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
  3. +1
    -1
      mallinkWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java
  4. +2
    -34
      mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java
  5. +1
    -1
      mallinkWechatOpen/src/main/resources/application-dev.yml
  6. +1
    -1
      mallinkWechatOpen/src/main/resources/application.yml

+ 5
- 2
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Просмотреть файл

@@ -94,8 +94,6 @@ public class ShiroConfig {
//拦截器. //拦截器.
Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>(); Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();


//配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了
filterChainDefinitionMap.put("/logout", "anon");
//filterChainDefinitionMap.put("/ue/**", "anon"); //filterChainDefinitionMap.put("/ue/**", "anon");
//filterChainDefinitionMap.put("/config.json", "anon"); //filterChainDefinitionMap.put("/config.json", "anon");
// login // login
@@ -139,6 +137,11 @@ public class ShiroConfig {


filterChainDefinitionMap.put("/version", "anon"); filterChainDefinitionMap.put("/version", "anon");
// filterChainDefinitionMap.put("/role/**", "corsFilter,token"); // filterChainDefinitionMap.put("/role/**", "corsFilter,token");


//配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了
filterChainDefinitionMap.put("/logout", "authc");

filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon"); // filterChainDefinitionMap.put("/**", "anon");




+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java Просмотреть файл

@@ -58,9 +58,6 @@ public class HomeController extends BaseController {
@Autowired @Autowired
private MallUserRoleService mallUserRoleService; private MallUserRoleService mallUserRoleService;


@Autowired
private MallRolePermissionService mallRolePermissionService;

@Autowired @Autowired
private WxAppinfoService appinfoService; private WxAppinfoService appinfoService;




+ 1
- 1
mallinkWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java Просмотреть файл

@@ -263,7 +263,7 @@ public class ShiroConfig {


@Bean @Bean
public SimpleCookie simpleCookie() { public SimpleCookie simpleCookie() {
SimpleCookie simpleCookie = new SimpleCookie("SSIDS");
SimpleCookie simpleCookie = new SimpleCookie("SSID");
simpleCookie.setDomain(""); simpleCookie.setDomain("");
return simpleCookie; return simpleCookie;
} }


+ 2
- 34
mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java Просмотреть файл

@@ -1,16 +1,11 @@
package com.iformall.controller; package com.iformall.controller;


import com.github.pagehelper.PageInfo;
import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.Producer;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.MallRolePermission;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.MallUserRole;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.MallRolePermissionService;
import com.iformall.service.MallUserInfoService;
import com.iformall.service.MallUserRoleService; import com.iformall.service.MallUserRoleService;
import com.iformall.shiro.UserSession; import com.iformall.shiro.UserSession;
import com.iformall.utils.ShiroUtils; import com.iformall.utils.ShiroUtils;
@@ -49,15 +44,9 @@ public class HomeController extends BaseController {
@Autowired @Autowired
private Producer producer; private Producer producer;


@Autowired
private MallUserInfoService mallUserInfoService;

@Autowired @Autowired
private MallUserRoleService mallUserRoleService; private MallUserRoleService mallUserRoleService;


@Autowired
private MallRolePermissionService mallRolePermissionService;



@GetMapping("/captcha.jpg") @GetMapping("/captcha.jpg")
public void captcha(HttpServletResponse response)throws ServletException, IOException { public void captcha(HttpServletResponse response)throws ServletException, IOException {
@@ -81,6 +70,7 @@ public class HomeController extends BaseController {
@PostMapping("/doLogin") @PostMapping("/doLogin")
public ResultData login(@RequestBody MallUserInfo user) { public ResultData login(@RequestBody MallUserInfo user) {
logger.debug("[" + getIpAddr() + "] HomeController::login"); logger.debug("[" + getIpAddr() + "] HomeController::login");

try { try {
String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){
@@ -111,7 +101,7 @@ public class HomeController extends BaseController {
MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
info.setPassword("保密"); info.setPassword("保密");
// System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId());
String menus = getPermissionsByRole(info);
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) { if(menus != null) {
info.setMenus(menus); info.setMenus(menus);
} }
@@ -122,28 +112,6 @@ public class HomeController extends BaseController {
return data; return data;
} }


private String getPermissionsByRole(MallUserInfo info) {
MallUserRole ur = new MallUserRole();
ur.setUid(info.getId());
PageInfo<MallUserRole> page = mallUserRoleService.listAsPage(ur, 1, 1);
if (page.getSize() > 0) {
Long roleId = page.getList().get(0).getRoleId();
MallRolePermission p = new MallRolePermission();
p.setRoleId(roleId);
p.setTenantId(info.getTenantId());
PageInfo<MallRolePermission> listAsPage = mallRolePermissionService.listAsPage(p, 1, 100);
String menus = "";
for (MallRolePermission rp : listAsPage.getList()) {
menus += rp.getPermissionId() + ",";
}
if (menus.length() > 0) {
menus = menus.substring(0, menus.length() - 1);
}
return menus;
}
return null;
}

@ApiOperation("登出") @ApiOperation("登出")
@GetMapping("/logout") @GetMapping("/logout")
public ResultData logout() { public ResultData logout() {


+ 1
- 1
mallinkWechatOpen/src/main/resources/application-dev.yml Просмотреть файл

@@ -30,7 +30,7 @@ spring:
password: ENC(aYJ3Wr2UWtkORRQjjrWWpz2ZeTISsHOA) password: ENC(aYJ3Wr2UWtkORRQjjrWWpz2ZeTISsHOA)
timeout: 3600 timeout: 3600
expire: 1800 #30分钟 expire: 1800 #30分钟
database: 1
database: 10
defaultExpiration: 2592000 # 默认生命周期30天 defaultExpiration: 2592000 # 默认生命周期30天
jedis: jedis:
pool: pool:


+ 1
- 1
mallinkWechatOpen/src/main/resources/application.yml Просмотреть файл

@@ -1,7 +1,7 @@
server: server:
port: 6060 port: 6060
servlet: servlet:
context-path: /O
context-path: /


spring: spring:
application: application:


Загрузка…
Отмена
Сохранить