Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-09 52294233356f211750e6efb690cbb556985d018e

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -50,8 +50,8 @@

        SysUser user=null;
        //管理员登录
//        if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("yangxiao",account) )
//        {
        if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("ceshirenyuan",account) )
        {
            user= IUserService.getUserByAccount(account);

            if(user==null || !password.equals(user.getPassword()))
@@ -76,55 +76,55 @@
            map.put("userName", user.getUserName());

            return ResultData.success(map);
//        }
        }

//        HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
//        if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
//        {
//            //提示用户名或密码错误
//            return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
//        }
//
//        //本地表查询用户
//        user = IUserService.selectData(huaChengSysUser.getUserId()+"");
//        if (user == null) {
//            //本地没有此用户  新用户
//            SysUser newSysUser=new SysUser();
//            //默认  1系统后台用户
//            newSysUser.setUserType("1");
//            newSysUser.setPhonenumber(huaChengSysUser.getPhone());
//            newSysUser.setUserId(huaChengSysUser.getUserId());
//            newSysUser.setUserName(huaChengSysUser.getNickName());
//            newSysUser.setSex(huaChengSysUser.getSex());
//            newSysUser.setAvatar(huaChengSysUser.getImageUrl());
//            newSysUser.setCreateTime(LocalDateTime.now());
//            newSysUser.setUpdateTime(LocalDateTime.now());
//            IUserService.insertConfig(newSysUser);
//        }
//
//        user = IUserService.selectData(huaChengSysUser.getUserId()+"");
//
//        if (user == null) {
//            return ResultData.error("用户不存在！请联系管理员");
//        }
//
//        String token = tokenManager.getTokenByUserId(user.getUserId());
//        System.out.println("token "+token);
//        if (token == null) {
//            //生成一个token，保存用户登录状态
//            token = tokenManager.createToken(user.getUserId(), user.getUserId());
//        }
//
//        user.setLoginDate(LocalDateTime.now());
//        //更新登录时间
//        IUserService.updateConfig(user);
//
//        Map<String, Object> map = new HashMap<>();
//        map.put("token", token);
//        map.put("userId", user.getUserId());
//        map.put("userName", user.getUserName());
//
//        return ResultData.success(map);
        HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
        if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
        {
            //提示用户名或密码错误
            return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
        }

        //本地表查询用户
        user = IUserService.selectData(huaChengSysUser.getUserId()+"");
        if (user == null) {
            //本地没有此用户  新用户
            SysUser newSysUser=new SysUser();
            //默认  1系统后台用户
            newSysUser.setUserType("1");
            newSysUser.setPhonenumber(huaChengSysUser.getPhone());
            newSysUser.setUserId(huaChengSysUser.getUserId());
            newSysUser.setUserName(huaChengSysUser.getNickName());
            newSysUser.setSex(huaChengSysUser.getSex());
            newSysUser.setAvatar(huaChengSysUser.getImageUrl());
            newSysUser.setCreateTime(LocalDateTime.now());
            newSysUser.setUpdateTime(LocalDateTime.now());
            IUserService.insertConfig(newSysUser);
        }

        user = IUserService.selectData(huaChengSysUser.getUserId()+"");

        if (user == null) {
            return ResultData.error("用户不存在！请联系管理员");
        }

        String token = tokenManager.getTokenByUserId(user.getUserId());
        System.out.println("token "+token);
        if (token == null) {
            //生成一个token，保存用户登录状态
            token = tokenManager.createToken(user.getUserId(), user.getUserId());
        }

        user.setLoginDate(LocalDateTime.now());
        //更新登录时间
        IUserService.updateConfig(user);

        Map<String, Object> map = new HashMap<>();
        map.put("token", token);
        map.put("userId", user.getUserId());
        map.put("userName", user.getUserName());

        return ResultData.success(map);
    }

    @ApiOperation("发送登录短信验证码")