blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-01-06 e3dae73ced9ac1180a35e303c3fc3ee89ab477aa 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java


@@ -12,6 +12,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;


@@ -19,10 +20,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


@@ -58,8 +56,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);




@@ -67,7 +68,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());


@@ -79,4 +79,5 @@


        result.putInMap("token", token);


        return result;


    }




}