blame | history | patch | commit | commitdiff | ignore whitespace
Helius
2020-12-28 064c765a04dacbede3674ac7a8a9a201037a47e5 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java


@@ -2,8 +2,10 @@




import com.alibaba.fastjson.JSONObject;


import com.matrix.component.redis.RedisClient;


import com.matrix.core.constance.MatrixConstance;


import com.matrix.core.pojo.AjaxResult;


import com.matrix.core.tools.UUIDUtil;


import com.matrix.core.tools.WebUtil;


import com.matrix.system.app.dto.LoginDto;


import com.matrix.system.app.vo.UserInfoVo;


import com.matrix.system.common.authority.DefaultAuthorityManager;


@@ -11,6 +13,7 @@


import com.matrix.system.common.authority.strategy.LoginStrategy;


import com.matrix.system.common.bean.SysUsers;


import com.matrix.system.common.service.SysUsersService;


import com.matrix.system.hive.bean.SysShopInfo;


import com.matrix.system.hive.service.SysShopInfoService;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


@@ -18,10 +21,7 @@


import io.swagger.annotations.ApiResponses;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




/**


 * @author wzy


@@ -57,8 +57,11 @@


        LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);


        user = authorityManager.login(apLogin);




        UserInfoVo userInfoVo = new UserInfoVo();


        if(user.getShopId()!=null){


            user.setShopName(sysShopInfoService.findById(user.getShopId()).getShopName());


            SysShopInfo shopInfo = sysShopInfoService.findById(user.getShopId());


            user.setShopName(shopInfo.getShopName());


            userInfoVo.setShopName(shopInfo.getShopShortName());


        }


        user.setSuPassword(null);




@@ -66,7 +69,6 @@


        redisClient.saveValueForever(token, JSONObject.toJSONString(user));


        redisClient.saveValueForever(user.getSuId().toString(), token);




        UserInfoVo userInfoVo = new UserInfoVo();


        userInfoVo.setId(user.getSuId());


        userInfoVo.setName(user.getSuName());


        userInfoVo.setRoleName(user.getRoleName());


@@ -77,4 +79,15 @@


        result.putInMap("token", token);


        return result;


    }




    @ApiOperation(value = "退出登陆", notes = "退出登陆")


    @GetMapping(value = "/loginOut")


    public AjaxResult loginOut() {


        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);


        String token = redisClient.getCachedValue(sysUsers.getSuId().toString());




        redisClient.removeObject(token);


        redisClient.removeObject(sysUsers.getSuId().toString());


        return AjaxResult.buildSuccessInstance("退出成功");


    }


}