837 Commits (4ab6b5ef064aab38e5118b28c728aaedcfd938d2)

Author SHA1 Message Date
wei.peng aaf76a00dc 树DEMO 功能完成 6 years ago
wei.peng 540b1faca0 树DEMO 功能完成 6 years ago
wei.peng e89057e452 本地无法启动,更新代码 6 years ago
wei.peng f8862e889f Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 6 years ago
wei.peng 9169fb53e1 FastDfs 超时修改,日志输出调优 6 years ago
wei.peng 48311c063c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test
# Conflicts:
#	src/main/resources/application-dev.properties
数据库配置 show_sql -> false
6 years ago
wei.peng 884f20bc66 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 4919263f81 用户查询功能优化 6 years ago
wei.peng a02ad7a551 表单以及平台Bug 修复 6 years ago
汪云昊 983fbf268e 字典查询子节点接口 6 years ago
汪云昊 c910eafc47 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 97c78467e2 动态表单动态操作 功能优化 6 years ago
汪云昊 fe2372ad33 任务周期修改错误 6 years ago
汪云昊 d2cfe8e675 文件上传优化
字段删除异常
日志添加索引
6 years ago
wei.peng 7110affac4 用户更新的时候更新帐号的冗余信息 6 years ago
wei.peng d425d1259c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 1a90e0efd8 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 f585ea56e4 文件上传接口
excel通用导出优化
6 years ago
wei.peng 265ce168fd 用户单帐号多平台登录 6 years ago
wei.peng 460723a2c1 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 11eadf9c15 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
汪云昊 bb0f8f86c9 文件上传微服务接口优化
excel通用导出优化
任务提示优化
6 years ago
wei.peng e96fd395ff Excel 导入没有清理数据,添加登录平台枚举 6 years ago
汪云昊 c2e658bf9f 邮件异常提示优化
EXCEL数据通用导出
6 years ago
wei.peng 8a3322a7e4 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 6 years ago
wei.peng 01d4c7d70e Fast DFS 上传非空判断 6 years ago
wei.peng 590097a89e Fast DFS 上传非空判断 6 years ago
wei.peng 56cc2cdda7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
wei.peng fc3b9cb701 关闭单帐号单登录 6 years ago
wei.peng 725cfb8ec6 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test
# Conflicts:
#	src/main/resources/application-dev.properties
版本合并  环境标识 test to docker
6 years ago
wei.peng 524b953025 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 6 years ago
汪云昊 5b94a2f002 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 d88d751e89 添加邮件类型 6 years ago
wei.peng 23ba09efce Fast DFS 上传非空判断 6 years ago
汪云昊 bfbf8107a4 重置docker环境配置文件 6 years ago
汪云昊 8734e71bd8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
汪云昊 ed7be29c1c 优化邮箱异常提示 6 years ago
wei.peng c024a7ed98 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 6 years ago
wei.peng 6d342bd44c 数据库链接超时延长 至 5 分钟 6 years ago
汪云昊 d33255ca76 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
jenkins 897a4dfbd4 Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 2a71da6b1a 配置调整 6 years ago
wei.peng 2e5a265847 添加 Redis Util Tool 6 years ago
wei.peng 2cda3ecdaf 安灯 添加跨服务获取帐号列表接口 6 years ago
wei.peng e67b93dd4c 测试环境数据库配置修改 6 years ago
jenkins a73c837b68 Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng 17746e308d 数据库链接配置修改 , 单用户登录. 6 years ago
jenkins 8ae252ef70 Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 f089942c7b 事件现象基础信息 6 years ago
jenkins de23645e3d Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 b656592889 excel工具类优化 6 years ago
jenkins 11fb13ae5b Merge remote-tracking branch 'origin/dev' into test 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 5d636532fc 修改数据库链接参数 6 years ago
wei.peng da58556193 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application.properties
6 years ago
wei.peng 0266c89860 测试环境配置修改 6 years ago
wei.peng 067bab119e 修改数据库链接参数 6 years ago
wei.peng b87e44638f 修改数据库链接参数 6 years ago
wei.peng 25c47cb7f4 修改数据库链接参数 6 years ago
彭伟 fb2136662e 更新 'modules/i3plus-core-apiservice/src/main/resources/application.properties' 6 years ago
wei.peng 9ab7c178f7 Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application.properties
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
jenkins 95671091a2 Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 9ef91a8c63 解决冲突
细节优化
自定义表单功能管理 添加 是否设计字段
6 years ago
jenkins 95a3ba8b0b Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng 6d38d85d50 增加动态报表对外接口-多条件删除
移除默认属性校验
移除查询数据库所有表的部分字段(部分字段SQLServer不支持)
6 years ago
wei.peng 660ebb056d 增加动态报表对外接口-批量修改 6 years ago
jenkins 677b0fa790 Merge remote-tracking branch 'origin/dev' into test 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
jenkins 148dd2ac8a Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 f4e0d6da4d 细节优化
定时任务-公用消息推送
文件大小限制
6 years ago
汪云昊 0ecc7308e2 spring文件上传上限调至10G 6 years ago
allen.zhang ec56ff968d Merge branch 'dev' into test 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
汪云昊 8871725802 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 cbe588449e 平台字典优化
websocket
6 years ago
wei.peng c8445c0ae5 登录获取组织ID 为Null bug 修复 6 years ago
wei.peng dec6086c96 Merge remote-tracking branch 'remotes/origin/dev' into test 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