bug修改

101captain

2022-08-15 dbc87af4e7d12465c04ab505fd0bbccac1a53574

bug修改

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

@@ -282,8 +282,8 @@
     * @return 登录结果
     */
    @PostMapping("/loginBatteryUser")
    public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password);
    public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password,appid);
        return R.ok(loginReturnVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -155,5 +156,5 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnVO loginBatteryUser(String account, String password);
    LoginReturnVO loginBatteryUser(String account, String password,String appid);
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -21,6 +21,7 @@
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.JWTTokenUtil;
import org.springframework.web.bind.annotation.RequestParam;

import static java.util.Objects.nonNull;

@@ -323,8 +324,8 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginBatteryUser(String account, String password) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20", password));
    public LoginReturnVO loginBatteryUser(String account, String password,String appid) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java

@@ -175,5 +175,5 @@
     * @return 登录结果
     */
    @PostMapping("/loginBatteryUser")
    R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginBatteryUser(@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

@@ -134,7 +134,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginBatteryUser(account, password);
        R r = tokenService.loginBatteryUser(account, password,this.getAppId());
        return r;
    }