826 Commits (001f1145a29affc99adf2b37b37453b740dcb300)

Author SHA1 Message Date
汪云昊 f089942c7b 事件现象基础信息 6 years ago
汪云昊 b656592889 excel工具类优化 6 years ago
汪云昊 10b82dbea2 WMS微服务消息接口调用 6 years ago
汪云昊 90561827e5 excel工具类优化 6 years ago
汪云昊 0b9ed93fc1 redis资源键调整 6 years ago
wei.peng b38009a931 测试环境配置修改 6 years ago
wei.peng 0266c89860 测试环境配置修改 6 years ago
wei.peng 156fc52811 动态查询Cloud 服务基础功能已完成 6 years ago
wei.peng e5e4e5cc2d 动态查询Cloud 服务基础功能已完成 6 years ago
wei.peng ca61c97c90 动态查询Cloud 服务基础功能已完成 1.0 6 years ago
wei.peng c1e6f1ef55 动态查询Cloud 服务基础功能已完成 1.0 6 years ago
汪云昊 9ef91a8c63 解决冲突
细节优化
自定义表单功能管理 添加 是否设计字段
6 years ago
wei.peng 6d38d85d50 增加动态报表对外接口-多条件删除
移除默认属性校验
移除查询数据库所有表的部分字段(部分字段SQLServer不支持)
6 years ago
wei.peng 660ebb056d 增加动态报表对外接口-批量修改 6 years ago
wei.peng 1c0e408f06 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
wei.peng 5923751a2b 动态查询Cloud 服务基础功能已完成 6 years ago
汪云昊 f4e0d6da4d 细节优化
定时任务-公用消息推送
文件大小限制
6 years ago
汪云昊 0ecc7308e2 spring文件上传上限调至10G 6 years ago
wei.peng 67e3ae4ce7 报表 表单打通 6 years ago
汪云昊 bb8cc0971d 优化-字典缓存初始化 6 years ago
汪云昊 6e9af743de 表单布局解决行列数量不准确 6 years ago
wei.peng 96705b6638 自定义拦截器DEMO 完成 6 years ago
汪云昊 667c334531 字典功能优化 6 years ago
汪云昊 cbe588449e 平台字典优化
websocket
6 years ago
wei.peng c8445c0ae5 登录获取组织ID 为Null bug 修复 6 years ago
wei.peng 96f9f3efe2 Docker 配置添加完成 6 years ago
wei.peng c07431e8d7 发布提交 6 years ago
wei.peng 642f841fda 用户获取角色添加状态控制 6 years ago
wei.peng c60e404776 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
汪云昊 cfc2ddbe79 解决WebSocket session并发问题 6 years ago
汪云昊 34e5be9586 WebSocket异常处理 6 years ago
wei.peng b0bc7ecada Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
汪云昊 bc4147fd96 解决WebSocket session并发问题 6 years ago
wei.peng 9dc29aa080 消息获取用户列表数据权限控制 6 years ago
wei.peng acce40f801 数据源 自动切换 Bug 修复 6 years ago
wei.peng e1a224f1a1 FastDfs 添加日志 6 years ago
wei.peng 0384180d4d FastDfs 添加日志 6 years ago
wei.peng 0d8bf92b80 添加中文简写 6 years ago
wei.peng a5bbdcb18b 添加中文简写 6 years ago
wei.peng 3526f9e0b6 工厂数量控制
用户数量控制
6 years ago
wei.peng c785735265 用户数据权限控制 6 years ago
wei.peng 15946e082a 修改用户改动后无法登录登录Bug 6 years ago
汪云昊 daa1379fc4 授权id调整 6 years ago
汪云昊 4a4049c44e 单号获取微服务调用调整 6 years ago
汪云昊 bb6e213900 平台授权id调整 6 years ago
alwaysfrin 6b1620772b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin d54ab69ee5 事务和redis的bug处理 6 years ago
wei.peng 3d110244d7 功能目录导入导出 6 years ago
wei.peng 3dc91ad160 功能目录导入导出 6 years ago
wei.peng 6265ab6f5d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
wei.peng d9f32002ca 初始化功能目录 6 years ago
汪云昊 18e0d0d60a 读写分离 6 years ago
Silliter 739524b3f6 docker配置文件修改 6 years ago
汪云昊 3a083c00c7 读写分离 6 years ago
汪云昊 18b04a720e 长文本数据调整 6 years ago
alwaysfrin f241277bdc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 3fb4018626 事务调整及demo 6 years ago
wei.peng 0e6990d3b7 用户登录完成后设置默认组织 6 years ago
Silliter be7b0c1795 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
Silliter b826dec8b4 开发用户列表微服务接口 6 years ago
wei.peng a325fbf14f 添加会话组织管理 6 years ago
wei.peng 144e86dd90 加密狗 功能开发 6 years ago
wei.peng 1341ab9e64 数据库读写分离dbslave
产品授权添加
6 years ago
汪云昊 3eb83cd6a0 Andon定时任务微服务调用调整 6 years ago
汪云昊 c5f5c5db9f 平台微服务调用调整 6 years ago
yunhao.wang 8baaab8f44 添加批量生成单号接口及微服务调用方法 6 years ago
wei.peng 83f553b90e Docker 配置修改 6 years ago
wei.peng 3d1e97d4ef Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
wei.peng 6eee60bccd 添加注释 6 years ago
yunhao.wang e706e644c5 添加注释 6 years ago
wei.peng 9d7d9a77bc 添加注释 6 years ago
alwaysfrin ebf890d8d4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin ab7cb06923 安灯和硬件适配初始化 6 years ago
wei.peng 5681936c74 Docker 配置添加完成 6 years ago
Rock.Yu 6e7a6120e5 1. 修改 Docker 配置文件 6 years ago
wei.peng 1ca22ff7b9 根据部门获取用户信息接口Bug修复 6 years ago
wei.peng 3ae4cc40b7 配置文件优化 禁止提交配置文件防止环境错乱 6 years ago
wei.peng 53954638fc 配置文件优化 禁止提交配置文件防止环境错乱 6 years ago
汪云昊 f85e081678 更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties' 6 years ago
alwaysfrin 1bdc2cf3f8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin a6301d2d8c 事务持久化调整 6 years ago
yunhao.wang 82b8371747 自定义按钮功能接口
消息优化
6 years ago
wei.peng 4dff4c6fc3 配置更新 6 years ago
alwaysfrin c33076e0a1 配置文件调整 6 years ago
alwaysfrin 839280ed60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin cc17ff9c13 DdlPack,封装bug 6 years ago
yunhao.wang 609c302699 添加用户消息删除接口
添加系统消息微服调用方法
6 years ago
yunhao.wang 0a70f12896 消息细节调整 6 years ago
yunhao.wang 04e77f98b6 添加MES,MES_PCN定时任务及通用微服务调用方法 6 years ago
yunhao.wang 046667f876 sweb公告处理 6 years ago
yunhao.wang db704d7263 SWEB通知队列推送 6 years ago
yunhao.wang 19e4fe21c1 消息队列参数改为json字符串 6 years ago
wei.peng 725ed07621 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
wei.peng 3016839d7a 添加Log 输出 6 years ago
alwaysfrin c6f8e367f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin d5fc84f126 DdlPack,封装bug 6 years ago
yunhao.wang 9e72f9df2e 细节优化 6 years ago
Rock.Yu 0ac2ef2179 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
Rock.Yu cd623dd121 1. 增加 Docker 配置文件 6 years ago
yunhao.wang bc117cc0f4 表单菜单权限接口 6 years ago
wei.peng 97720e02a2 自定义表单拦截器开发1.1完成
优化动态表单页面接口
6 years ago
alwaysfrin f9461369d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang 50f69d91e0 定时任务微服调用方法 6 years ago
yunhao.wang 115e3e64b2 功能表单接口优化 6 years ago
yunhao.wang b4b4820cd4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang 601cc4edd8 平台-用户操作组织修改接口
表单-拦截器添加执行顺序
表单-功能明细前后端联调
6 years ago
Silliter cb36356667 优化打印模板,开发禁用启用接口 6 years ago
yunhao.wang 132e4e341a 消息微服调用优化 6 years ago
yunhao.wang 4ca229997b 表单-布局新增行列设置初始数据
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
6 years ago
yunhao.wang afaf6c8f58 消息附件管理 6 years ago
yunhao.wang dc610d9f00 消息队列配置调整 6 years ago
yunhao.wang 3f7643f0e8 权限分配调整接口
消息调整添加微服务支持
添加sweb通知处理队列
6 years ago
yunhao.wang b37acbfcab 前端联调接口优化
单号生成工具类bug解决
6 years ago
alwaysfrin c802aae056 部分细节调整 6 years ago
wei.peng a44320d7ea 自定义表单 数据操作接口 DAO 层优化 6 years ago
jiajack 52a826058c 删除iml文件 6 years ago
yunhao.wang 8b4600606b 细节优化
bug修复
6 years ago
yunhao.wang cc0e350e73 bug修复 6 years ago
yunhao.wang 733d41578c 表单功能接口优化
文件微服接口优化
自动填充单元测试
6 years ago
Silliter b8a7bde452 打印模板优化 6 years ago
alwaysfrin 8baa8c52c4 hql封装优化 6 years ago
yunhao.wang 4d96152b3e 微服文件管理接口 6 years ago
alwaysfrin 2e66e522f0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 385b321791 hql封装优化 6 years ago
yunhao.wang 6c4bcfccf1 配置文件调整 6 years ago
yunhao.wang 407f4ce0d8 配置文件调整 6 years ago
alwaysfrin 2438ae45cf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin b715eff7e3 优化调整 6 years ago
yunhao.wang 9487810c72 定时任务异常通知测试类 6 years ago
yunhao.wang 841d6e4d10 自定义表单 功能权限管理接口
微服调整 平台角色获取方法调整
6 years ago
alwaysfrin fa6d248ea0 hql封装优化 6 years ago
Silliter c65a86e7cb 优化打印模板 6 years ago
alwaysfrin 0955b9ac13 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 0098aba8c4 shiro会话id优化,自动update赋值优化 6 years ago
yunhao.wang 10c6b8d011 字典添加所属模块 6 years ago
yunhao.wang 06a995ab3e 定时任务优化
表单布局优化
6 years ago
yunhao.wang 96b5fe90ef Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 73776f6c27 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 7f1f76eef2 结构优化调整,自动填充功能调整 6 years ago
yunhao.wang 5e65210d18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang 6bb5aebb66 字典添加默认代码查询接口 6 years ago
Silliter 721f6f576b 优化打印模板 6 years ago
yunhao.wang d656d82622 定时任务优化 6 years ago
alwaysfrin 238cc817da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 0a10d99845 eureka优化调整,exception优化 6 years ago
wei.peng cebc793b53 IP 配置修改 6 years ago
yunhao.wang 05852898c3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin 7c0c97ba61 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang f177a89d34 定时任务优化 6 years ago
alwaysfrin dbcaa33735 eureka优化调整,exception优化 6 years ago
yunhao.wang 73a84c63a9 定时任务计划添加参数 6 years ago
yunhao.wang da76a0a512 自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
6 years ago
yunhao.wang ea0f5ce0f0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang 5161c9cefa 表单报表部分功能
定时任务优化
6 years ago
alwaysfrin b824bf93a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin a67bfdc11a 优化调整 6 years ago
alwaysfrin 87a1666861 优化调整 6 years ago
yunhao.wang eee75ce2e4 jdbc 6 years ago
yunhao.wang 002e863030 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 2d81c898d8 字典微服务调整
定时任务优化
自定义表单实体
6 years ago
wei.peng ace9524733 FindBugs 提示Bug 修改 6 years ago
wei.peng cf0bcf0a40 FindBugs 提示Bug 修改 6 years ago
yunhao.wang 0e26184ff0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang 76c234ced3 字典微服务调整
定时任务优化
6 years ago
Silliter 14e85f58a8 优化条码打印 6 years ago
yunhao.wang b2873e80ae 定时任务微服优化 6 years ago
alwaysfrin 59599bae23 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin b1a6ea2581 添加mes、mes-pcn、sweb三个微服 6 years ago
yunhao.wang fd74559fd8 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang e3454af8f6 字典树查询
单号规则计算优化
字典微服调用方法及调用案例
6 years ago
Silliter 0b67e5b749 开发分页获取用户角色微服务接口 6 years ago
Silliter b853f785a4 条码打印开发,角色微服务提供 6 years ago
Silliter d6f03ed876 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
Silliter 8408ba671c 开发条码打印后端 6 years ago
yunhao.wang 45f7d05eab Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang ffb6a92e48 字典调整 6 years ago
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
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 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 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 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
wei.peng 95a680b5c7 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng f1ed9a004f 文件上传 后缀冗余 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 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