Compare commits

...

6 Commits

Author SHA1 Message Date
丁磊
2fc24060ee build:移除 pom.xml 中的插件仓库配置
- 删除了 pom.xml 文件中的 pluginRepositories部分
- 移除了名为 kepai-repo-plugin 的插件仓库配置
2025-06-09 17:51:53 +08:00
丁磊
c3a03e48bd publish 2.0.17-scope-test
All checks were successful
/ local-deploy (push) Successful in 17s
2025-06-09 17:47:16 +08:00
丁磊
87bd4ab71a fix(login): 修改微信公众号授权类型
- 将 snsapi_userinfo 修改为 snsapi_base
-优化了微信公众号登录的授权流程
2025-06-09 17:40:46 +08:00
曾文豪
2cf88cefa7 publish 2.0.17
All checks were successful
/ local-deploy (push) Successful in 20s
2024-12-08 12:00:48 +08:00
曾文豪
9a56994342 publish 2.0.16
All checks were successful
/ local-deploy (push) Successful in 20s
2024-12-08 11:53:36 +08:00
曾文豪
a987689bd6 perf:优化登录次数校验 2024-12-08 11:53:11 +08:00
17 changed files with 46 additions and 37 deletions

24
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
<packaging>pom</packaging>
<name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-role</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
@@ -118,12 +118,6 @@
</dependencies>
</dependencyManagement>
<pluginRepositories>
<pluginRepository>
<id>kepai-repo-plugin</id>
<url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<repository>

View File

@@ -1,7 +1,7 @@
#!/bin/sh
VERSION=$1
MESSAGE=$2
VERSION=2.0.17-scope-test
MESSAGE=test
## 更改版本号
mvn versions:set -DnewVersion=$VERSION

View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-ademo</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-annotation</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-database</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-login</artifactId>

View File

@@ -170,7 +170,7 @@ public class LoginController {
extra = "";
}
String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
response.sendRedirect(authorizationUrl);
}

View File

@@ -43,9 +43,12 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
*/
public TokenBean login(DoLoginInfo loginInfo) {
int loginErrorTimes = coreLogLoginMapper.getLoginErrorTimes(loginInfo.getLoginIp());
if (loginErrorTimes > 4) {
throw new ApiException("登录失败已达5次请10分钟后再试");
int loginErrorTimes = tsLoginConfigurer.getLoginErrorTimes();
if (loginErrorTimes > 0) {
int currentErrorTimes = coreLogLoginMapper.getLoginErrorTimes(loginInfo.getLoginIp());
if (currentErrorTimes >= loginErrorTimes) {
throw new ApiException("登录失败已达" + loginErrorTimes + "请10分钟后再试");
}
}
CorePlatformUnique platformUnique = getOneByColumn("unique_id", loginInfo.getUnique());

View File

@@ -36,7 +36,7 @@ public interface TsLoginConfigurer {
/**
* 登录失败的时候
*/
default void onLoginError(String to,HttpServletResponse response) {
default void onLoginError(String to, HttpServletResponse response) {
ServletKit.write(response, "404", "text");
}
@@ -66,4 +66,14 @@ public interface TsLoginConfigurer {
*/
RequestUserInfo getCurrentUserName(TokenBean userId);
/**
* 获取登录失败的次数默认5次
*
* @return
*/
default int getLoginErrorTimes() {
return 0;
}
}

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-message</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-platform</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-role</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-util</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.15</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-web</artifactId>

View File

@@ -9,6 +9,7 @@ import com.tiesheng.util.pojos.PageDTO;
import com.tiesheng.web.pojos.dao.CoreConfigSystem;
import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
import com.tiesheng.web.service.CoreConfigService;
import com.tiesheng.web.service.TieshengWebConfigurer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,8 @@ public class ConfigSystemController {
@Autowired
CoreConfigService coreConfigService;
@Autowired
TieshengWebConfigurer tieshengWebConfigurer;
/**
@@ -53,6 +56,7 @@ public class ConfigSystemController {
*/
@PostMapping("/system/update")
public ApiResp<String> systemUpdate(@RequestBody ConfigSystemDTO dto) {
tieshengWebConfigurer.configSystemCheck(dto);
coreConfigService.updateConfigSystem(dto);
return ApiResp.respOK("");
}

View File

@@ -22,8 +22,7 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
CoreConfigEnumMapper coreConfigEnumMapper;
@Resource
TsCacheService tsCacheService;
@Autowired
TieshengWebConfigurer tieshengWebConfigurer;
private static final String CONFIG_SYSTEM_PREFIX = "CONFIG:SYSTEM:";
@@ -79,8 +78,6 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
configKey.setConfigVal(dto.getConfigVal());
configKey.setRemark(dto.getRemark());
configKey.setExtra(dto.getExtra());
tieshengWebConfigurer.configSystemCheck(configKey);
updateById(configKey);
tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);

View File

@@ -5,6 +5,7 @@ import com.tiesheng.login.service.TsLoginConfigurer;
import com.tiesheng.util.exception.ApiRespEnum;
import com.tiesheng.util.pojos.ApiResp;
import com.tiesheng.web.pojos.dao.CoreConfigSystem;
import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -58,7 +59,7 @@ public interface TieshengWebConfigurer {
* 系统配置验证
* 如果不符合规则,可以抛出异常
*/
default void configSystemCheck(CoreConfigSystem configSystem) {
default void configSystemCheck(ConfigSystemDTO dto) {
}
///////////////////////////////////////////////////////////////////////////