Skip to content

Commit 3cdb132

Browse files
committed
feat: add login API
1 parent 3ae45f9 commit 3cdb132

7 files changed

Lines changed: 11 additions & 7 deletions

File tree

app/src/main/resources/sql/h2/create_permission_table_ddl_2025_1029.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ create table `t_permission_role`
1313
unique index `u_idx_permission_role` (`name`) using btree
1414
) engine = innodb comment = '';
1515

16-
drop table if exists `t_auth_usesr_units_roles`;
16+
drop table if exists `t_auth_users_units_roles`;
1717

1818
create table `t_auth_users_units_roles`
1919
(

app/src/main/resources/sql/mysql/create_permission_table_ddl_2025_1029.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ create table `t_permission_role`
1313
unique index `u_idx_permission_role` (`name`) using btree
1414
) engine = innodb comment = '';
1515

16-
drop table if exists `t_auth_usesr_units_roles`;
16+
drop table if exists `t_auth_users_units_roles`;
1717

1818
create table `t_auth_users_units_roles`
1919
(

base/src/main/java/com/tinyengine/it/login/config/SSOInterceptor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public boolean preHandle(HttpServletRequest request,
9393
} catch (Exception e) {
9494
log.error("Token validation exception: {}", e.getMessage(), e);
9595
response.sendRedirect(SSO_SERVER + "/login");
96+
DefaultLoginUserContext.clear();
9697
return false;
9798
}
9899
}

base/src/main/java/com/tinyengine/it/login/config/context/DefaultLoginUserContext.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public class DefaultLoginUserContext implements LoginUserContext {
1212

1313
private static final ThreadLocal<UserInfo> currentUser = new ThreadLocal<>();
1414

15+
private static final int DEFAULT_PLATFORM = 1;
16+
1517
@Override
1618
public String getTenantId() {
1719
UserInfo userInfo = currentUser.get();
@@ -33,7 +35,7 @@ public String getRenterId() {
3335
@Override
3436
public int getPlatformId() {
3537
UserInfo userInfo = currentUser.get();
36-
return userInfo != null ? userInfo.getPlatformId() : 1;
38+
return userInfo != null ? userInfo.getPlatformId() : DEFAULT_PLATFORM;
3739
}
3840

3941
@Override

base/src/main/java/com/tinyengine/it/login/controller/LoginController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public Result createUser(@Valid @RequestBody User user) throws Exception {
8888
PasswordValidationResult passwordValidationResult = configurablePasswordValidator
8989
.validateWithPolicy(user.getPassword());
9090
if(!passwordValidationResult.isValid()) {
91-
return Result.success(passwordValidationResult);
91+
return Result.failed("密码格式检验失败", passwordValidationResult.getErrorMessage());
9292
}
9393
PasswordResult password = SM3PasswordUtil.createPassword(user.getPassword());
9494
user.setPassword(password.getPasswordHash());

base/src/main/java/com/tinyengine/it/service/app/impl/AppTemplateServiceImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.springframework.stereotype.Service;
4040
;
4141
import java.util.List;
42+
import java.util.UUID;
4243

4344
@Service
4445
public class AppTemplateServiceImpl extends ServiceImpl<AppMapper, App> implements AppTemplateService {
@@ -243,7 +244,7 @@ private void createI18n(int templateId, int appId) {
243244
}
244245
for (I18nEntryDto i18nEntrieDto : i18nEntries) {
245246

246-
String key = i18nEntrieDto.getKey() + System.currentTimeMillis();
247+
String key = i18nEntrieDto.getKey() + "_" + UUID.randomUUID();
247248
i18nEntrieDto.setId(null);
248249
i18nEntrieDto.setKey(key);
249250
i18nEntrieDto.setCreatedBy(null);

base/src/main/resources/mappers/AppMapper.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@
430430
SELECT
431431
<include refid="Common_Column_List"/>
432432
<include refid="Common_Join"/>
433-
WHERE is_template IS NOT TRUE
433+
WHERE A.is_template IS NOT TRUE
434434
ORDER BY A.created_time DESC
435435
</select>
436436

@@ -515,7 +515,7 @@
515515
<include refid="Common_Column_List"/>
516516
<include refid="Common_Join"/>
517517
<where>
518-
A.id = #{id} and A.is_template = true
518+
A.id = #{id} AND A.is_template = true
519519
</where>
520520
</select>
521521

0 commit comments

Comments
 (0)