Commit Graph

955 Commits

Author SHA1 Message Date
zhouhao
5cfcbe679a Merge remote-tracking branch 'origin/master' into spring-boot3 2025-05-19 15:18:59 +08:00
Zhang Ji
4e9344bf34 fix: 优化字典的并行执行和树结构转换 (#321) 2025-05-19 15:18:27 +08:00
zhouhao
36a73c9a39 Merge remote-tracking branch 'origin/master' into spring-boot3 2025-04-25 17:40:55 +08:00
fighter-wang
21f1478148 fix(用户保存): 修复保存用户信息时,抛出的UserModifiedEvent事件中的最新用户信息不完整的问题 (#316)
* fix(用户保存): 修复保存用户信息时抛出的UserModifiedEvent事件中的最新用户信息不完整的问题

* fix(用户保存): 代码优化

* fix(用户保存): 修复old实体会被修改的问题

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
2025-04-18 15:45:58 +08:00
zhouhao
c0351cfa16 Merge remote-tracking branch 'origin/master' into spring-boot3
# Conflicts:
#	hsweb-authorization/hsweb-authorization-api/pom.xml
#	hsweb-authorization/hsweb-authorization-basic/pom.xml
#	hsweb-authorization/hsweb-authorization-oauth2/pom.xml
#	hsweb-authorization/pom.xml
#	hsweb-commons/hsweb-commons-api/pom.xml
#	hsweb-commons/hsweb-commons-crud/pom.xml
#	hsweb-commons/pom.xml
#	hsweb-concurrent/hsweb-concurrent-cache/pom.xml
#	hsweb-concurrent/pom.xml
#	hsweb-core/pom.xml
#	hsweb-datasource/hsweb-datasource-api/pom.xml
#	hsweb-datasource/hsweb-datasource-jta/pom.xml
#	hsweb-datasource/hsweb-datasource-web/pom.xml
#	hsweb-datasource/pom.xml
#	hsweb-logging/hsweb-access-logging-aop/pom.xml
#	hsweb-logging/hsweb-access-logging-api/pom.xml
#	hsweb-logging/pom.xml
#	hsweb-starter/pom.xml
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/pom.xml
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-oauth2/pom.xml
#	hsweb-system/hsweb-system-authorization/pom.xml
#	hsweb-system/hsweb-system-dictionary/pom.xml
#	hsweb-system/hsweb-system-file/pom.xml
#	hsweb-system/pom.xml
#	pom.xml
2025-04-07 10:50:39 +08:00
hello09x
2f082089a6 feat: UserModifiedEvent提供新密码原始文本 (#315) 2025-04-01 17:20:43 +08:00
zhouhao
6fbb9a22e6 build: 4.0.19-SNAPSHOT 2025-04-01 15:23:29 +08:00
zhouhao
931c87ca51 Merge remote-tracking branch 'origin/master' into spring-boot3
# Conflicts:
#	hsweb-authorization/hsweb-authorization-api/pom.xml
#	hsweb-authorization/hsweb-authorization-basic/pom.xml
#	hsweb-authorization/hsweb-authorization-oauth2/pom.xml
#	hsweb-authorization/pom.xml
#	hsweb-commons/hsweb-commons-api/pom.xml
#	hsweb-commons/hsweb-commons-crud/pom.xml
#	hsweb-commons/pom.xml
#	hsweb-concurrent/hsweb-concurrent-cache/pom.xml
#	hsweb-concurrent/pom.xml
#	hsweb-core/pom.xml
#	hsweb-datasource/hsweb-datasource-api/pom.xml
#	hsweb-datasource/hsweb-datasource-jta/pom.xml
#	hsweb-datasource/hsweb-datasource-web/pom.xml
#	hsweb-datasource/pom.xml
#	hsweb-logging/hsweb-access-logging-aop/pom.xml
#	hsweb-logging/hsweb-access-logging-api/pom.xml
#	hsweb-logging/pom.xml
#	hsweb-starter/pom.xml
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/pom.xml
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-oauth2/pom.xml
#	hsweb-system/hsweb-system-authorization/pom.xml
#	hsweb-system/hsweb-system-dictionary/pom.xml
#	hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/service/CompositeDictDefineRepository.java
#	hsweb-system/hsweb-system-file/pom.xml
#	hsweb-system/pom.xml
#	pom.xml
2025-03-31 11:27:04 +08:00
zhouhao
1f62a9bca2 build: release 4.0.18 2025-03-31 10:11:54 +08:00
zhouhao
e928bc46a5 refactor: 优化数据字典加载 2025-03-18 18:47:47 +08:00
zhouhao
787eead282 refactor: 优化数据字典加载逻辑 2025-03-06 14:23:43 +08:00
zhouhao
48b6f39483 refactor: 优化数据字典加载逻辑 2025-03-06 10:34:56 +08:00
zhouhao
89c9b86a21 Merge remote-tracking branch 'origin/master' into spring-boot3 2025-02-20 17:34:37 +08:00
zhouhao
002c7259f4 refactor: 优化数据字典加载 2025-02-19 14:04:31 +08:00
zhouhao
f89befb011 Merge remote-tracking branch 'origin/master' into spring-boot3
# Conflicts:
#	hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinition.java
#	hsweb-commons/hsweb-commons-crud/src/main/resources/i18n/commons/messages_en.properties
#	hsweb-commons/hsweb-commons-crud/src/main/resources/i18n/commons/messages_zh.properties
#	hsweb-core/src/main/java/org/hswebframework/web/i18n/LocaleUtils.java
#	hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/entity/DictionaryEntity.java
2025-01-21 15:37:23 +08:00
zhouhao
f7335e9e20 Merge remote-tracking branch 'origin/master' 2025-01-15 17:19:16 +08:00
zhouhao
b7fc0f8d4e refactor: 优化国际化信息 2025-01-15 17:17:15 +08:00
445990772
67b68f417f feat(权限管理):新增权限管理118n支持 (#303) 2025-01-14 17:21:39 +08:00
zhouhao
a02c6002ad refactor: 修复国际化字段错误 2025-01-14 15:55:25 +08:00
zhouhao
9bc4a351b5 refactor: 数据字典增加国际化支持 2025-01-13 16:31:56 +08:00
zhouhao
b2f8de09a7 Merge branch 'master' into spring-boot3
# Conflicts:
#	hsweb-core/pom.xml
2025-01-03 17:50:08 +08:00
zhouhao
358f740e63 refactor: 优化 2025-01-02 16:26:43 +08:00
zhouhao
0eadd4debf build(maven): 4.0.18-SNAPSHOT 2024-08-27 10:20:02 +08:00
zhouhao
98755c8679 build: 4.0.17 release 2024-08-19 14:36:16 +08:00
zhouhao
b18af6b66e refactor: 优化 2024-07-04 17:34:54 +08:00
zhouhao
a0d82967c5 Merge branch 'refs/heads/master' into spring-boot3
# Conflicts:
#	hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/DimensionDataAccessHandler.java
#	hsweb-authorization/hsweb-authorization-oauth2/src/main/java/org/hswebframework/web/oauth2/server/auth/ReactiveOAuth2AccessTokenParser.java
#	hsweb-authorization/hsweb-authorization-oauth2/src/test/java/org/hswebframework/web/oauth2/server/impl/RedisAccessTokenManagerTest.java
#	hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/EasyormRepositoryRegistrar.java
#	hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/CrudTests.java
#	hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/service/GenericReactiveCacheSupportCrudServiceTest.java
#	hsweb-core/pom.xml
#	hsweb-logging/hsweb-access-logging-aop/src/main/java/org/hswebframework/web/logging/aop/ReactiveAopAccessLoggerSupport.java
#	hsweb-starter/src/main/java/org/hswebframework/web/starter/initialize/SystemInitialize.java
#	hsweb-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/UserEntity.java
#	hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveUserService.java
#	pom.xml
2024-07-04 16:17:22 +08:00
zhouhao
e2e98d1f8e fix: 修复单元测试错误 2024-06-06 16:28:42 +08:00
zhouhao
7085b71234 fix: 修复sql拼接错误 2024-06-03 10:08:53 +08:00
zhouhao
e9ce00b30d refactor(基础模块): 优化动态条件构造 2024-05-28 11:57:32 +08:00
EddyChao
439f19034f feat: 添加角色维度关联时间 (#289) 2024-05-14 15:20:21 +08:00
zhouhao
775f8f161c refactor: 增加NoStackTrace异常,特定情况不记录线程栈. 2024-04-29 13:36:33 +08:00
zhouhao
b69ff8c857 refactor: 优化自动配置 2024-03-07 17:02:03 +08:00
gyl
f9a0617939 refactor: 保存用户时不再校验传入id (#274) 2024-02-07 13:39:47 +08:00
gyl
de764e0ce3 fix: 优化判空函数执行顺序 (#271) 2024-01-24 10:02:32 +08:00
gyl
b226e6ce14 feat: 字典项id默认根据字典id及ordinal生成 (#270)
* feat: 字典项id默认根据字典id及ordinal生成

* feat: 优化

* test: 添加测试类
2024-01-22 14:14:01 +08:00
gyl
017c72173a feat: 添加字典项字典id和序号双重唯一性校验;支持新增保存时自动顺序填充序号 (#269)
* feat: 添加字典项字典id和序号双重唯一性校验;支持新增保存时自动顺序填充序号

* feat: 提取方法
2024-01-19 09:27:24 +08:00
gyl
25a25ea5b9 fix: 修复用户新增id规则判断 (#268) 2024-01-18 17:57:05 +08:00
zhouhao
f9f3285465 refactor: 优化序列化逻辑 2024-01-08 10:31:14 +08:00
zhouhao
bd733cb193 refactor: 替换过时的api 2024-01-02 10:48:18 +08:00
zhouhao
d61da9bbde build: new version 5.0.0 2024-01-02 10:43:43 +08:00
zhouhao
6a00714151 feat: 适配spring-boot3 2023-12-25 11:51:41 +08:00
老周
758d56437b refactor: 调整spring-boot自动配置. (#261) 2023-12-04 11:27:11 +08:00
liusq
332c54e157 refactor(数据字典): 获取字典数据增加排序 (#249) 2023-10-10 03:44:56 -05:00
zhouhao
8edda58a5c chore: 优化代码结构 2023-09-27 16:17:08 +08:00
老周
e3f7b572cd feat: ReactiveUserService增加queryPager方法. (#245) 2023-09-27 03:16:41 -05:00
liusq
705a95c87f fix(数据字典): 修复新增字典时未进行校验的问题 (#242) 2023-09-21 21:15:59 -05:00
gyl
b70144c029 refactor(数据字典): 字典表创建信息相关字段不可修改 (#241) 2023-09-21 04:40:48 -05:00
gyl
c200efabd7 fix(数据字典): 删除错误依赖 (#234) 2023-09-04 16:51:42 +08:00
gyl
e577bc368a feat(数据字典): 添加详情查询接口 (#221)
---------

Co-authored-by: 老周 <zh.sqy@qq.com>
2023-08-14 17:22:09 +08:00
zhouhao
0973eea03d build: 4.0.17-SNAPSHOT 2023-08-11 11:49:36 +08:00