From 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 14:22:22 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java |   88 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
index f2aae2a..a0f7592 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -1,7 +1,7 @@
 package com.panzhihua.auth.service;
 
 import com.panzhihua.common.model.vos.LoginReturnVO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,7 +14,8 @@
     /**
      * 微信小程序登录
      *
-     * @param openId 微信标识
+     * @param openId
+     *            微信标识
      * @return jwt
      */
     LoginReturnVO loginApplets(String openId);
@@ -22,38 +23,103 @@
     /**
      * 小程序用户登出
      *
-     * @param token 登录用户token
+     * @param token
+     *            登录用户token
      */
     void logoutApplets(String token);
+
     /**
      * 小程序后台登录
-     * @param account 账户
-     * @param password 密码
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     LoginReturnVO loginAppletsBackStage(String account, String password);
+
     /**
      * 社区后台登录
-     * @param account 账户
-     * @param password 密码
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     LoginReturnVO loginCommunityBackage(String account, String password);
 
     /**
      * 商家后台登录
-     * @param account 账户
-     * @param password 密码
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     LoginReturnVO loginShopBackStage(String account, String password);
+
     /**
      * 大数据统计平台(区、街道、社区三层登陆接口)
-     * @param account 账户
-     * @param password 密码
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @author manailin
      * @return 登录结果
      * @date 2021-5-13 10:56
      */
     LoginReturnVO loginBigDataBackStage(String account, String password);
+
+    /**
+     * 网格综治APP登录
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    LoginReturnsVO loginGridApp(String account, String password);
+
+    /**
+     * 网格综治后台登录
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    LoginReturnVO loginGridBackstage(String account, String password);
+
+    /**
+     * 城管后台登录
+     * @param account   账号
+     * @param password  密码
+     * @return  登录结果
+     */
+    LoginReturnVO loginCgBackage(String account, String password);
+
+    /**
+     * 一键报警APP登录
+     *
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    LoginReturnsVO loginAlarmApp(String account, String password);
+
+    /**
+     * 便民服务商家后台登录
+     * @param account 账户
+     * @param password 密码
+     * @return 登录结果
+     */
+    LoginReturnVO loginMerchantBackStage(String account, String password);
 }

--
Gitblit v1.7.1