tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

publish 1.0.21

Browse Source
This commit is contained in:
曾文豪
2024-01-31 17:06:54 +08:00
parent ef5861327c
commit 09203ac78d
12 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
<packaging>pom</packaging>
<name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-encrypt</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-poi</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</dependency>
<dependency>

4
springboot-ademo/pom.xml
View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-ademo</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>

2
springboot-annotation/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-annotation</artifactId>

2
springboot-database/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-database</artifactId>

2
springboot-encrypt/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-encrypt</artifactId>

2
springboot-login/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-login</artifactId>

2
springboot-message/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-message</artifactId>

2
springboot-platform/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-platform</artifactId>

2
springboot-poi/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-poi</artifactId>

2
springboot-util/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-util</artifactId>

2
springboot-web/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>1.0.20</version>
<version>1.0.21</version>
</parent>
<artifactId>springboot-web</artifactId>

28
springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java
View File

@@ -1,6 +1,6 @@
package com.tiesheng.core.service;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.login.config.token.bean.TokenBean;
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.Objects;
/**
* @author hao
@@ -37,11 +38,22 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
platformUnique.setInfo(loginInfo.getInfo());
saveOrUpdate(platformUnique);
String oldUserId = platformUnique.getUserId();
TokenBean tokenBean = tieshengWebConfigurer.login(platformUnique);
if (tokenBean != null) {
// 添加登录日志
coreLogService.addLoginLog(platformUnique, tokenBean);
// 更新唯一值
if (!StrUtil.isEmpty(tokenBean.getId()) &&
!Objects.equals(oldUserId, tokenBean.getId())) {
platformUnique.setUserId(tokenBean.getId());
saveOrUpdate(platformUnique);
}
}
return tokenBean;
}
@@ -55,19 +67,5 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
tieshengWebConfigurer.onSignError(response);
}
/**
* 更新用户id
*
* @param uniqueId
* @param userId
* @return
*/
public boolean updateUserId(String uniqueId, String userId) {
return update(new UpdateWrapper<CorePlatformUnique>().eq("unique_id", uniqueId)
.set("user_id", userId)
.set("is_deleted", 0)
);
}
}