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 |
|
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 |
|
allen.zhang
|
c69d52364f
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
18e0d0d60a
|
读写分离
|
6 years ago |
|
allen.zhang
|
67446e5215
|
Merge branch 'dev' into test
|
6 years ago |
Silliter
|
739524b3f6
|
docker配置文件修改
|
6 years ago |
|
allen.zhang
|
2c15ede4f0
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
3a083c00c7
|
读写分离
|
6 years ago |
|
汪云昊
|
18b04a720e
|
长文本数据调整
|
6 years ago |
|
Silliter
|
234ce910c9
|
core测试环境配置文件修改
|
6 years ago |
|
Silliter
|
7af35bd641
|
Merge branch 'dev' into test
|
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 |
|
jenkins
|
98c655b0c5
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
jenkins
|
fa83993a31
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
a325fbf14f
|
添加会话组织管理
|
6 years ago |
|
wei.peng
|
144e86dd90
|
加密狗 功能开发
|
6 years ago |
|
wei.peng
|
1341ab9e64
|
数据库读写分离dbslave
产品授权添加
|
6 years ago |
|
jenkins
|
c54b4c5155
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
3eb83cd6a0
|
Andon定时任务微服务调用调整
|
6 years ago |
|
jenkins
|
d9ce4fb108
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
c5f5c5db9f
|
平台微服务调用调整
|
6 years ago |
|
jenkins
|
9debf5e04f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
8baaab8f44
|
添加批量生成单号接口及微服务调用方法
|
6 years ago |
|
Silliter
|
333735b7de
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
83f553b90e
|
Docker 配置修改
|
6 years ago |
|
wei.peng
|
df2fb2c7c4
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test
# Conflicts:
# modules/i3plus-block-form/src/main/resources/application-test.properties
# modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
|
6 years ago |
|
wei.peng
|
dfa66046f2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
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 |
|
Silliter
|
578ab55fb2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
5681936c74
|
Docker 配置添加完成
|
6 years ago |
|
jenkins
|
e7bf273f69
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
Rock.Yu
|
6e7a6120e5
|
1. 修改 Docker 配置文件
|
6 years ago |
|
wei.peng
|
8f8c0f3f2b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
8e6c2556a1
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ca22ff7b9
|
根据部门获取用户信息接口Bug修复
|
6 years ago |
|
jenkins
|
d4b84598fb
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
汪云昊
|
a6964950dd
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
1ade313c48
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
6798b62ae9
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
febcd68e3e
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
3306修改为3308
|
6 years ago |
|
jenkins
|
88c3c6b685
|
Merge remote-tracking branch 'origin/dev' into test
|
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
|
8e4a8298a8
|
配置更新
|
6 years ago |
|
wei.peng
|
b01cc47629
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
4dff4c6fc3
|
配置更新
|
6 years ago |
|
Silliter
|
5812b5b7b5
|
合并dev分支代码
|
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 |
|
jenkins
|
1194828efa
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
jenkins
|
1d4d25d1c2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
bc117cc0f4
|
表单菜单权限接口
|
6 years ago |
|
Silliter
|
e5615c77c0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
Silliter
|
57b276e6e0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
50f69d91e0
|
定时任务微服调用方法
|
6 years ago |
|
yunhao.wang
|
034e3b77a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-core-api/i3plus-core-api.iml
# modules/i3plus-core-apiservice/i3plus-core-apiservice.iml
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
|
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 |
|
Silliter
|
89b7bf03df
|
合并代码
|
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
|
d63d31eb11
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application.properties
|
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
|
2a57625b20
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
wei.peng
|
87e15fcd13
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
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 |
|
wei.peng
|
b7bf845853
|
测试环境数据迁移 240
测试环境Redis 迁移 240
测试环境MQ 迁移 240
测试环境 APP 迁移 241
|
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 |
|
Silliter
|
8f7349698d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
10ee0ad5a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
Silliter
|
d3dd40bb86
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
17f9142c03
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
Silliter
|
e5b8641903
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
fd74559fd8
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
e3454af8f6
|
字典树查询
单号规则计算优化
字典微服调用方法及调用案例
|
6 years ago |
|
Silliter
|
cdf0d91389
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
0b67e5b749
|
开发分页获取用户角色微服务接口
|
6 years ago |
|
Silliter
|
b853f785a4
|
条码打印开发，角色微服务提供
|
6 years ago |
|
Silliter
|
9a8c6b99de
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
wei.peng
|
9026617500
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-test.properties
# modules/i3plus-ics-regist/i3plus-ics-regist.iml
返回提示修改
报表打印修改
|
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 |
|
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 |