Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -55,6 +55,16 @@
        return R.ok(tokenService.createMiniToken(appMiniLoginVo));
    }

    @ApiOperation("商户端登录")
    @PostMapping("shopLogin")
    public R<?> shopLogin(@RequestBody AppMiniLoginDto appMiniLoginDto)
    {
        // 小程序用户登录
        AppMiniLoginVo appMiniLoginVo = sysLoginService.miniLogin(appMiniLoginDto);
        // 获取登录token
        return R.ok(tokenService.createMiniToken(appMiniLoginVo));
    }

    @DeleteMapping("logout")
    public R<?> logout(HttpServletRequest request)
    {