wei.peng
|
33de5b5291
|
默认地址修改
|
6 years ago |
alwaysfrin
|
8c42a886ee
|
定时任务调整
|
6 years ago |
|
alwaysfrin
|
f97eef9dfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
3457079a52
|
定时任务封装
|
6 years ago |
Silliter
|
76bacc59f0
|
开发打印模板功能
|
6 years ago |
|
alwaysfrin
|
bcf1f7f406
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
0a857b8857
|
schedule定时任务调整，fallback熔断机制改为factory模式
|
6 years ago |
yunhao.wang
|
98c7df4528
|
条码规则解析-特殊分隔符处理
|
6 years ago |
|
wei.peng
|
e573a52c57
|
注册中心更改
|
6 years ago |
|
yunhao.wang
|
11c970454d
|
测试配置调整
|
6 years ago |
|
yunhao.wang
|
89242cb04d
|
条码规则解析Demo
元素名称唯一校验
文件上传优化
|
6 years ago |
|
yunhao.wang
|
c5b16f1e99
|
统一提示信息为 操作成功
|
6 years ago |
|
yunhao.wang
|
b0af7e5de0
|
解决冲突
|
6 years ago |
|
yunhao.wang
|
a8f23b301b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
7b88c6cc33
|
条码规则管理
微服条码解析
|
6 years ago |
|
wei.peng
|
717a1b381a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
b60ed385ec
|
MQ 站内信 问题修复
|
6 years ago |
|
alwaysfrin
|
409ea33ea0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
984ec34d2f
|
消息若发送失败后的处理
|
6 years ago |
|
wei.peng
|
dd8f5bd900
|
异常处理
|
6 years ago |
|
wei.peng
|
95fba8e7f7
|
数据库配置修改
|
6 years ago |
|
wei.peng
|
50c5227f55
|
Redis 配置更新
微服务配置更新
|
6 years ago |
|
wei.peng
|
bb411e1e98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
ec90f78120
|
自定义模板优化
echarts 工具新增
|
6 years ago |
|
wei.peng
|
22f8640eb2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
8474f4a569
|
添加批量删除任务计划功能
|
6 years ago |
|
yunhao.wang
|
37c2543354
|
报表优化，
邮件内容验证
|
6 years ago |
|
wei.peng
|
33eae84465
|
提示信息优化
|
6 years ago |
|
wei.peng
|
d0f6fdcd7a
|
3577 -> 优化错误提示
|
6 years ago |
|
wei.peng
|
2fc7e20497
|
自定义报表Bug 修复
|
6 years ago |
|
yunhao.wang
|
6f95765dd2
|
调试测试环境配置
|
6 years ago |
|
yunhao.wang
|
9f20dd7665
|
优化报表
单号生成规则调整重置条件
|
6 years ago |
|
yunhao.wang
|
8458d9f311
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
e7146eb5f5
|
wms定时任务job
|
6 years ago |
|
wei.peng
|
decde6020d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
ebc2befa65
|
自定义模板优化
echarts 工具新增
|
6 years ago |
|
yunhao.wang
|
03d3f53fed
|
报表优化
解决bug
邮件消息优化
|
6 years ago |
|
yunhao.wang
|
2ac8b3b8be
|
解决冲突
|
6 years ago |
|
yunhao.wang
|
6be635a392
|
报表优化
解决bug
|
6 years ago |
|
wei.peng
|
ed25f29058
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
199e1db555
|
自定义报表 功能优化
|
6 years ago |
|
yunhao.wang
|
b1db4a5b2f
|
报表优化
国际化接口
|
6 years ago |
|
yunhao.wang
|
dcfd377729
|
报表优化
|
6 years ago |
|
yunhao.wang
|
fa8622b3ee
|
解决冲突
|
6 years ago |
|
wei.peng
|
8b0a955f86
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
b734a90de7
|
测试案例提交
|
6 years ago |
|
yunhao.wang
|
537b99a28a
|
解决冲突
|
6 years ago |
|
yunhao.wang
|
d8ee86f48e
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestController.java
|
6 years ago |
|
yunhao.wang
|
a18efc36f6
|
报表优化
impp压测接口优化
消息队列非空验证
单号管理增加状态
|
6 years ago |
|
wei.peng
|
6fa8189fc6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
7e64595203
|
自定义报表 获取目录接口功能完成
|
6 years ago |
|
wei.peng
|
7102b5123a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
67cb57dadc
|
自定义报表 获取目录接口功能完成
|
6 years ago |
|
yunhao.wang
|
2f709cd53f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
d94b94335a
|
定时任务队列异常处理
|
6 years ago |
|
wei.peng
|
2c928f6de9
|
用户获取权限Bug 修复
|
6 years ago |
|
wei.peng
|
2cbffd777d
|
造数据 - 用户
|
6 years ago |
|
yunhao.wang
|
0b40e9a60c
|
报表管理
|
6 years ago |
|
yunhao.wang
|
9fd6afe3f2
|
性能测试
|
6 years ago |
|
yunhao.wang
|
e1a5ec467a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
95a680b5c7
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
f1ed9a004f
|
文件上传 后缀冗余
|
6 years ago |
|
yunhao.wang
|
a6076a0c6a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
68a5e67029
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
23e9b4091f
|
bug解决
操作日志添加人员登录名称
|
6 years ago |
|
wei.peng
|
f9d88b6a93
|
批量删除 提示信息优化
用户登录 登录次数修复
|
6 years ago |
|
wei.peng
|
a47249a925
|
角色添加唯一检查
用户修改Bug 修复
|
6 years ago |
|
yunhao.wang
|
3aa0e7712d
|
日志白名单
|
6 years ago |
|
yunhao.wang
|
e094e9c5ee
|
定时任务异常通知
网关返回信息类型改为 BaseResultBean
添加队列监听开关
|
6 years ago |
|
yunhao.wang
|
b58583602b
|
报表布局 行高,列宽设置
MongoDB id 映射处理
|
6 years ago |
|
wei.peng
|
0bd6389b45
|
配置修改
|
6 years ago |
|
wei.peng
|
548c5a7bc8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
03c1269867
|
模板Pojo 调整
模板 枚举 添加
添加枚举接口
|
6 years ago |
|
wei.peng
|
d8416136f8
|
模板管理生成HTML 完成
|
6 years ago |
|
wei.peng
|
fc9c10f38b
|
模板确认接口完成
模板状态扭转功能完成
|
6 years ago |
|
wei.peng
|
5c0065d975
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
67f061fff9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
84694611c8
|
模板管理 后台功能完成
|
6 years ago |
|
yunhao.wang
|
c49fce4da1
|
文件微服务接口
报表元素 上传图片文件
|
6 years ago |
|
yunhao.wang
|
f929be682f
|
测试邮件发送
|
6 years ago |
|
wei.peng
|
584de18633
|
自定义报表 目录功能 联调完成
|
6 years ago |
|
alwaysfrin
|
3390abe23e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
6f4f22dc1c
|
添加了线程池和消息队列的交换机机制
|
6 years ago |
|
yunhao.wang
|
a4c65f94ec
|
报表元素接口
|
6 years ago |
|
alwaysfrin
|
e2d315c161
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
588e2050b3
|
主键生成策略调整，日志部分调整
|
6 years ago |
|
yunhao.wang
|
57c49e4861
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
edbadd3795
|
解决bug
|
6 years ago |
|
yunhao.wang
|
e1a82e986c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
f7415fe023
|
通用导出
单号规则导入导出
系统参数添加组
|
6 years ago |
|
yunhao.wang
|
7c290b944f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
0aacaa4972
|
解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
|
6 years ago |
|
wei.peng
|
2cf7a85a31
|
Cloud 调整
|
6 years ago |
|
wei.peng
|
bf0a665f99
|
Cloud 熔断时间调整为 30s
|
6 years ago |
|
wei.peng
|
586abcace4
|
系统配置 刷新缓存
|
6 years ago |
|
wei.peng
|
af5a43a4c5
|
用户密码加密侧率功能完成
|
6 years ago |
|
alwaysfrin
|
73629bfd1f
|
添加自定义组件
|
6 years ago |
|
yunhao.wang
|
8d3f36c6eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
e83f3d9bd7
|
用户导出
|
6 years ago |
|
wei.peng
|
b200091f99
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
28745097e8
|
服务调用Bug 解决
|
6 years ago |
|
wei.peng
|
9c31732a94
|
树形结构查列表完成
|
6 years ago |
|
wei.peng
|
ee0bde631e
|
冗余字段更新完成
|
6 years ago |
|
wei.peng
|
b655974259
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
c43c062519
|
合并代码 解决冲突
|
6 years ago |
|
wei.peng
|
76c22a6d4c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
29f82caef7
|
解决bug
|
6 years ago |
|
wei.peng
|
2e7059fada
|
日志功能优化
|
6 years ago |
|
wei.peng
|
ba61957780
|
冗余字段更新完成
|
6 years ago |
|
yunhao.wang
|
e42084ab38
|
定时任务日志完成
解决bug
|
6 years ago |
|
yunhao.wang
|
33a67c4778
|
消息队列
|
6 years ago |
|
yunhao.wang
|
b722602ed5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
9b2e1196b8
|
dashboard优化
bug解决
redis配置
|
6 years ago |
|
wei.peng
|
4bafbb9d4b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
e976efb112
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
24989daf09
|
组织管理父节点Bug 修复
部门管理父节点Bug 修复
复杂查询添加默认排序
|
6 years ago |
|
wei.peng
|
168df43465
|
组织管理父节点Bug 修复
复杂查询添加默认排序
|
6 years ago |
|
alwaysfrin
|
e93b7992cf
|
白名路径
|
6 years ago |
|
alwaysfrin
|
660698802a
|
shiro和redis调整，解决redis管道拥堵问题
|
6 years ago |
|
wei.peng
|
b29724b0f9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
a5f9fc417b
|
账号管理功能更新
|
6 years ago |
|
wei.peng
|
e2b53285c0
|
日志输出优化
|
6 years ago |
|
yunhao.wang
|
3090df32cf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
b827152c41
|
权限Bug 修复
|
6 years ago |
|
yunhao.wang
|
ea314f9364
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
03e569c3b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
ebd75678d4
|
bug解决
|
6 years ago |
|
wei.peng
|
793792c6a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
b9b8484a1a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
5849222d23
|
岗位冗余信息更新
|
6 years ago |
|
yunhao.wang
|
77c5237cc3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
b914aeaa28
|
定时任务重写
|
6 years ago |
|
alwaysfrin
|
9b7c85ff18
|
redis会话优化
|
6 years ago |
|
wei.peng
|
6ec88da286
|
用户重置密码次数限制
|
6 years ago |
|
wei.peng
|
ca4b1ae950
|
获取权限信息Bug 提交
|
6 years ago |
|
alwaysfrin
|
ebdf528d3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
10a3f3a563
|
sid授权调整
|
6 years ago |
|
wei.peng
|
195c2a2dcf
|
用户登录信息封装
|
6 years ago |
|
wei.peng
|
27648112d8
|
根据组织Id 集合、部门ID 集合 查询账号信息
|
6 years ago |
|
wei.peng
|
a6b20f4b59
|
用户管理更新
|
6 years ago |
|
wei.peng
|
ad8f4dc613
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
f7998ab767
|
用户管理更新
|
6 years ago |
|
yunhao.wang
|
4dc6158baf
|
bug解决
添加默认字典项
ics添加全局异常捕获
|
6 years ago |
|
wei.peng
|
3b88af7418
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
13118c8ef5
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
|
6 years ago |
|
wei.peng
|
6817d2fe2e
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
|
6 years ago |
|
wei.peng
|
d1f39edac4
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
|
6 years ago |
|
wei.peng
|
3355ed5f52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
9868b8b647
|
登录Bug 修复， Cloud 连接问题修复
|
6 years ago |
|
yunhao.wang
|
005c30c761
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
e25703f3de
|
定时任务
dashboard
|
6 years ago |
|
wei.peng
|
470759395d
|
添加 Cloud 获取组织或者部门下面的人员信息功能完成
|
6 years ago |
|
wei.peng
|
3c0f585eff
|
菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
|
6 years ago |
|
wei.peng
|
0b6e3d0615
|
更新链接信息
|
6 years ago |
|
wei.peng
|
5bad12a395
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
bdb1d04783
|
更新链接信息
|
6 years ago |
|
wei.peng
|
e16247a7fb
|
更新链接信息
|
6 years ago |
|
wei.peng
|
03a64d6508
|
引用包错误解决
|
6 years ago |
|
wei.peng
|
951b65e289
|
用户菜单权限优化
|
6 years ago |
|
wei.peng
|
9ed732ca0e
|
用户登录权限优化
|
6 years ago |
|
wei.peng
|
3eca86cf18
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
2eab7837a5
|
bug解决
|
6 years ago |
|
yunhao.wang
|
e786d0e7cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
yunhao.wang
|
73985b0437
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java
|
6 years ago |
|
yunhao.wang
|
db337bc2a8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
8e6883b2df
|
bug解决
|
6 years ago |
|
yunhao.wang
|
9aaa7f4f43
|
dev配置
|
6 years ago |
|
yunhao.wang
|
c6e88bf0e6
|
还原
|
6 years ago |
|
yunhao.wang
|
a9ca8ea45b
|
dev配置文件调整
|
6 years ago |
|
alwaysfrin
|
815930bd83
|
处理文件路径
|
6 years ago |
|
alwaysfrin
|
c6f6e99635
|
调整software序号
|
6 years ago |
|
alwaysfrin
|
38c0df1611
|
添加自定义组件
|
6 years ago |
|
wei.peng
|
9bba86fab8
|
数据不存在的时候返回失败
|
6 years ago |
|
wei.peng
|
dee9ce7bb0
|
添加 isChecked
|
6 years ago |
|
wei.peng
|
cdb6eb290b
|
用户登录记录功能完成
|
6 years ago |
|
wei.peng
|
6e0347a873
|
用户登录记录功能完成
|
6 years ago |
|
yunhao.wang
|
5bc9b93bd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
10cc6b0b1d
|
dashboard部分功能
修复bug
|
6 years ago |
|
alwaysfrin
|
e1fedeb9a5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
a9320298b7
|
扩展块功能
|
6 years ago |
|
alwaysfrin
|
518799fb8c
|
优化
|
6 years ago |
|
wei.peng
|
239569aa18
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
e77af7ef7b
|
添加SID 返回信息
|
6 years ago |
|
wei.peng
|
4123856456
|
Merge branch 'dev' into test
|
7 years ago |
|
yunhao.wang
|
cacb6b7e75
|
解决冲突
|
7 years ago |
|
yunhao.wang
|
0f4b6a9ee9
|
解决冲突
|
7 years ago |
|
yunhao.wang
|
69d5a7424d
|
解决冲突
|
7 years ago |
|
wei.peng
|
0074735a07
|
Merge branch 'dev' into test
|
7 years ago |
|
wei.peng
|
d773297f78
|
userInfo.setOrganizeCode(organize.getOrganizeCode());
|
7 years ago |
|
wei.peng
|
6baed9bafa
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
|
7 years ago |
|
wei.peng
|
0bb901bdfc
|
合并代码 解决冲突
|
7 years ago |
|
wei.peng
|
aaa52613ce
|
日志输出格式优化
|
7 years ago |
|
yunhao.wang
|
219f1dde42
|
解决冲突
|
7 years ago |
|
yunhao.wang
|
9829dc9381
|
解决bug
|
7 years ago |
|
wei.peng
|
887e176ba7
|
日志输出优化
统计账号数量优化
|
7 years ago |
|
wei.peng
|
6ecf276183
|
添加 ApiOperation
|
7 years ago |
|
wei.peng
|
0f414fcaeb
|
Junit Test 用户登录问题修复
|
7 years ago |
|
yunhao.wang
|
2c1088a431
|
微服务状态提醒
及部分dashboard
|
7 years ago |
|
alwaysfrin
|
48cfb1fa88
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
|
alwaysfrin
|
18dc8d980d
|
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/websocket/MessageWebSocket.java
|
7 years ago |