[功能]：1、添加http通用接口forest 2、引入justoauth 处理第三方登录 3、大致完成qq登录代码 4、前端界面修改适配第三方登录逻辑

springboot/.gitignore

@@ -24,6 +24,7 @@ target/
 *.iws
 *.iml
 *.ipr
+../.idea
 
 ### NetBeans ###
 nbproject/private/

springboot/pom.xml

@@ -33,6 +33,8 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <justAuth.version>1.16.5</justAuth.version>
+        <forest.version>1.5.19</forest.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -206,6 +208,20 @@
                 <version>${wumei.version}</version>
             </dependency>
 
+            <!-- 第三方登录模块-->
+            <dependency>
+                <groupId>me.zhyd.oauth</groupId>
+                <artifactId>JustAuth</artifactId>
+                <version>${justAuth.version}</version>
+            </dependency>
+
+            <!-- 通用http接口模块-->
+            <dependency>
+                <groupId>com.dtflys.forest</groupId>
+                <artifactId>forest-spring-boot-starter</artifactId>
+                <version>${forest.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

springboot/wumei-admin/src/main/resources/application-druid.yml

@@ -9,7 +9,7 @@ spring:
                 url: jdbc:mysql://localhost/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: wumei-smart
-#                password: 123456
+            #                password: 123456
             # 从库数据源
             slave:
               # 从数据源开关/默认关闭

springboot/wumei-admin/src/main/resources/application.yml

@@ -65,8 +65,8 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-#    password: wumei-smart
+    #    password: wumei-smart
-#    password: 123456
+    #    password: 123456
     # 连接超时时间
     timeout: 10s
     lettuce:

springboot/wumei-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java

@@ -86,4 +86,9 @@ public class HttpStatus
      * 接口未实现
      */
     public static final int NOT_IMPLEMENTED = 501;
+
+    /**
+     * 不弹窗显示
+     */
+    public static final int NO_MESSAGE_ALERT = 502;
 }

springboot/wumei-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -213,7 +213,7 @@ public class RedisCache
      * 删除Hash中的数据
      * 
      * @param key
-     * @param mapkey
+     * @param hkey
      */
     public void delCacheMapValue(final String key, final String hkey)
     {
@@ -243,4 +243,15 @@ public class RedisCache
     {
         return redisTemplate.keys(pattern);
     }
+
+    /**
+     * 是否存在key
+     *
+     * @param key 缓存key
+     * @return true：存在key ；false：key不存在或者已过期
+     */
+    public boolean containsKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
 }

springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -100,7 +100,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/iot/tool/register","/iot/tool/ntp","/iot/tool/download",
-                        "/iot/tool/mqtt/auth","/iot/tool/mqtt/webhook").anonymous()
+                        "/iot/tool/mqtt/auth","/iot/tool/mqtt/webhook","/auth/**/**").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

springboot/wumei-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -6,6 +6,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -47,6 +48,9 @@ public class SysLoginService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private UserDetailsServiceImpl userDetailsServiceImpl;
+
     /**
      * 登录验证
      * 
@@ -64,6 +68,16 @@ public class SysLoginService
         {
             validateCaptcha(username, code, uuid);
         }
+        return socialLogin(username,password);
+    }
+
+    /**
+     * 第三方验证后，调用登录方法
+     * @param username 用户名
+     * @param password 密码
+     * @return token
+     */
+    public String socialLogin(String username, String password){
         // 用户验证
         Authentication authentication = null;
         try
@@ -92,6 +106,25 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
+    /**
+     * 跳转登录认证接口
+     * @param username
+     * @param encodePwd
+     * @return
+     */
+    public String redirectLogin(String username,String encodePwd){
+        UserDetails userDetails=userDetailsServiceImpl.loadUserByUsername(username);
+        if(!userDetails.getPassword().equals(encodePwd)){
+            throw new UserPasswordNotMatchException();
+        }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = (LoginUser) userDetails;
+        recordLoginInfo(loginUser.getUserId());
+        // 生成token
+        return tokenService.createToken(loginUser);
+
+    }
+
     /**
      * 校验验证码
      * 

springboot/wumei-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -26,8 +27,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
  * @author ruoyi
  */
 @Component
-public class TokenService
+public class TokenService {
-{
     // 令牌自定义标识
     @Value("${token.header}")
     private String header;
@@ -54,23 +54,27 @@ public class TokenService
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(HttpServletRequest request)
+    public LoginUser getLoginUser(HttpServletRequest request) {
-    {
         // 获取请求携带的令牌
         String token = getToken(request);
-        if (StringUtils.isNotEmpty(token))
+        return getLoginUserByToken(token);
-        {
+    }
-            try
+
-            {
+    /**
+     * 获取用户身份信息
+     *
+     * @return 用户信息
+     */
+    public LoginUser getLoginUserByToken(String token) {
+        if (StringUtils.isNotEmpty(token)) {
+            try {
                 Claims claims = parseToken(token);
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
                 LoginUser user = redisCache.getCacheObject(userKey);
                 return user;
-            }
+            } catch (Exception e) {
-            catch (Exception e)
-            {
             }
         }
         return null;
@@ -79,10 +83,8 @@ public class TokenService
     /**
      * 设置用户身份信息
      */
-    public void setLoginUser(LoginUser loginUser)
+    public void setLoginUser(LoginUser loginUser) {
-    {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
-        {
             refreshToken(loginUser);
         }
     }
@@ -90,10 +92,8 @@ public class TokenService
     /**
      * 删除用户身份信息
      */
-    public void delLoginUser(String token)
+    public void delLoginUser(String token) {
-    {
+        if (StringUtils.isNotEmpty(token)) {
-        if (StringUtils.isNotEmpty(token))
-        {
             String userKey = getTokenKey(token);
             redisCache.deleteObject(userKey);
         }
@@ -105,8 +105,7 @@ public class TokenService
      * @param loginUser 用户信息
      * @return 令牌
      */
-    public String createToken(LoginUser loginUser)
+    public String createToken(LoginUser loginUser) {
-    {
         String token = IdUtils.fastUUID();
         loginUser.setToken(token);
         setUserAgent(loginUser);
@@ -123,12 +122,10 @@ public class TokenService
      * @param loginUser
      * @return 令牌
      */
-    public void verifyToken(LoginUser loginUser)
+    public void verifyToken(LoginUser loginUser) {
-    {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
-        {
             refreshToken(loginUser);
         }
     }
@@ -138,8 +135,7 @@ public class TokenService
      *
      * @param loginUser 登录信息
      */
-    public void refreshToken(LoginUser loginUser)
+    public void refreshToken(LoginUser loginUser) {
-    {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
@@ -152,8 +148,7 @@ public class TokenService
      *
      * @param loginUser 登录信息
      */
-    public void setUserAgent(LoginUser loginUser)
+    public void setUserAgent(LoginUser loginUser) {
-    {
         UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
         String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
         loginUser.setIpaddr(ip);
@@ -168,8 +163,7 @@ public class TokenService
      * @param claims 数据声明
      * @return 令牌
      */
-    private String createToken(Map<String, Object> claims)
+    private String createToken(Map<String, Object> claims) {
-    {
         String token = Jwts.builder()
                 .setClaims(claims)
                 .signWith(SignatureAlgorithm.HS512, secret).compact();
@@ -182,8 +176,7 @@ public class TokenService
      * @param token 令牌
      * @return 数据声明
      */
-    private Claims parseToken(String token)
+    private Claims parseToken(String token) {
-    {
         return Jwts.parser()
                 .setSigningKey(secret)
                 .parseClaimsJws(token)
@@ -196,8 +189,7 @@ public class TokenService
      * @param token 令牌
      * @return 用户名
      */
-    public String getUsernameFromToken(String token)
+    public String getUsernameFromToken(String token) {
-    {
         Claims claims = parseToken(token);
         return claims.getSubject();
     }
@@ -208,18 +200,15 @@ public class TokenService
      * @param request
      * @return token
      */
-    private String getToken(HttpServletRequest request)
+    private String getToken(HttpServletRequest request) {
-    {
         String token = request.getHeader(header);
-        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
+        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
-        {
             token = token.replace(Constants.TOKEN_PREFIX, "");
         }
         return token;
     }
 
-    private String getTokenKey(String uuid)
+    private String getTokenKey(String uuid) {
-    {
         return Constants.LOGIN_TOKEN_KEY + uuid;
     }
 }

springboot/wumei-iot/pom.xml

@@ -74,6 +74,19 @@
             <version>3.8.0</version>
         </dependency>
 
+        <!--第三方登录通用接口-->
+        <dependency>
+            <groupId>me.zhyd.oauth</groupId>
+            <artifactId>JustAuth</artifactId>
+            <!--            <version>1.16.5</version>-->
+        </dependency>
+
+        <!--通用http接口-->
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>forest-spring-boot-starter</artifactId>
+        </dependency>
+
 
     </dependencies>
 

vue/src/api/login.js

@@ -57,3 +57,58 @@ export function getCodeImg() {
     timeout: 20000
   })
 }
+
+//查看是否存在bindId
+export function checkBindId(bindId) {
+  return request({
+    url: '/auth/checkBindId/' + bindId,
+    method: 'get',
+  })
+}
+
+//查看是否存在errorId
+export function getErrorMsg(errorId) {
+  return request({
+    url: '/auth/getErrorMsg/' + errorId,
+    method: 'get',
+  })
+}
+
+// 登录方法
+export function bindLogin(username, password, code, uuid, bindId) {
+  const data = {
+    username,
+    password,
+    code,
+    uuid,
+    bindId
+  }
+  return request({
+    url: '/auth/bind/login',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 注册方法
+export function bindRegister(data) {
+  return request({
+    url: '/auth/bind/register',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+//跳转登录
+export function redirectLogin(loginId) {
+  return request({
+    url: '/auth/login/' + loginId,
+    method: 'get',
+  })
+}

vue/src/store/modules/user.js

@@ -1,5 +1,5 @@
-import { login, logout, getInfo } from '@/api/login'
+import {bindLogin, getInfo, login, logout, redirectLogin} from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import {getToken, removeToken, setToken} from '@/utils/auth'
 
 const user = {
   state: {
@@ -30,12 +30,14 @@ const user = {
 
   actions: {
     // 登录
-    Login({ commit }, userInfo) {
+    Login({commit}, userInfo) {
       const username = userInfo.username.trim()
       const password = userInfo.password
       const code = userInfo.code
       const uuid = userInfo.uuid
+      const bindId = userInfo.bindId;
       return new Promise((resolve, reject) => {
+        if (bindId === undefined || bindId === "") {
           login(username, password, code, uuid).then(res => {
             setToken(res.token)
             commit('SET_TOKEN', res.token)
@@ -43,11 +45,32 @@ const user = {
           }).catch(error => {
             reject(error)
           })
+        } else {
+          bindLogin(username, password, code, uuid, bindId).then(res => {
+            setToken(res.token)
+            commit('SET_TOKEN', res.token)
+            resolve()
+          }).catch(error => {
+            reject(error)
+          })
+        }
+      })
+    },
+
+    RedirectLogin({commit}, loginId) {
+      return new Promise((resolve, reject) => {
+        redirectLogin(loginId).then(res => {
+          setToken(res.token)
+          commit('SET_TOKEN', res.token)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
       })
     },
 
     // 获取用户信息
-    GetInfo({ commit, state }) {
+    GetInfo({commit, state}) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
@@ -68,7 +91,7 @@ const user = {
     },
 
     // 退出系统
-    LogOut({ commit, state }) {
+    LogOut({commit, state}) {
       return new Promise((resolve, reject) => {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
@@ -83,7 +106,7 @@ const user = {
     },
 
     // 前端 登出
-    FedLogOut({ commit }) {
+    FedLogOut({commit}) {
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         removeToken()

vue/src/utils/request.js

@@ -1,10 +1,10 @@
 import axios from 'axios'
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import {Loading, Message, MessageBox, Notification} from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
+import {blobValidate, tansParams} from "@/utils/ruoyi";
-import { saveAs } from 'file-saver'
+import {saveAs} from 'file-saver'
 
 let downloadLoadingInstance;
 
@@ -65,6 +65,8 @@ service.interceptors.response.use(res => {
         type: 'error'
       })
       return Promise.reject(new Error(msg))
+    } else if (code === 502) {
+      return Promise.reject('error')
     } else if (code !== 200) {
       Notification.error({
         title: msg

vue/src/views/login.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="login">
+  <div class="login">
 
     <div style="width:520px;padding:20px;">
       <el-row :gutter="10">
@@ -11,51 +11,66 @@
         </el-col>
         <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
           <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" style="z-index:1000">
-                    <h3 class="title">账号登录
+            <h3 class="title" v-if="!bindAccount">账号登录
               <span style="font-size:16px;color:#eee">（ 演示账号：wumei<span style="margin:0 10px;">123456 ）</span></span>
             </h3>
+            <h3 class="bindAccountTitle" v-else>绑定物美智能账户
+            </h3>
             <el-form-item prop="username">
               <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
-                            <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
               </el-input>
             </el-form-item>
             <el-form-item prop="password">
-                        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+              <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
-                            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                        @keyup.enter.native="handleLogin">
+                <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
               </el-input>
             </el-form-item>
             <el-form-item prop="code" v-if="captchaOnOff">
-                        <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleLogin">
+              <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-                            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                        @keyup.enter.native="handleLogin">
+                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
               </el-input>
               <div class="login-code">
-                            <img :src="codeUrl" @click="getCode" class="login-code-img" />
+                <img :src="codeUrl" @click="getCode" class="login-code-img"/>
               </div>
             </el-form-item>
             <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;color:#000;">记住密码</el-checkbox>
             <el-form-item style="width:100%;">
-                        <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
+              <el-button v-if="!bindAccount" :loading="loading" size="medium" type="primary" style="width:100%;"
+                         @click.native.prevent="handleLogin">
                 <span v-if="!loading">登 录</span>
                 <span v-else>登 录 中...</span>
               </el-button>
-                        <div style="margin-top:10px;">
+              <el-button v-else :loading="loading" size="medium" type="primary" style="width:100%;"
-                            <span style="color:#fff;margin-right:10px;">第三方登录</span>
+                         @click.native.prevent="handleLogin">
+                <span v-if="!loading">绑定</span>
+                <span v-else>绑 定 中...</span>
+              </el-button>
+              <div style="margin-top:20px;" v-if="!bindAccount">
+                <div v-if="!bindAccount" style=";text-align: center ">
 
                   <el-button type="success" circle title="微信登录" size="small" @click="authLogin">
-                                <svg-icon icon-class="wechat" />
+                    <svg-icon icon-class="wechat"/>
                   </el-button>
 
-                            <el-button type="danger" circle title="QQ登录" size="small" @click="authLogin">
+                  <el-button type="danger" circle title="QQ登录" size="small" @click="qqLogin">
-                                <svg-icon icon-class="qq" />
+                    <svg-icon icon-class="qq"/>
                   </el-button>
                   <el-button type="primary" circle title="支付宝登录" size="small" @click="authLogin">
                     <svg-icon icon-class="zhifubao"/>
                   </el-button>
+
                 </div>
+              </div>
+              <a style="margin-right:20px;color:#222" target="_blank" href="http://wumei.live">返回官网</a>
+
               <div style="float: right;margin-top:10px;" v-if="register">
 
-                            <a style="margin-right:20px;color:#222" target="_blank" href="http://wumei.live">返回官网</a>
+                <router-link style="color:#fff;font-size:16px;" :to='{path:"/register",query: this.$route.query }'>立即注册
-                            <router-link style="color:#fff;font-size:16px;" :to="'/register'">立即注册 >></router-link>
+                  >>
+                </router-link>
               </div>
             </el-form-item>
           </el-form>
@@ -64,14 +79,17 @@
     </div>
     <!--  底部  -->
     <div class="el-login-footer">
-        <span>Copyright © 2018-2021 <a target="_blank" href="http://wumei.live">wumei smart</a> All Rights Reserved.</span>
+      <span>Copyright © 2018-2021 <a target="_blank"
+                                     href="http://wumei.live">wumei smart</a> All Rights Reserved.</span>
+    </div>
   </div>
-</div>
 </template>
 
 <script>
 import {
-    getCodeImg
+  getCodeImg,
+  checkBindId,
+  getErrorMsg
 } from "@/api/login";
 import Cookies from "js-cookie";
 import {
@@ -89,7 +107,8 @@ export default {
         password: "",
         rememberMe: false,
         code: "",
-                uuid: ""
+        uuid: "",
+        bindId: ""
       },
       loginRules: {
         username: [{
@@ -111,6 +130,7 @@ export default {
       loading: false,
       // 验证码开关
       captchaOnOff: true,
+      bindAccount: false,
       // 注册开关
       register: true,
       redirect: undefined
@@ -125,10 +145,67 @@ export default {
     }
   },
   created() {
+    let loginId = this.$route.query.loginId;
+    if (loginId === undefined || loginId === null) {
+      this.checkBind();
+      this.checkErrorMsg();
       this.getCode();
       this.getCookie();
+    } else {
+      this.redirectLogin(loginId);
+    }
+
+
   },
   methods: {
+    redirectLogin(loginId) {
+      this.loading = true;
+      this.$store.dispatch("RedirectLogin", loginId).then(() => {
+        this.$router.push({
+          path: this.redirect || "/"
+        }).catch(() => {
+        });
+      }).catch(() => {
+        this.loading = false;
+        if (this.captchaOnOff) {
+          this.getCode();
+        }
+        this.$router.push({
+          query: {}
+        })
+      });
+    },
+    checkBind() {
+      let query = this.$route.query;
+      let bindId = query.bindId;
+      if (bindId === undefined || bindId === null) {
+        this.bindAccount = false;
+      } else {
+        this.bindAccount = true;
+        checkBindId(bindId).then(res => {
+          this.bindAccount = res.bindAccount === undefined ? true : res.bindAccount
+          if (this.bindAccount) {
+            this.loginForm.bindId = bindId;
+          } else {
+            this.loginForm.bindId = "";
+            this.$router.push({
+              query: {}
+            })
+          }
+        })
+      }
+    },
+    checkErrorMsg() {
+      let errorId = this.$route.query.errorId;
+      if (errorId !== undefined && errorId !== null) {
+        getErrorMsg(errorId).then(res => {
+        }).catch(err => {
+          this.$router.push({
+            query: {}
+          })
+        })
+      }
+    },
     getCode() {
       getCodeImg().then(res => {
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
@@ -148,29 +225,20 @@ export default {
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       };
     },
-        weixinLogin() {
+    qqLogin() {
-            this.$alert('微信登录正在集成中...', '提示消息', {
+      window.location.href = "http://localhost:8080/auth/render/qq";
+    },
+    authLogin() {
+      this.$alert('第三方登录正在集成中...', '提示消息', {
         confirmButtonText: '确定',
         callback: action => {
           this.$message({
             type: 'info',
-                        message: `action: ${ action }`
+            message: `action: ${action}`
           });
         }
       });
     },
-        authLogin() {
-            
-            this.$alert('第三方登录正在集成中...', '提示消息', {
-                confirmButtonText: '确定',
-                callback: action => {
-                    // this.$message({
-                    //     type: 'info',
-                    //     message: `action: ${ action }`
-                    // });
-                }
-            });
-        },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
@@ -190,10 +258,12 @@ export default {
             Cookies.remove("password");
             Cookies.remove('rememberMe');
           }
+          console.log(this.loginForm)
           this.$store.dispatch("Login", this.loginForm).then(() => {
             this.$router.push({
               path: this.redirect || "/"
-                        }).catch(() => {});
+            }).catch(() => {
+            });
           }).catch(() => {
             this.loading = false;
             if (this.captchaOnOff) {
@@ -202,7 +272,7 @@ export default {
           });
         }
       });
-        }
+    },
   }
 };
 </script>
@@ -223,6 +293,13 @@ export default {
   font-size: 24px;
 }
 
+.bindAccountTitle {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #333;
+  font-size: 24px;
+}
+
 .login-top {
   color: #fff;
   text-align: center;

vue/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
-<div class="register">
+  <div class="register">
 
-<div style="width:520px;padding:20px;">
+    <div style="width:520px;padding:20px;">
       <el-row :gutter="10">
         <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
           <div class="login-top">
@@ -10,61 +10,96 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-            <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form" style="z-index:1000">
+          <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"
-                <h3 class="title">注册账号</h3>
+                   style="z-index:1000">
+            <h3 class="title" v-if="!bindAccount">注册账号</h3>
+            <h3 class="title" v-else>注册绑定物美智能账户</h3>
             <el-form-item prop="username">
               <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
-                        <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
               </el-input>
             </el-form-item>
             <el-form-item prop="phonenumber">
               <el-input v-model="registerForm.phonenumber" type="text" auto-complete="off" placeholder="手机号码">
-                        <svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon" />
+                <svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon"/>
               </el-input>
             </el-form-item>
             <el-form-item prop="password">
-                    <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleRegister">
+              <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码"
-                        <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                        @keyup.enter.native="handleRegister">
+                <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
               </el-input>
             </el-form-item>
             <el-form-item prop="confirmPassword">
-                    <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码" @keyup.enter.native="handleRegister">
+              <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码"
-                        <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                        @keyup.enter.native="handleRegister">
+                <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
               </el-input>
             </el-form-item>
             <el-form-item prop="code" v-if="captchaOnOff">
-                    <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleRegister">
+              <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-                        <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                        @keyup.enter.native="handleRegister">
+                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
               </el-input>
               <div class="register-code">
-                        <img :src="codeUrl" @click="getCode" class="register-code-img" />
+                <img :src="codeUrl" @click="getCode" class="register-code-img"/>
               </div>
             </el-form-item>
             <el-form-item style="width:100%;">
-                    <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleRegister">
+              <el-button v-if="!bindAccount" :loading="loading" size="medium" type="primary" style="width:100%;"
+                         @click.native.prevent="handleRegister">
                 <span v-if="!loading">注 册</span>
                 <span v-else>注 册 中...</span>
               </el-button>
-                    <div style="float: right;margin-top:10px;">
+              <el-button v-else :loading="loading" size="medium" type="primary" style="width:100%;"
+                         @click.native.prevent="handleRegister">
+                <span v-if="!loading">绑 定</span>
+                <span v-else>绑 定 中...</span>
+              </el-button>
+              <div style="margin-top:20px;">
+
+                <div v-if="!bindAccount" style=" margin-bottom: 10px;text-align: center ">
+                  <!--                        <span style="color:#fff;margin-right:10px; float: left">快速登录</span>-->
+
+                  <el-button type="success" circle title="微信登录" size="small" @click="authLogin">
+                    <svg-icon icon-class="wechat"/>
+                  </el-button>
+
+                  <el-button type="danger" circle title="QQ登录" size="small" @click="qqLogin">
+                    <svg-icon icon-class="qq"/>
+                  </el-button>
+                  <el-button type="primary" circle title="支付宝登录" size="small" @click="authLogin">
+                    <svg-icon icon-class="zhifubao"/>
+                  </el-button>
+
+
+                </div>
+                <router-link style="float:left;color:#fff;font-size:16px;"
+                             :to='{path:"/login",query: this.$route.query }'>使用已有账户登录 >>
+                </router-link>
+
+                <div style="float: right">
                   <a style="margin-right:20px;" target="_blank" href="http://wumei.live">返回官网</a>
-                        <router-link style="color:#fff;font-size:16px;" :to="'/login'">使用已有账户登录 >> </router-link>
+                </div>
+
               </div>
             </el-form-item>
           </el-form>
         </el-col>
 
       </el-row>
-</div>
+    </div>
     <!--  底部  -->
     <div class="el-register-footer">
-         <span>Copyright © 2018-2021 <a target="_blank" href="http://wumei.live">wumei smart</a> All Rights Reserved.</span>
+      <span>Copyright © 2018-2021 <a target="_blank"
+                                     href="http://wumei.live">wumei smart</a> All Rights Reserved.</span>
+    </div>
   </div>
-</div>
 </template>
 
 <script>
 import {
-    getCodeImg
+  getCodeImg, checkBindId, bindRegister
 } from "@/api/login";
 import {
   register
@@ -88,7 +123,8 @@ export default {
         password: "",
         confirmPassword: "",
         code: "",
-                uuid: ""
+        uuid: "",
+        bindId: ""
       },
       registerRules: {
         username: [{
@@ -145,13 +181,36 @@ export default {
         }]
       },
       loading: false,
-            captchaOnOff: true
+      captchaOnOff: true,
+      bindAccount: false
     };
   },
   created() {
+    this.checkBind();
     this.getCode();
   },
   methods: {
+    checkBind() {
+      let query = this.$route.query;
+      let bindId = query.bindId;
+      if (bindId === undefined || bindId === null) {
+        this.bindAccount = false;
+      } else {
+        this.bindAccount = true;
+        checkBindId(bindId).then(res => {
+          this.bindAccount = res.bindAccount === undefined ? true : res.bindAccount
+          if (this.bindAccount) {
+            this.registerForm.bindId = bindId;
+          } else {
+            this.registerForm.bindId = "";
+            this.$router.push({
+              query: {}
+            })
+          }
+        })
+      }
+    },
+
     getCode() {
       getCodeImg().then(res => {
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
@@ -161,18 +220,36 @@ export default {
         }
       });
     },
+    qqLogin() {
+      window.location.href = "http://localhost:8080/auth/render/qq";
+    },
+    authLogin() {
+      this.$alert('第三方登录正在集成中...', '提示消息', {
+        confirmButtonText: '确定',
+        callback: action => {
+          this.$message({
+            type: 'info',
+            message: `action: ${action}`
+          });
+        }
+      });
+    },
     handleRegister() {
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           this.loading = true;
+          if (this.bindAccount) {
+            bindRegister(this.registerForm).then(res => {
+              this.innerRegister(res)
+            }).catch(() => {
+              this.loading = false;
+              if (this.captchaOnOff) {
+                this.getCode();
+              }
+            });
+          } else {
             register(this.registerForm).then(res => {
-                        const username = this.registerForm.username;
+              this.innerRegister(res)
-                        this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
-                            dangerouslyUseHTMLString: true,
-                            type: 'success'
-                        }).then(() => {
-                            this.$router.push("/login");
-                        }).catch(() => {});
             }).catch(() => {
               this.loading = false;
               if (this.captchaOnOff) {
@@ -180,6 +257,19 @@ export default {
               }
             })
           }
+
+        }
+      });
+    },
+
+    innerRegister(res) {
+      const username = this.registerForm.username;
+      this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+        dangerouslyUseHTMLString: true,
+        type: 'success'
+      }).then(() => {
+        this.$router.push("/login");
+      }).catch(() => {
       });
     }
   }
@@ -214,7 +304,7 @@ export default {
   margin: 0px auto 30px auto;
   text-align: center;
   color: #333;
-    font-size:24px;
+  font-size: 24px;
 }
 
 .register-form {
@@ -223,7 +313,7 @@ export default {
   background-color: rgba(250, 250, 250, 0.2);
   border: 1px solid #fff;
   padding: 25px 25px 5px 25px;
-    margin:20px;
+  margin: 20px;
 
   .el-input {
     height: 38px;