273 Commits (yun-zuoyi)

Author SHA1 Message Date
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 4 years ago
wynne1005 db87c0c32f pom版本 5 years ago
钮海涛 b9283ec075 合并dev代码 5 years ago
钮海涛 b57ae573ed 合并test代码 5 years ago
汪云昊 7a6137a667 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 26e1b39119 feat(core):邮件支持附件发送 5 years ago
汪云昊 dceb9b17a5 revert(pojo):还原pom版本 5 years ago
汪云昊 f1ab018d85 feat(softswitch):重试功能 5 years ago
汪云昊 31cdda5b33 feat(softswitch):适配记录,FTP文件支持SID 5 years ago
汪云昊 911f96b60d style(softswitch):调整代码样式 5 years ago
汪云昊 05f493b80e feat(softswitch):添加重试功能 5 years ago
汪云昊 21f77a0e7b fix(softswitch):ftp适配器并发读取文件重复 5 years ago
汪云昊 0d20685a55 fix(softswitch):ftp适配器并发读取文件重复 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
钮海涛 0ce944ec5f Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
汪云昊 d6f4fa7f92 feat(softswitch):添加报文处理状态及处理结果 5 years ago
汪云昊 673c6d0fe2 fix(softswitch):ftp-linux系统中文件读取失败 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
汪云昊 731a92fa2c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 6dc0d94085 feat:适配器添加空报文保存开关 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 18a09cc4b6 FTP多文件读取问题
脚本解析功能初版
5 years ago
王杰 6c5e646d49 test merge master 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
钮海涛 e140910db7 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 50999e49f2 软适配添加原始报文查询 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 26b564f0be FTP 文件编码类型 5 years ago
汪云昊 6c5c726187 REST 服务端适配器支持JSON与XML
FTP 支持增量写入
国际化资源内存缓存
5 years ago
汪云昊 fdd5516a0f FTP适配器优化
表单功能优化
UA 适配 LONG类型
5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
汪云昊 e416b032c2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 4fc8c2a80d 软适配添加适配发送报文 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 5 years ago
wei.peng adb95f100f Ics 日志收集功能完成 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
汪云昊 a4ba058ee3 表单查询条件
Rest是适配器 requestBody
5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
王杰 786c442d55 解决冲突 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 30fcf4f23f pom冲突 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
汪云昊 9532489502 POJO添加序列化id 5 years ago
王杰 a6e9b90026 pom 5 years ago
王杰 de9017ca5c 冲突 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
钮海涛 da8b4db890 修复pom版本问题 5 years ago
汪云昊 0b3d2d6815 软适配REST 适配器调整优化 5 years ago
钮海涛 3fbf532c84 修复pom版本问题 5 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 5 years ago
wei.peng c8197f3290 1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
5 years ago
wynne1005 fb60d75eea 还原test pom 5 years ago
wynne1005 d6fe718e4c Merge branch 'dev' into test 5 years ago
wynne1005 109c4429ce 还原dev pom 5 years ago
汪云昊 edf0b66115 Sonar代码缺陷修复
查询条件优化
拦截器,自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
5 years ago
汪云昊 baaf16ad56 国际化工具类异常处理优化 5 years ago
钮海涛 efe083a9da 修复版本号 5 years ago
钮海涛 288fb4a16b 修改POM版本号 5 years ago
汪云昊 2772ea6a2f Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
5 years ago
汪云昊 8a8c3ee34d pom版本调整 5 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题,暂时先还原为最初方式 5 years ago
汪云昊 aeda8d8287 版本调整 5 years ago
汪云昊 3069c5bf18 查询条件补充 5 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 5 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 5 years ago