 曾贞一
|
48ec96da9a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
汪云昊
|
ce896c80d0
|
oracle ojdbc版本调整
|
6 years ago |
jenkins
|
677b0fa790
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
5923751a2b
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
wei.peng
|
dec6086c96
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
6265ab6f5d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
d9f32002ca
|
初始化功能目录
|
6 years ago |
allen.zhang
|
2c15ede4f0
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
3a083c00c7
|
读写分离
|
6 years ago |
|
汪云昊
|
18b04a720e
|
长文本数据调整
|
6 years ago |
|
jenkins
|
98c655b0c5
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
Silliter
|
561f28b06f
|
pom文件优化
|
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 |
alwaysfrin
|
839280ed60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
cc17ff9c13
|
DdlPack，封装bug
|
6 years ago |
|
yunhao.wang
|
04e77f98b6
|
添加MES,MES_PCN定时任务及通用微服务调用方法
|
6 years ago |
|
wei.peng
|
a99527f52e
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
ba940403fa
|
配置文件修改 Test to dev
|
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 |
|
wei.peng
|
850ea37153
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
74c78570ed
|
项目pom版本更新为dev
|
7 years ago |
|
alwaysfrin
|
1b8f4c01ba
|
微服调用调整
|
7 years ago |
|
alwaysfrin
|
90141be1fc
|
微服调用测试
|
7 years ago |
|
alwaysfrin
|
49940fd6a6
|
spring gateway添加
细节调整
|
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
|
89f13b93b4
|
eureka、feign整合
|
7 years ago |
|
yunhao.wang
|
ec137693cf
|
定时任务 完成
表达式 完成
邮件工具类
|
7 years ago |
|
frin.fei
|
fc53c7d454
|
微服调整
|
7 years ago |
|
yunhao.wang
|
984d2dd7b3
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
|
7 years ago |
|
yunhao.wang
|
0fa2a4c605
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
|
7 years ago |
|
alwaysfrin
|
d7017351e7
|
日志分析工具
|
7 years ago |
|
alwaysfrin
|
fc5977d180
|
mongodb工具方法，日志部分使用mongo
|
7 years ago |
|
wei.peng
|
e0d52bbf13
|
用户登录功能完成
单元测试 Demo 编写
|
7 years ago |
|
alwaysfrin
|
41f15551aa
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
e002108f25
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java
|
7 years ago |
|
alwaysfrin
|
ebe644944d
|
ignore整理
|
7 years ago |
|
wei.peng
|
825795ab0a
|
系统先跑起来
|
7 years ago |
|
alwaysfrin
|
7368b04ccd
|
国家化封装
|
7 years ago |
|
wei.peng
|
a89ef37c18
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
fe08a6ffbd
|
初始化
|
7 years ago |