1461 Commits (yun-zuoyi)

Author SHA1 Message Date
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
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 6dfe4c1066 feat(core): 单点登录接口添加日志
单点登录接口添加日志
4 years ago
wynne1005 252969cbc9 冲突解决 4 years ago
wynne1005 82dea90825 添加test配置文件 4 years ago
wynne1005 d4242786ef 删除日志多余接口 4 years ago
wynne1005 af17e1f469 feat(form): 动态表单新增跳转详情页枚举 4 years ago
wynne1005 54ea5129c5 merge 4 years ago
wynne1005 8d4f36ebef 支持松下E9方式但 4 years ago
汪云昊 de57e22d38 fix(core):poi版本问题 4 years ago
wynne1005 4193e956ab 单点登录完成 4 years ago
汪云昊 92ccc8b4f0 Merge remote-tracking branch 'remotes/origin/dev' into test 4 years ago
wynne1005 1f2b304968 E9单点登录1 4 years ago
汪云昊 4c50bc4687 fix(core):菜单顶级模块翻译 4 years ago
汪云昊 a31d447621 fix(core):单号生成重复 4 years ago
汪云昊 3e75a703c6 feat(sms):短信模板状态同步 4 years ago
汪云昊 ffda8880f0 Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 3bf9f9697e fix(core):单号生成未正常重置流水号 4 years ago
汪云昊 2b9959b86e Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 7222a53840 feat(sms):平台短信功能 4 years ago
汪云昊 5310150de6 Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 cb0460cf7b fix(core):单号生成未正常重置 4 years ago
汪云昊 d475674be4 Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 85b6a2211e fix(core):单号生成因缓存未正常重置 4 years ago
汪云昊 e708a99bc4 fix(dept):部门数据的组织代码不正确 4 years ago
汪云昊 dc821d31c6 Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 11e6487225 fix(core):单号生成规则没有清除缓存 4 years ago
汪云昊 fe018a28bb fix(core):自动登录后语言代码正确 4 years ago
汪云昊 bbd53c4c2e fix(order):未固定单号生成长度 5 years ago
汪云昊 1cdf68663d Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 4c4ee6f6cb feat(core):用户增删改查微服务调用接口 5 years ago
汪云昊 1bdd1c50f6 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 82993aea59 refactor(platform):Clone工具位置调整 5 years ago
汪云昊 fedb46141c feat(core):消息状态未正常更新 5 years ago
汪云昊 a55786475d Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 4c01772341 fix(core):客户端ip获取不正确 5 years ago
汪云昊 696c21097c Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 b1787918b5 feat(core):邮件支持附件发送 5 years ago
汪云昊 8275ea3d6a Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 3c688739f0 fix(core):组织,部门代码无唯一校验 5 years ago
汪云昊 d53a0a1f58 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 396d5b0fa3 feat(core):微服务节点SystemInit完成后再注册到注册中心 5 years ago
汪云昊 4606259e0b fix(core):在用户未登录时国际化无效 5 years ago
汪云昊 ca5001b531 fix(core):在用户未登录时国际化无效 5 years ago
汪云昊 a0d92c5c6c Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 35b0b7ead4 fix(core):导出用户角色信息错误 5 years ago
汪云昊 50ec4bc4b5 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 addcb68ed6 fix(core):平台无角色用户导出时异常 5 years ago
汪云昊 0dd43b89e9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 5fee69941f fix(core):定时任务日志没有输出到指定的目录下 5 years ago
汪云昊 7cc2d02b6a Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 8c1476227a fix(core):没有按指定条件导出 5 years ago
汪云昊 ff89bc49d6 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 cc3bd5e4d5 feat(core):系统更新记录功能 5 years ago
汪云昊 4eb1391834 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 7bb0232bb7 feat(core):系统更新记录功能 5 years ago
汪云昊 7a79bcd29a Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 b87304c27f feat:功能权限数据清洗 5 years ago
汪云昊 2a7f0294b8 feat:字典规则调整允许值为空 5 years ago
汪云昊 300b1fd97f feat:用户导出 5 years ago
汪云昊 41a46d21e4 feat:调整日志文件默认值 5 years ago
汪云昊 b718e75cc8 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 b5dfa7fd6f feat:单号生成记录 5 years ago
汪云昊 7e7f7ed1ec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 dc29fd6436 fix:单号生成记录 5 years ago
汪云昊 954004452b fix:单号生成记录 5 years ago
汪云昊 c64d619b0a 企业微信适配 5 years ago
汪云昊 d1c033cfdb feat:操作日志导出 5 years ago
汪云昊 1ba7cc9d03 feat:ELK定时删除索引 5 years ago
汪云昊 195a55736a feat(用户登录日志):用户登录日志查询及导出功能 5 years ago
汪云昊 de7b481831 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 cc3fd0a754 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 1f61c06a1d feat:Redis-find优化避免阻塞 5 years ago
汪云昊 176e6dacf0 feat:移除mongo日志持久化方法 5 years ago
汪云昊 b3d36453e2 feat(log文件):压缩保留日志文件 5 years ago
汪云昊 17d655bf1f feat:条码解析初始化缓存 5 years ago
汪云昊 534c6b554c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 85f11d7d0a fix:分隔符计数比较方式 5 years ago
汪云昊 7c88ff29d3 feat:单号生成功能优化 5 years ago
汪云昊 137a14133f feat:单号生成功能优化 5 years ago
汪云昊 29f40a4dc7 feat:添加条码解析校验模式 5 years ago
汪云昊 a67f6b6918 fix:微服务多实例下单号重复的问题 5 years ago
汪云昊 c146b3b52e fix:定时任务空指针的问题 5 years ago
汪云昊 2898a82ce8 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 7587802129 feat:切面性能测试接口 5 years ago
汪云昊 2b74cbf226 feat:用户定制化配置功能 5 years ago
汪云昊 8ba9b4d71f fix:Elk工具中索引识别出错的问题 5 years ago
汪云昊 19a7256cb6 fix:支持规则与参数不一致的情况 5 years ago
汪云昊 737c2d2d53 fix:密码策略校验错误问题 5 years ago
汪云昊 b4d378ddae fix:会话模式为默认时出现不能正常覆盖的问题 5 years ago
汪云昊 1f7ec5c8c7 fix:定时任务日志查询bug 5 years ago
汪云昊 40bc27dfaa 版本还原 5 years ago
汪云昊 3ede7e3107 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 5a432554d0 会话模式配置-调整默认模式 5 years ago
汪云昊 5361c81c3d 会话模式配置 5 years ago
汪云昊 6dccdf0a01 平台权限功能垃圾数据清理及权限模块分配查询接口 5 years ago
贾文涛 852b4c56c7 更改连接池配置项 5 years ago
汪云昊 7f6559e1af DEV版本还原 5 years ago
汪云昊 e153914613 Merge remote-tracking branch 'origin/test' into dev 5 years ago
汪云昊 0a7d544153 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 d5dc9164c7 平台功能优化,移除通用缓存服务 5 years ago
贾文涛 9e074ad38e 更改异常输出的系统代码 5 years ago
汪云昊 c1d8ec308f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 1a072e7db3 添加权限数据清洗接口
权限接口优化
角色服务
5 years ago
汪云昊 7fda80c334 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 da9e91b89d 定时任务日志优化
邮件发送失败记录
5 years ago
汪云昊 77934319d1 定时任务 导入导出
定时任务 重载功能
5 years ago
汪云昊 2e598ee33f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2b88f3ecf1 ptl调度接口 5 years ago
wei.peng fd91bb10f3 同时在线用户限制开启 5 years ago
wei.peng 04abb712f4 用户密码策略bug 修复 5 years ago
汪云昊 845b493c3c Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application.properties
5 years ago
汪云昊 d2bc1f287e Log42 配置文件优化 5 years ago