Compare commits
No commits in common. "3ab17680b0988c32ffab3278ffe2bdfc56c03a73" and "d8c470b9f87c4a192e3a59e2341386b16fec27d6" have entirely different histories.
3ab17680b0
...
d8c470b9f8
@ -17,8 +17,6 @@ import com.czlis.system.service.ISysDeptService;
|
|||||||
import com.czlis.system.service.ISysPostService;
|
import com.czlis.system.service.ISysPostService;
|
||||||
import com.czlis.system.service.ISysRoleService;
|
import com.czlis.system.service.ISysRoleService;
|
||||||
import com.czlis.system.service.ISysUserService;
|
import com.czlis.system.service.ISysUserService;
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
@ -36,7 +34,6 @@ import java.util.stream.Collectors;
|
|||||||
* @author admin
|
* @author admin
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@Api(tags = "用户信息")
|
|
||||||
@RequestMapping("/system/user")
|
@RequestMapping("/system/user")
|
||||||
public class SysUserController extends BaseController {
|
public class SysUserController extends BaseController {
|
||||||
@Autowired
|
@Autowired
|
||||||
@ -231,7 +228,6 @@ public class SysUserController extends BaseController {
|
|||||||
* 同步用户数据
|
* 同步用户数据
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ApiOperation("同步用户数据")
|
|
||||||
@GetMapping("/syncUser")
|
@GetMapping("/syncUser")
|
||||||
public Result syncUser(){
|
public Result syncUser(){
|
||||||
return userService.syncUser();
|
return userService.syncUser();
|
||||||
|
|||||||
@ -239,20 +239,13 @@ public class SysLoginService {
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public String loginAnonymous(String username, String password, String code, String uuid) {
|
public String loginAnonymous(String username, String password, String code, String uuid) {
|
||||||
if(username == null || username.equals("")) throw new UserNotExistsException();
|
|
||||||
LoginUser loginUser = new LoginUser();
|
LoginUser loginUser = new LoginUser();
|
||||||
int random = new Random().nextInt(1000);
|
int random = new Random().nextInt(1000);
|
||||||
loginUser.setUserId((long) (random+8000)); //先用随机数代替
|
loginUser.setUserId((long) (random+8000)); //先用随机数代替
|
||||||
SysUser sysUser = userMapper.selectUserByUserName(username);
|
SysUser sysUser = userMapper.selectUserByUserName(username);
|
||||||
if (sysUser == null) {
|
if (sysUser == null) {
|
||||||
sysUser = new SysUser();
|
sysUser = new SysUser();
|
||||||
long userId = 0L;
|
sysUser.setUserId(Long.parseLong(username));
|
||||||
try{
|
|
||||||
userId = Long.parseLong(username);
|
|
||||||
}catch (Exception e){
|
|
||||||
userId = random;
|
|
||||||
}
|
|
||||||
sysUser.setUserId(userId);
|
|
||||||
sysUser.setUserName(username);
|
sysUser.setUserName(username);
|
||||||
String loginUserName = commonUtil.getComDictNameById("SRD", username);
|
String loginUserName = commonUtil.getComDictNameById("SRD", username);
|
||||||
sysUser.setNickName(loginUserName);
|
sysUser.setNickName(loginUserName);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user