diff --git a/pom.xml b/pom.xml
index 72c4d15..b765c27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,18 @@
sa-token-spring-boot-starter
1.44.0
+
+
+ cn.dev33
+ sa-token-redis-template
+ 1.44.0
+
+
+
+
+ org.apache.commons
+ commons-pool2
+
org.springframework.session
spring-session-data-redis
diff --git a/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java b/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java
index 8bf6627..3928c8e 100644
--- a/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java
+++ b/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java
@@ -44,7 +44,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
"/favicon.ico",
// 你的其他放行路径,例如登录接口
"/user/doLogin",
- "/tenant/get-id-by-name"
+ "/tenant/get-id-by-name",
+ "/user/bigbrother-doLogin"
};
}
diff --git a/src/main/java/com/yupi/springbootinit/controller/BigBrotherController.java b/src/main/java/com/yupi/springbootinit/controller/BigBrotherController.java
index af5df02..992ec56 100644
--- a/src/main/java/com/yupi/springbootinit/controller/BigBrotherController.java
+++ b/src/main/java/com/yupi/springbootinit/controller/BigBrotherController.java
@@ -3,11 +3,8 @@ package com.yupi.springbootinit.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yupi.springbootinit.common.BaseResponse;
import com.yupi.springbootinit.common.ResultUtils;
-import com.yupi.springbootinit.model.dto.host.HostInfoDTO;
import com.yupi.springbootinit.model.dto.host.ServerBigBrotherDTO;
import com.yupi.springbootinit.model.vo.bigbrother.ServerBigBrotherVO;
-import com.yupi.springbootinit.model.vo.hosts.NewHostsVO;
-import com.yupi.springbootinit.service.HostInfoService;
import com.yupi.springbootinit.service.ServerBigBrotherService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +26,7 @@ public class BigBrotherController {
private ServerBigBrotherService bigBrotherService;
@PostMapping("page")
- public BaseResponse> hostsInfo(@RequestBody ServerBigBrotherDTO serverBigBrotherDTO){
+ public BaseResponse> getBigBrotherPage(@RequestBody ServerBigBrotherDTO serverBigBrotherDTO){
Page conditionHosts = bigBrotherService.getConditionHosts(serverBigBrotherDTO);
return ResultUtils.success(conditionHosts);
}
diff --git a/src/main/java/com/yupi/springbootinit/controller/UserController.java b/src/main/java/com/yupi/springbootinit/controller/UserController.java
index 45385e8..915a757 100644
--- a/src/main/java/com/yupi/springbootinit/controller/UserController.java
+++ b/src/main/java/com/yupi/springbootinit/controller/UserController.java
@@ -55,7 +55,7 @@ public class UserController {
SystemUsersVO systemUsersVO = new SystemUsersVO();
BeanUtil.copyProperties(user, systemUsersVO);
// 赋予用户 Id
- StpUtil.login(user.getId());
+ StpUtil.login(user.getId(),"host");
// 设置 token 有效期为当前日期和套餐有效期的差值
StpUtil.renewTimeout(second);
systemUsersVO.setTokenName(StpUtil.getTokenName());
@@ -87,7 +87,7 @@ public class UserController {
SystemUsersVO systemUsersVO = new SystemUsersVO();
BeanUtil.copyProperties(user, systemUsersVO);
// 赋予用户 Id
- StpUtil.login(user.getId());
+ StpUtil.login(user.getId(),"bigbrother");
// 设置 token 有效期为当前日期和套餐有效期的差值
StpUtil.renewTimeout(second);
systemUsersVO.setTokenName(StpUtil.getTokenName());
diff --git a/src/main/java/com/yupi/springbootinit/model/dto/host/ServerBigBrotherDTO.java b/src/main/java/com/yupi/springbootinit/model/dto/host/ServerBigBrotherDTO.java
index 4888feb..6287c6b 100644
--- a/src/main/java/com/yupi/springbootinit/model/dto/host/ServerBigBrotherDTO.java
+++ b/src/main/java/com/yupi/springbootinit/model/dto/host/ServerBigBrotherDTO.java
@@ -126,7 +126,7 @@ public class ServerBigBrotherDTO extends PageRequest implements Serializable {
/**
* 按照何种业务排序
*/
- @ApiModelProperty(value = "排序字段(createTime/hostsCoins/fans等)", example = "hostsCoins")
+ @ApiModelProperty(value = "排序字段(historicHighCoins/totalGiftCoins/level等)", example = "hostsCoins")
private String sortName;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8c84a84..6521556 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -14,10 +14,20 @@ spring:
# Redis 配置
# todo 需替换配置
redis:
- database: 0
+ database: 1
host: localhost
port: 6379
timeout: 5000
+ lettuce:
+ pool:
+ # 连接池最大连接数
+ max-active: 200
+ # 连接池最大阻塞等待时间(使用负值表示没有限制)
+ max-wait: -1ms
+ # 连接池中的最大空闲连接
+ max-idle: 10
+ # 连接池中的最小空闲连接
+ min-idle: 0
rabbitmq:
host: localhost
port: 5672
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ffbb4ce..f9c0459 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -108,5 +108,6 @@ sa-token:
# 是否输出操作日志
is-log: true
+
md5:
salt: (-FhqvXO,wMz
\ No newline at end of file