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

yanghui

2022-10-10 23ea8ee10fac0ee12d6f2be822c8d6af4c13e330

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

@@ -50,34 +50,10 @@

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

            if(user==null || !password.equals(user.getPassword()))
        if(user==null)
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
            }
            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()))
        {
@@ -127,6 +103,33 @@

        return ResultData.success(map);
    }
        else
        {
            if(!password.equals(user.getPassword()))
            {
                //提示用户名或密码错误
                return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
            }
            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("发送登录短信验证码")
@@ -142,6 +145,18 @@
        return IUserService.loginByAccount(phonenumber,code);
    }


    @ApiOperation("通过手机号获取用户信息 登录")
    @PostMapping(value = "/loginPhionne")
    public ResultData loginPhionne(@RequestParam String phonenumber)
    {
        if(StringUtils.isEmpty(phonenumber))
        {
            return ResultData.error("请输入手机号");
        }
        return IUserService.loginByPhonenumber(phonenumber);
    }

    /**
     * 查询列表
     *