zhaokai
|
42c11c2bea
|
feat(department): 添加企业类型字段支持
|
2026-08-19 08:33:54 +08:00 |
zhaokai
|
7194fd818f
|
fix(config): 更新SMB服务器端口配置
|
2026-08-18 17:02:49 +08:00 |
zhaokai
|
daca8f03f1
|
feat(department): 添加部门查询功能增强
|
2026-08-17 16:55:21 +08:00 |
zhaokai
|
47ebd5c6d7
|
feat(department): 优化部门树查询接口并添加资质页面租户配置
|
2026-08-17 14:46:09 +08:00 |
zhaokai
|
16c316dc36
|
feat(department): 添加根据企业类型和企业ID集合查询部门树功能
|
2026-08-17 14:05:47 +08:00 |
zhaokai
|
961bf60ad6
|
feat(user): 完善大华系统同步功能
- 新增用户时增加头像URL空值检查,避免无效同步
- 更新用户时支持从数据库获取头像URL进行同步
- 同步大华人脸时补充完整的个人信息字段
- 增加身份证号解析计算年龄和性别功能
- 添加民族编码转换异常处理机制
- 优化同步流程的日志记录和错误处理
|
2026-08-17 10:49:40 +08:00 |
zhaokai
|
e682dc86e6
|
feat(user): 更新用户管理功能以支持大华系统集成
条件
- 实现大华人脸图片的下载和Base64转换功能
- 添加文件服务URL配置注入和使用
- 优化大华系统数据同步的日志记录和错误处理
|
2026-08-12 15:20:24 +08:00 |
zhaokai
|
68b225d42a
|
Merge branch 'dahua_koumen' into main_koumen
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
|
2026-08-11 19:20:04 +08:00 |
zhaokai
|
a5f76816de
|
config(resources): 切换生产环境配置文件
|
2026-08-11 19:10:48 +08:00 |
zhangxiongfeng
|
af5c37decf
|
人员变动查询大华接口
|
2026-08-11 18:52:59 +08:00 |
zhaokai
|
a0db881b2c
|
refactor(user): 优化用户增删操作的大华同步机制
sdk生产环境配置引用
|
2026-08-07 21:28:17 +08:00 |
zhaokai
|
84a6725eae
|
Merge remote-tracking branch 'origin/dahua_koumen' into main_koumen
# Conflicts:
# start/src/main/resources/bootstrap.yml
|
2026-08-07 10:24:25 +08:00 |
zhangxiongfeng
|
04b4f3d1d5
|
Merge remote-tracking branch 'origin/dahua_koumen' into dev
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
|
2026-08-06 10:31:23 +08:00 |
zhangxiongfeng
|
4d1c5ef0ad
|
人员变动取消和大华强制同步
|
2026-08-06 10:28:49 +08:00 |
zhangxiongfeng
|
a75871b388
|
大华口门对接1.1
(cherry picked from commit 65ad2b538e)
|
2026-08-05 09:10:11 +08:00 |
zhangxiongfeng
|
e4c8ddb7b0
|
大华口门对接1.1
(cherry picked from commit 65ad2b538e)
|
2026-08-05 08:38:28 +08:00 |
zhangxiongfeng
|
285764928c
|
大华口门对接1.0
(cherry picked from commit 65ad2b538e)
|
2026-08-04 16:32:38 +08:00 |
zhangxiongfeng
|
c227c8def6
|
Merge remote-tracking branch 'origin/dev' into dahua_koumen
|
2026-08-04 14:58:59 +08:00 |
zhangxiongfeng
|
3ef3dca48b
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:53:06 +08:00 |
zhangxiongfeng
|
ae529ebcac
|
大华口门对接
(cherry picked from commit 65ad2b538e)
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
|
2026-08-04 14:52:34 +08:00 |
zhangxiongfeng
|
b7ba5e46c2
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:51:08 +08:00 |
zhangxiongfeng
|
bb0a5912d6
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:13:09 +08:00 |
zhangxiongfeng
|
5aa49b9a3e
|
Merge remote-tracking branch 'origin/dev' into dahua_koumen
# Conflicts:
# start/src/main/resources/bootstrap.yml
|
2026-08-04 13:50:32 +08:00 |
zhangxiongfeng
|
af812fd3a7
|
大华口门部门id修改
|
2026-08-03 16:23:36 +08:00 |
zhangxiongfeng
|
042a44aebe
|
大华口门对接
(cherry picked from commit 604d96b3fa)
|
2026-08-03 16:23:30 +08:00 |
zhangxiongfeng
|
256ad8f364
|
删除 start/src/main/resources/application.yml
(cherry picked from commit 9c78c946bc)
|
2026-08-03 16:23:27 +08:00 |
zhangxiongfeng
|
ceb533d6a6
|
删除 start/src/main/java/com/zcloud/basic/info/config/LocalDevFilterConfig.java
(cherry picked from commit aee2515e20)
|
2026-08-03 16:23:24 +08:00 |
zhangxiongfeng
|
ccd10c317b
|
大华口门对接
(cherry picked from commit ac94e9fe88)
|
2026-08-03 16:23:17 +08:00 |
zhangxiongfeng
|
e369717b9d
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:23:09 +08:00 |
zhangxiongfeng
|
0117f3b1af
|
大华口门对接
(cherry picked from commit 8beed9d73d)
|
2026-08-03 16:22:54 +08:00 |
zhangxiongfeng
|
3a8035841b
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:22:48 +08:00 |
zhangxiongfeng
|
70da6bacad
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:22:16 +08:00 |
zhangxiongfeng
|
566e2c9158
|
大华口门对接
(cherry picked from commit 8beed9d73d)
|
2026-08-03 16:22:00 +08:00 |
zhangxiongfeng
|
4a462f7b56
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:21:55 +08:00 |
zhangxiongfeng
|
92ed2c3177
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:19:19 +08:00 |
zhangxiongfeng
|
5d34e2ab40
|
大华口门对接
(cherry picked from commit 8beed9d73d)
|
2026-08-03 16:17:26 +08:00 |
zhangxiongfeng
|
20f9c5ebd2
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:16:46 +08:00 |
zhangxiongfeng
|
59748186c6
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:15:23 +08:00 |
zhangxiongfeng
|
92cc6154c3
|
大华口门对接
(cherry picked from commit ac94e9fe88)
|
2026-08-03 16:05:23 +08:00 |
zhangxiongfeng
|
460679ea62
|
大华口门对接
(cherry picked from commit 604d96b3fa)
|
2026-08-03 16:04:55 +08:00 |
zhangxiongfeng
|
8b5a9d6f7f
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:03:41 +08:00 |
zhangxiongfeng
|
bd29d0063d
|
大华口门对接
(cherry picked from commit 604d96b3fa)
|
2026-08-03 16:01:30 +08:00 |
zhangxiongfeng
|
f5d06a08c7
|
大华口门部门id修改
|
2026-08-03 16:00:06 +08:00 |
zhaokai
|
032657fa59
|
config(bootstrap): 切换到生产环境配置文件
|
2026-08-03 15:16:00 +08:00 |
zhaokai
|
38b49a9c7c
|
Merge branch 'dev_visual_page'
|
2026-08-03 14:52:40 +08:00 |
lishiwei
|
abc03976f6
|
refactor(): 优化用户密码更新逻辑
|
2026-08-03 14:42:09 +08:00 |
lishiwei
|
ebc5485102
|
chore(): 添加默认密码修改提醒注释
|
2026-08-03 14:42:00 +08:00 |
lishiwei
|
38ce347a06
|
feat: 优化修改密码逻辑
|
2026-08-03 14:41:52 +08:00 |
zhangxiongfeng
|
85d55a77d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-08-03 10:52:11 +08:00 |
zhangxiongfeng
|
c83d18b8a1
|
大华口门部门id修改
|
2026-08-03 10:51:53 +08:00 |