Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

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

@@ -5,11 +5,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.auth.model.dos.LoginBody;
import com.panzhihua.auth.service.LoginService;
@@ -43,8 +39,8 @@
     */
    @OperLog(operModul = "小程序登录")
    @PostMapping("/loginApplets")
    public R loginApplets(@RequestParam("openId") String openId) {
        LoginReturnVO loginReturnVO = loginService.loginApplets(openId);
    public R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginApplets(openId,appid);
        return R.ok(loginReturnVO);
    }

@@ -73,8 +69,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 +106,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 +158,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 +174,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 +190,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 +203,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 +216,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 +232,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 +245,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 +261,29 @@
     */
    @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);
    }

    @GetMapping("/tfLogin")
    public R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid){
        LoginReturnVO loginReturnVO=loginService.tfLogin(account,password,appid);
        return R.ok(loginReturnVO);
    }

    /**
     * 电动车商城后台用户登录
     *
     * @param account
     *            账户
     * @param password
     *            密码
     * @return 登录结果
     */
    @PostMapping("/loginBatteryUser")
    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);
    }
}