wynne1005
|
fb071a4faf
|
还原syslocaleres
|
4 years ago |
|
wynne1005
|
0a3d026643
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
castle.zang
|
dd6e757499
|
Merge branch 'upstreamTest' into test
|
4 years ago |
|
castle.zang
|
897b63151f
|
增加职位查询，部门查询返回值泛型
|
4 years ago |
|
wynne1005
|
d643545b1f
|
merge 请求 处理冲突
|
4 years ago |
 臧学普
|
8d8ee27b51
|
Merge pull request 'Merge pull request 'UAT Sweb创建账号优化 #15180' (#13) from castle.zang/i3plus-core:test into test' (#1) from i3-IMPP/i3plus-core:test into test
Reviewed-on: http://git.estsh.com/castle.zang/i3plus-core/pulls/1
|
4 years ago |
陆卫豪
|
133bad15bf
|
Merge pull request 'UAT Sweb创建账号优化 #15180' (#13) from castle.zang/i3plus-core:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-core/pulls/13
|
4 years ago |
|
wynne1005
|
f46e5d0bd7
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
3f57a0b48d
|
删除不需要的pom
|
4 years ago |
|
wynne1005
|
e15e55aedb
|
更换钉钉jar路径
|
4 years ago |
|
castle.zang
|
f84f7db414
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
castle.zang
|
d4f3e8b324
|
WIP:UAT-用户管理优化修改 15179
|
4 years ago |
|
wynne1005
|
762458a1d5
|
feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
|
4 years ago |
|
castle.zang
|
909de971e1
|
UAT-用户管理优化修改 15179
|
4 years ago |
|
castle.zang
|
10d50ad43d
|
UAT Sweb创建账号优化 #15180
|
4 years ago |
|
wynne1005
|
c65a1d735c
|
fix(core): 添加 未添加至国际化的资源
添加 未添加至国际化的资源
|
4 years ago |
汪云昊
|
3518567099
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
Conflicts:
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
|
4 years ago |
|
汪云昊
|
296c2870e9
|
feat(core):添加应用状态变更通知开关
|
4 years ago |
|
汪云昊
|
a0ef9bc225
|
fix(core):去除手机号与邮箱地址校验
|
4 years ago |
|
汪云昊
|
b7d2dc1b40
|
fix(core):修改国际化资源时的传参问题
|
4 years ago |
|
wynne1005
|
8f658735b1
|
refactor(core): 新增用户默认添加UserPassword
新增用户默认添加UserPassword
|
4 years ago |
|
wynne1005
|
9f67131539
|
refactor(core): 支持用户密码过期
Finish 21.4.8
|
4 years ago |
|
wynne1005
|
480fadb6b5
|
refactor(core): 支持用户密码过期
commit21.4.7
|
4 years ago |
|
wynne1005
|
e497daac80
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
9f317beec3
|
refactor(core): 松下取消邮箱验证
|
4 years ago |
|
wynne1005
|
6c0507eee4
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
cfbca32fd7
|
更改findunread 进白名单
|
4 years ago |
|
wynne1005
|
4c769a8b83
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
8fbdb6d56a
|
松下取消邮箱唯一性必填性校验
|
4 years ago |
|
wynne1005
|
3f5fbc16ef
|
Merge branch 'dev' into test
|
4 years ago |
|
汪云昊
|
72b91209e7
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wynne1005
|
378011c6c3
|
refactor(core): SSO 支持方式变更
|
4 years ago |
|
汪云昊
|
075fb698b6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
4 years ago |
|
汪云昊
|
1e4e57ceac
|
fix(impp):资源查询传参改为body方式
|
4 years ago |
|
wynne1005
|
8891646241
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
e5b5a120d2
|
优化e9单点登录 同session情况下 可以根据用户名判断是否登录
|
4 years ago |
|
wynne1005
|
f7c568bdaf
|
还原es日志设置
|
4 years ago |
|
wynne1005
|
9b18312be9
|
还原平台功能管理 菜单禁用功能
|
4 years ago |
|
wynne1005
|
be35052938
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
a9500bce13
|
core 移除mongo依赖
|
4 years ago |
|
wynne1005
|
da9895743d
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
77a5a68a8d
|
E9单点登录 新增已登录用户德恩路
|
4 years ago |
|
wynne1005
|
22a202732d
|
增加sso登录接口日志
|
4 years ago |
|
wynne1005
|
a78890b019
|
还原core pom
|
4 years ago |
|
wynne1005
|
6dfe4c1066
|
feat(core): 单点登录接口添加日志
单点登录接口添加日志
|
4 years ago |
|
wynne1005
|
252969cbc9
|
冲突解决
|
4 years ago |
|
wynne1005
|
82dea90825
|
添加test配置文件
|
4 years ago |
|
wynne1005
|
3569a09c45
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
|
wynne1005
|
d4242786ef
|
删除日志多余接口
|
4 years ago |
|
wynne1005
|
af17e1f469
|
feat(form): 动态表单新增跳转详情页枚举
|
4 years ago |