101captain
2022-07-21 d0db16e58447905054eb5b7fdf28d495a9153247
bug修改
6个文件已修改
83 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -88,7 +88,7 @@
            unionid = "无";
        }
        userService.addOrUpdate(openid, sessionKey, unionid);
        return tokenService.loginApplets(openid);
        return tokenService.loginApplets(openid,this.getAppId());
    }
    @ApiOperation(value = "H5登录", response = LoginReturnVO.class)
@@ -128,7 +128,7 @@
        R r1 = userService.getUserInfoByUnionId(unionId);
        if (R.isOk(r1)) {
            LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
            return tokenService.loginApplets(loginUserInfoVO.getOpenid());
            return tokenService.loginApplets(loginUserInfoVO.getOpenid(),this.getAppId());
        }
        return r1;
    }
@@ -164,7 +164,7 @@
            unionid = "无";
        }
        userService.addOrUpdate(openid, sessionKey, unionid);
        return tokenService.loginApplets(openid);
        return tokenService.loginApplets(openid,this.getAppId());
    }
    @ApiOperation(value = "维护用户基本信息(昵称、性别、头像)")
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java
@@ -39,7 +39,7 @@
            return R.fail("账户密码不能为空");
        }
        log.info("登录用户信息【{}】", loginBody);
        return tokenService.loginAppletsBackStage(account, password);
        return tokenService.loginAppletsBackStage(account, password,this.getAppId());
    }
    @ApiOperation(value = "登出")
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -43,8 +43,8 @@
     */
    @OperLog(operModul = "小程序登录")
    @PostMapping("/loginApplets")
    public R loginApplets(@RequestParam("openId") String openId) {
        LoginReturnVO loginReturnVO = loginService.loginApplets(openId,this.getAppId());
    public R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginApplets(openId,appid);
        return R.ok(loginReturnVO);
    }
@@ -73,8 +73,8 @@
     */
    @OperLog(operModul = "运营后台登录")
    @PostMapping("/loginAppletsBackStage")
    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,this.getAppId());
    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -110,8 +110,8 @@
     */
    @OperLog(operModul = "社区后台登录")
    @PostMapping("/loginCommunityBackage")
    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,this.getAppId());
    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -162,8 +162,8 @@
     */
    @OperLog(operModul = "商家后台登录")
    @PostMapping("/loginShopBackStage")
    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,this.getAppId());
    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -178,8 +178,8 @@
     */
    @OperLog(operModul = "网格综治app登录")
    @PostMapping("/loginGridApp")
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,this.getAppId());
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -194,8 +194,8 @@
     */
    @OperLog(operModul = "网格综治后台登录")
    @PostMapping("/loginGridBackstage")
    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,this.getAppId());
    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -207,8 +207,8 @@
     */
    @OperLog(operModul = "城管后台登录")
    @PostMapping("/loginCgBackage")
    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,this.getAppId());
    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -220,8 +220,8 @@
     */
    @OperLog(operModul = "一键报警APP登录 ")
    @PostMapping("/loginAlarmApp")
    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,this.getAppId());
    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -236,8 +236,8 @@
     */
    @OperLog(operModul = "便民服务商家后台登录 ")
    @PostMapping("/loginMerchantBackStage")
    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,this.getAppId());
    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -249,8 +249,8 @@
     */
    @OperLog(operModul = "西区大屏登录")
    @PostMapping("/loginXQDP")
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,this.getAppId());
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -265,8 +265,8 @@
     */
    @PostMapping("/loginMcsUser")
    @OperLog(operModul = "微商业街用户登录")
    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,this.getAppId());
    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,appid);
        return R.ok(loginReturnVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -22,7 +22,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginApplets")
    R loginApplets(@RequestParam("openId") String openId);
    R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid);
    /**
     * 用户登出
@@ -44,7 +44,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginCommunityBackage")
    R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 小程序后台登录
@@ -56,7 +56,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginAppletsBackStage")
    R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 认证中心刷新token
@@ -78,7 +78,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginShopBackStage")
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 网格综治APP登录
@@ -90,7 +90,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginGridApp")
    R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 网格综治后台登录
@@ -102,7 +102,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginGridBackstage")
    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 城管后台登录
@@ -111,7 +111,7 @@
     * @return  登录结果
     */
    @PostMapping("/loginCgBackage")
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 一键报警APP登录
@@ -120,7 +120,7 @@
     * @return  登录结果
     */
    @PostMapping("/loginAlarmApp")
    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 便民服务商家后台登录
@@ -132,7 +132,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginMerchantBackStage")
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 西区大屏登录
@@ -141,7 +141,7 @@
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 微商业街用户登录
@@ -153,5 +153,5 @@
     * @return 登录结果
     */
    @PostMapping("/loginMcsUser")
    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -43,7 +43,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginCommunityBackage(account, password);
        R r = tokenService.loginCommunityBackage(account, password,this.getAppId());
        return r;
    }
    @ApiOperation(value = "社区平台验证密码", response = LoginReturnVO.class)
@@ -93,7 +93,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginCgBackage(account, password);
        R r = tokenService.loginCgBackage(account, password,this.getAppId());
        return r;
    }
    @ApiOperation(value = "一键报警APP登录",response = LoginReturnsVO.class)
@@ -106,7 +106,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginAlarmApp(account, password);
        R r = tokenService.loginAlarmApp(account, password,this.getAppId());
        return r;
    }
@@ -120,7 +120,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password);
        R r = tokenService.loginXQDP(account, password,this.getAppId());
        return r;
    }
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -101,6 +101,7 @@
        // boolean infodynamic = !requestURI.contains("partybuilding/infodynamic");
        SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request);
        safeboxRequestWrapper.addHeader("appid",request.getHeader("appid"));
        if (login || doc || css || js || ui || swagger || ico || docs || error || refreshToken || useragreement || wxPay
        // ||wxCgi||isShop||listadvertisement||noToken||bigscreen) {
            || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha||uuPush) {