diff --git a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java index fa72424..8ef124c 100644 --- a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java +++ b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java @@ -10,7 +10,7 @@ public class CacheConstants /** * 缓存有效期,默认720(分钟) */ - public final static long EXPIRATION = 720; + public final static long EXPIRATION = 43200; /** * 缓存刷新时间,默认120(分钟) diff --git a/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index ade1f5a..b849237 100644 --- a/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -78,6 +78,32 @@ public class TokenService return rspMap; } + + public Map createAPPToken(LoginUser loginUser) + { + String token = IdUtils.fastUUID(); + Long userId = 0L; + String userName = null; + userId = loginUser.getUserid(); + userName = loginUser.getUsername(); + loginUser.setToken(token); + loginUser.setUserid(userId); + loginUser.setIpaddr(IpUtils.getIpAddr()); + refreshToken(loginUser); + + // Jwt存储信息 + Map claimsMap = new HashMap(); + claimsMap.put(SecurityConstants.USER_KEY, token); + claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); + claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); + + // 接口返回信息 + Map rspMap = new HashMap(); + rspMap.put("access_token", JwtUtils.createToken(claimsMap)); + rspMap.put("expires_in", 43200); + rspMap.put("userId", userId); + return rspMap; + } /** * 获取用户身份信息 * diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java index 769cf24..14b9a82 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java @@ -81,7 +81,7 @@ public class AppLoginController { loginUser.setUsername(userName); loginUser.setIpaddr(IpUtils.getIpAddr()); loginUser.setExpireTime(43200L); - return R.ok(tokenService.createToken(loginUser)); + return R.ok(tokenService.createAPPToken(loginUser)); } private static AppRegister setAppRegister(RegisterForm registerForm) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/AlipayService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/AlipayService.java index e03bc71..287386d 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/AlipayService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/AlipayService.java @@ -6,7 +6,9 @@ import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradeCreateRequest; import com.alipay.api.request.AlipayTradePagePayRequest; import com.alipay.api.response.AlipayTradeCreateResponse; +import org.springframework.stereotype.Service; +@Service public class AlipayService { // 支付宝网关