1376 Commits (c69deadbf03125153038db49877066b310b6af3d)

Author SHA1 Message Date
nies 0cc5c3d695 修改queryRoleRefUser,不仅限于当前登录人员的角色 4 years ago
nies 7587ebdab9 修改人员导出接口,增加查询角色相关人员的接口 4 years ago
nies 3b3914ccd2 增加无需登录发送短信的接口 4 years ago
castle.zang b85a9fd55a Merge remote-tracking branch 'upstream/test' into test 4 years ago
nies aa396d1ac5 mail工具类增加starttls的配置 4 years ago
nies e4aa9c48f2 修改人员导入岗位和部门字段的映射关系 4 years ago
castle.zang f1baa54b32 数据冷热分离pojo 4 years ago
nies 082bcf994a 人员导入增加redis锁 4 years ago
nies faf60dd3e5 orderNo生成增加redis锁 4 years ago
castle.zang ea8ec0ed18 添加删除定时任务成功的提示信息 4 years ago
nies fd635c8642 修改根据职位查询人员信息的接口 4 years ago
nies f45ff23249 新增根据职位名称查询人员的接口 4 years ago
nies d5189ee5b6 merge 4 years ago
nies c2fd1972eb 新增查询人员所有查询当前用户角色下属所有菜单接口 4 years ago
nies c105dec10c 新增查询人员所有查询当前用户角色下属所有菜单接口 4 years ago
nies 1a7b8a3219 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
Wynne ee6fa54091 Merge branch 'dev' into test 4 years ago
nies ce0673fb89 修改导入的返回值 4 years ago
nies 113e2774b6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
nies 3edf91164c 增加人员导入和导入模板下载的接口 4 years ago
Wynne 004aab9426 fix(core): 还原mq返回值
还原mq返回值
4 years ago
Wynne bb0df5b50b fix(core): mq消息返回值更新
mq消息返回值更新
4 years ago
Wynne ffd120a094 fix(core): 去除impp日志
去除impp日志
4 years ago
Wynne 3538cb690a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 4 years ago
Wynne 726c2cede5 fix(core): 标签模板唯一校验更新
标签模板唯一校验更新
4 years ago
castle.zang f503badf4d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
castle.zang 08ae49a8d0 16805 系统管理--字典管理,增加导入功能。 4 years ago
wynne1005 32a6a6febf merge dev 4 years ago
wynne1005 e1a394d9e3 根据菜单menusort返回排好序的 给到前端 4 years ago
wynne1005 715c918abc merge test 还原pom 4 years ago
wynne1005 74de5329e6 Merge branch 'dev' into test 4 years ago
wynne1005 4c93d9da51 新增消息切面返回值判断 是否删除redis 4 years ago
nies 8e045d0cc6 更新导出账号接口 4 years ago
nies f259a0ae44 修改人员导出的接口,新增账号导出的接口 4 years ago
nies a51430c646 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
nies f6a3e617cd 新增账号导出的接口 4 years ago
wynne1005 d39b9cbe7c 还原pom 4 years ago
wynne1005 558f2c4a61 添加系统菜单背景图片字段 4 years ago
wynne1005 004346de51 删除.DS_STORE 4 years ago
wynne1005 f5e011789d 还原pom 4 years ago
wynne1005 6864f585b9 Merge branch 'dev' into test 4 years ago
wynne1005 76a44d7f09 添加获取用户接口,对象版本 4 years ago
nies dc40132655 用户导出增加默认值 4 years ago
nies 90bd2efec1 修改sysuserInfocontroller batch-delete 为软删除 4 years ago
wynne1005 e014266277 引入import 4 years ago
wynne1005 b4310bd87c 添加权限变更记录 4 years ago
wynne1005 d7adbed7ff 删除DS_STORE 4 years ago
wynne1005 0beaca750a 天津it审核需求 4 years ago
wynne1005 bb9f3a487e Merge branch 'dev' into test 4 years ago
wynne1005 d9ea9c63ee feat(core): 添加根据组织 查询下面用户接口
添加根据组织 查询下面用户接口
4 years ago
wynne1005 8fecb1f7d8 还原merge pom 4 years ago
wynne1005 f8b6226dc5 fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
4 years ago
wynne1005 c67b054a75 fix(core): 升级mysql controller添加名称
升级mysql controller添加名称
4 years ago
wynne1005 1fef53f736 松下密码修改之后需要登录时重新修改 4 years ago
wynne1005 43954e01c7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
陆卫豪 e56b371e59 Merge pull request 'test 松下 bug15455 ,手工修改用户密码' (#14) from castle.zang/i3plus-core:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-core/pulls/14
4 years ago
wynne1005 345d2e835a Merge branch 'dev' into test 4 years ago
wynne1005 b4994d77e1 添加松下密码重置策略 4 years ago
wynne1005 850684545c 松下:创建用户 该用户第一次登录时需要重置密码 4 years ago
castle.zang c3f8723d2d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
wynne1005 159a2d2fc7 解决松下16110变更 平台安全策略优化更新 4 years ago
castle.zang 3522a8f605 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 4 years ago
castle.zang 721a00d64f bug 15455 重置用户密码 4 years ago
wynne1005 5421438b3d merge dev 4 years ago
wynne1005 96be60b6df 修复修改密码值问题 4 years ago
wynne1005 f732b3f07d 还原资源获取 4 years ago
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 897b63151f 增加职位查询,部门查询返回值泛型 4 years ago
wynne1005 d643545b1f merge 请求 处理冲突 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 d4f3e8b324 WIP:UAT-用户管理优化修改 15179 4 years ago
wynne1005 762458a1d5 feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
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