jenkins
|
594577cc69
|
Jenkins自动合并
|
6 years ago |
汪云昊
|
8093290bad
|
lac任务检查
|
6 years ago |
WYnneaoapc
|
569c2613fe
|
Merge branch 'dev' into test
|
6 years ago |
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
6 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
6 years ago |
 王杰
|
7287aaeb77
|
其他组未提交的代码
|
6 years ago |
|
汪云昊
|
20ccf65c5c
|
资源加载优化
|
6 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
6 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
6 years ago |
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
79377f2da6
|
任务检查相关接口
|
6 years ago |
|
汪云昊
|
47fb080742
|
lac线程超时监控优化
Session超时时间参数化
lac添加TaskCheck
日志添加索引
|
6 years ago |
|
王杰
|
e09345984d
|
更新 'modules/i3plus-pojo-lac/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
汪云昊
|
f5a0f24355
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
3faa679cf9
|
Job测试
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
|
6 years ago |
|
王杰
|
09cf450156
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
3856a6d600
|
LAC调整微服务指令集操作方式
OPC UA工具订阅方式调整
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9f9c095846
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c4ed0f1f37
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
12ba5d2ff3
|
lac微服务模式优化
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
4be5d5e1aa
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
8f07751100
|
LAC 日志记录查询完成
|
6 years ago |
|
王杰
|
64d631c180
|
Merge branch 'test'
|
6 years ago |
|
汪云昊
|
f95482501b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
efea8980e7
|
解除冲突
|
6 years ago |
|
汪云昊
|
5a2a2a5e8d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
|
6 years ago |
|
jenkins
|
092f72872b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
4b17995206
|
LAC 日志记录Cache 完成
|
6 years ago |
|
汪云昊
|
b4976be85e
|
LAC执行流程调试
UA订阅次数问题
|
6 years ago |
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
汪云昊
|
7cb9ffd37b
|
Lac细节优化
OPC调整
|
6 years ago |
|
jenkins
|
3d8421e1ec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
aab18be0e6
|
Lac细节优化
OPC调整
|
6 years ago |
|
汪云昊
|
423d8d2c03
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
|
汪云昊
|
053b3ae0e4
|
LAC 前端联调调整
|
6 years ago |
|
crish
|
c4d7a2380c
|
Merge branch 'test'
|
6 years ago |
许心洁
|
9755e5f751
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
da7ba77dab
|
LAC 跨服务调用软适配接口完成
|
6 years ago |
|
王杰
|
d2c7a81893
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
23f0503454
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
0ba20f0094
|
LAC 日志查询接口功能完成
|
6 years ago |
陆卫豪
|
07a80e7fd2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
0d777d1894
|
LAC 日志处理功能完成
|
6 years ago |
|
wei.peng
|
b963bcb502
|
LAC 日志处理功能完成
|
6 years ago |
|
汪云昊
|
154bba4b3b
|
LAC 调度模式优化
|
6 years ago |
|
王杰
|
2417b40635
|
Merge branch 'dev' into test
|
6 years ago |