272 Commits (5197362dc4f0a87810fdf7d722022cc895516da2)

Author	SHA1	Message	Date
汪云昊	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
wynne1005	44696061ee	修改pom文件为最新	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
汪云昊	a76d70851d	软适配 适配记录参数 分页查询	5 years ago
汪云昊	1d9ab80ae8	数据源适配器 - 批量写入优化	5 years ago
汪云昊	d5c1f7a7a3	资源模块数据 ... 模板软删除 软适配list传参	5 years ago
汪云昊	3dd247491a	软件适配器异常信息优化	5 years ago
汪云昊	47fb080742	lac线程超时监控优化 ... Session超时时间参数化 lac添加TaskCheck 日志添加索引	5 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