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

2025-12-17 16:36:03 +08:00 · 2022-04-20 18:30:27 +08:00
parent 28bfe461dc
commit bb2cdebac3
15 changed files with 875 additions and 560 deletions
--- a/springboot/.gitignore
+++ b/springboot/.gitignore
@@ -24,6 +24,7 @@ target/
 *.iws
 *.iml
 *.ipr
+../.idea

 ### NetBeans ###
 nbproject/private/
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
    <groupId>com.wumei</groupId>
    <artifactId>wumei</artifactId>
    <version>3.8.0</version>
@@ -11,7 +11,7 @@
    <name>wumei</name>
    <url>http://www.wumei.live</url>
    <description>物美智能开源生活物联网平台</description>
-    
+
    <properties>
        <wumei.version>3.8.0</wumei.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,8 +33,10 @@
        <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>
-	
+
    <!-- 依赖声明 -->
    <dependencyManagement>
        <dependencies>
@@ -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>

--- a/springboot/wumei-admin/src/main/resources/application-druid.yml
+++ b/springboot/wumei-admin/src/main/resources/application-druid.yml
@@ -9,14 +9,14 @@ 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:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+              # 从数据源开关/默认关闭
+              enabled: false
+              url:
+              username:
+              password:
            # 初始连接数
            initialSize: 5
            # 最小连接池数量
@@ -27,27 +27,27 @@ spring:
            maxWait: 60000
            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
+          # 配置一个连接在池中最小生存的时间，单位是毫秒
            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
+          # 配置一个连接在池中最大生存的时间，单位是毫秒
            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
+          # 配置检测连接是否有效
            validationQuery: SELECT 1 FROM DUAL
            testWhileIdle: true
            testOnBorrow: false
            testOnReturn: false
-            webStatFilter: 
-                enabled: true
+            webStatFilter:
+              enabled: true
            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: wumei-smart
-                login-password: wumei-smart
+              enabled: true
+              # 设置白名单，不填则允许所有访问
+              allow:
+              url-pattern: /druid/*
+              # 控制台管理用户名和密码
+              login-username: wumei-smart
+              login-password: wumei-smart
            filter:
-                stat:
+              stat:
                    enabled: true
                    # 慢SQL记录
                    log-slow-sql: true
@@ -55,4 +55,4 @@ spring:
                    merge-sql: true
                wall:
                    config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
--- a/springboot/wumei-admin/src/main/resources/application.yml
+++ b/springboot/wumei-admin/src/main/resources/application.yml
@@ -42,15 +42,15 @@ spring:
  messages:
    # 国际化资源文件路径
    basename: i18n/messages
-  profiles: 
+  profiles:
    active: druid
  # 文件上传
  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
  # 服务模块
  devtools:
    restart:
@@ -65,8 +65,8 @@ spring:
    # 数据库索引
    database: 0
    # 密码
-#    password: wumei-smart
-#    password: 123456
+    #    password: wumei-smart
+    #    password: 123456
    # 连接超时时间
    timeout: 10s
    lettuce:
@@ -79,7 +79,7 @@ spring:
        max-active: 8
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms
-  # mqtt 配置  
+  # mqtt 配置
  mqtt:
    username: wumei-smart                      # 账号
    password: wumei-smart                      # 密码
@@ -95,30 +95,30 @@ spring:
        core-size: 10         # 最小连接数
        max-size: 30          # 最大连接数
        queue-capacity: 3000  # 最大容量
-        
+
 # token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklwumeismartrstuvwxyz
-    # 令牌有效期（默认30分钟）1440为一天
-    expireTime: 1440
-  
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklwumeismartrstuvwxyz
+  # 令牌有效期（默认30分钟）1440为一天
+  expireTime: 1440
+
 # MyBatis配置
 mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml

 # PageHelper分页插件
-pagehelper: 
+pagehelper:
  helperDialect: mysql
  supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql

 # Swagger配置
 swagger:
@@ -128,10 +128,10 @@ swagger:
  pathMapping: /dev-api

 # 防止XSS攻击
-xss: 
+xss:
  # 过滤开关
  enabled: true
  # 排除链接（多个用逗号分隔）
  excludes: /system/notice
  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
+  urlPatterns: /system/*,/monitor/*,/tool/*
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
+++ b/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;
 }
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/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);
+    }
+
 }
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/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,
                        "/",
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/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);
+
+    }
+
    /**
     * 校验验证码
     * 
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/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))
-        {
-            try
-            {
+        return getLoginUserByToken(token);
+    }
+
+    /**
+     * 获取用户身份信息
+     *
+     * @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)
-    {
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
-        {
+    public void setLoginUser(LoginUser loginUser) {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
            refreshToken(loginUser);
        }
    }
@@ -90,10 +92,8 @@ public class TokenService
    /**
     * 删除用户身份信息
     */
-    public void delLoginUser(String token)
-    {
-        if (StringUtils.isNotEmpty(token))
-        {
+    public void delLoginUser(String 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;
    }
 }
--- a/springboot/wumei-iot/pom.xml
+++ b/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>