wynne1005
|
44696061ee
|
修改pom文件为最新
|
6 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
6 years ago |
 贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
 曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
6 years ago |
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
汪云昊
|
a76d70851d
|
软适配 适配记录参数 分页查询
|
6 years ago |
|
汪云昊
|
1d9ab80ae8
|
数据源适配器 - 批量写入优化
|
6 years ago |
|
汪云昊
|
d5c1f7a7a3
|
资源模块数据
模板软删除
软适配list传参
|
6 years ago |
|
汪云昊
|
3dd247491a
|
软件适配器异常信息优化
|
6 years ago |
|
汪云昊
|
47fb080742
|
lac线程超时监控优化
Session超时时间参数化
lac添加TaskCheck
日志添加索引
|
6 years ago |
|
汪云昊
|
bc5beeba7d
|
添加适配记录索引
|
6 years ago |
 王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
汪云昊
|
56381b76f1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
26e7f975bf
|
数据源适配器支持IN
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
汪云昊
|
68f31721f0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
2ad6d16684
|
参数重复校验错误
|
6 years ago |
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
jenkins
|
3d8421e1ec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
423d8d2c03
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
crish
|
0526da8ee3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
|
许心洁
|
7863325afd
|
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
|
6 years ago |
|
许心洁
|
b7b78b85ac
|
误拉了test分支的代码：还原
|
6 years ago |
|
汪云昊
|
52a5fe74af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
95a354f537
|
解决无法处理bug
|
6 years ago |
刘辉
|
722146acd8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
9ac327e622
|
细节调整
|
6 years ago |
|
汪云昊
|
f3867c64f4
|
软适配微服务接口
|
6 years ago |
|
crish
|
0924810e64
|
Merge branch 'test'
|
6 years ago |
|
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
de685a0627
|
删除pojo数据默认值
|
6 years ago |
|
许心洁
|
1e41ab2e39
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
wei.peng
|
cecd37a1e7
|
添加Xml 工具
|
6 years ago |
|
许心洁
|
1d17198daf
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
d8c740819c
|
FTP适配器
|
6 years ago |
|
许心洁
|
7a403a37da
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
3b46d242a7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
汪云昊
|
d830c78d03
|
FTP适配器
|
6 years ago |
|
wei.peng
|
c0fc2c36bf
|
Socket 适配器完成
MQ 适配器完成
|
6 years ago |
|
crish
|
9ae6ee5016
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
790c0b4ec6
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c10bf2e3e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
0b8bc114bc
|
服务端调整
|
6 years ago |
|
曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
|
wei.peng
|
41588f37d7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
c6badc59c6
|
适配记录添加id参数
|
6 years ago |
于学杰
|
f6bb2ee21f
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
564deb4d6b
|
适配记录及数据库适配器
|
6 years ago |
|
jenkins
|
ee979c6e02
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
9caf9a4458
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
2f904f9eee
|
数据库适配器
|
6 years ago |
jimmy.zeng
|
d23045a667
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
a86f2e49c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
51974a46b9
|
WebService 调用发送邮件测试
|
6 years ago |
|
crish
|
35beb0c60e
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
40a2a789be
|
参数描述调整
|
6 years ago |
|
wei.peng
|
1661e4e0a9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
|
6 years ago |
|
汪云昊
|
8b0e851eb8
|
数据源适配套件相关接口
|
6 years ago |
|
wei.peng
|
2c6b223628
|
软适配客户端代码结构调整。
|
6 years ago |
|
汪云昊
|
f718a5dac5
|
excel通用导入优化
|
6 years ago |
|
汪云昊
|
eeff3517c6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
|
6 years ago |
|
汪云昊
|
07688db533
|
软适配实体
|
6 years ago |
|
汪云昊
|
f2e2dd1670
|
软件适配器 数据源适配器
单号生成高并发优化
|
6 years ago |
|
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
b899c5c8c5
|
软适配 WebService 功能接口开发
|
6 years ago |
|
wei.peng
|
e921bb72d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
wei.peng
|
5b200f824f
|
软适配 WebService 功能开发
|
6 years ago |
|
汪云昊
|
029d7eac62
|
软适配model
|
6 years ago |
|
许心洁
|
04f8aaa783
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
eadb86ce60
|
excel通用导入优化
|
6 years ago |
|
曾贞一
|
ae12af551b
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
1b06c1d07f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
2325d18660
|
软件适配器 认证参数接口
|
6 years ago |
|
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
wei.peng
|
f6b49bf31a
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
9bea065f35
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
d7b0f30d91
|
IMPP 平台功能功能优化 . 软适适配功能开发
|
6 years ago |
|
jimmy.zeng
|
a2a4dc6beb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
7eed51791f
|
软件适配器-定时适配任务
|
6 years ago |
|
曾贞一
|
7fab9a4d89
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
0d532b78c0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
02d60ed1a8
|
软件适配器-数据适配转换
|
6 years ago |
|
汪云昊
|
b9d9d7402e
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
41efa29098
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
718ec36747
|
POJO 合并
|
6 years ago |
|
wei.peng
|
41aff3b560
|
``
|
6 years ago |
|
jimmy.zeng
|
7002ac5a8a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f5c0ca9383
|
软适配模型调整
|
6 years ago |
|
jimmy.zeng
|
b0d2812778
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
42f067b987
|
软适配参数接口
|
6 years ago |
|
曾贞一
|
fbe8544a02
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
eb035aeaf6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
05b9298dec
|
软适配Repository初始化
|
6 years ago |
|
曾贞一
|
cef48801df
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
7455c6c640
|
软适配配置文件初始化
|
6 years ago |
|
汪云昊
|
f82011cf5b
|
实体
|
6 years ago |
|
汪云昊
|
dc78cf114f
|
实体
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
|
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
peter.pan
|
363d521c36
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
bda52f76c6
|
软适配 Json 请求适配完成
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
7 years ago |
jiajack
|
3a5f43f97b
|
删除iml文件
|
7 years ago |
|
yunhao.wang
|
0171439464
|
版本发布 2019年3月26日22:47:53
|
7 years ago |
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
alwaysfrin
|
ea2eb6103d
|
优化调整
|
7 years ago |
|
yunhao.wang
|
adfe3cb2e6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
wei.peng
|
ef6d24682e
|
自定义报表 代码优化
软适配 项目初始化增删改
|
7 years ago |
|
wei.peng
|
8ba027cff5
|
DEV to TEST
|
7 years ago |
|
alwaysfrin
|
f775968194
|
扩展块功能
|
7 years ago |