allen.zhang
|
2c15ede4f0
|
Merge branch 'dev' into test
|
6 years ago |
汪云昊
|
18b04a720e
|
长文本数据调整
|
6 years ago |
jenkins
|
fa83993a31
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
144e86dd90
|
加密狗 功能开发
|
6 years ago |
|
jenkins
|
c54b4c5155
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
3eb83cd6a0
|
Andon定时任务微服务调用调整
|
6 years ago |
Silliter
|
5812b5b7b5
|
合并dev分支代码
|
6 years ago |
|
yunhao.wang
|
04e77f98b6
|
添加MES,MES_PCN定时任务及通用微服务调用方法
|
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 |
alwaysfrin
|
b715eff7e3
|
优化调整
|
6 years ago |
|
wei.peng
|
6baed9bafa
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
|
6 years ago |
|
wei.peng
|
aaa52613ce
|
日志输出格式优化
|
6 years ago |
|
alwaysfrin
|
18dc8d980d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java
|
7 years ago |
|
wei.peng
|
a99527f52e
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
ba940403fa
|
配置文件修改 Test to dev
|
7 years ago |
|
alwaysfrin
|
8d8203aafc
|
结构错误
|
7 years ago |
|
wei.peng
|
b382c5ae00
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
|
wei.peng
|
fcc97cb438
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
74c78570ed
|
项目pom版本更新为dev
|
7 years ago |
|
wei.peng
|
402bca0a8c
|
代码优化
|
7 years ago |
|
alwaysfrin
|
1b8f4c01ba
|
微服调用调整
|
7 years ago |
|
alwaysfrin
|
90141be1fc
|
微服调用测试
|
7 years ago |
|
wei.peng
|
d78f260e13
|
1、初始化导入数据功能完成
|
7 years ago |
frin.fei
|
48b1cec739
|
微服单独划分
|
7 years ago |
|
frin.fei
|
f022c0e529
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
b030508da1
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
d571f2c357
|
eureka、feign整合
|
7 years ago |
|
yunhao.wang
|
ec137693cf
|
定时任务 完成
表达式 完成
邮件工具类
|
7 years ago |
|
alwaysfrin
|
fc5977d180
|
mongodb工具方法，日志部分使用mongo
|
7 years ago |
|
wei.peng
|
e0d52bbf13
|
用户登录功能完成
单元测试 Demo 编写
|
7 years ago |
|
wei.peng
|
646a3a5cb2
|
POM Bug 修复
prop 跨域修改
|
7 years ago |
|
wei.peng
|
3c751ac130
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
alwaysfrin
|
41f15551aa
|
ignore整理
|
7 years ago |
|
wei.peng
|
825795ab0a
|
系统先跑起来
|
7 years ago |
|
alwaysfrin
|
bd09479055
|
平台功能优化
|
7 years ago |
|
alwaysfrin
|
fe08a6ffbd
|
初始化
|
7 years ago |