90 Commits (b0ef5d50c7aa82b866f15a5b5ddaafa3602ac9aa)

Author SHA1 Message Date
nies b0ef5d50c7 core 升级到1.0.0.3版本 3 years ago
castle.zang 417679d1af 冷热数据分离--重构--测试完成 3 years ago
castle.zang 65539ad95d 冷热数据分离--重构 3 years ago
nies 98d428ad4b 升级log4j2版本到2.17.0 3 years ago
nies 79dd162b51 升级log4j2版本为2.15.0 3 years ago
castle.zang 923262ac7c log4j2升级版本 3 years ago
nies 3c95407292 core 升级1.0.0.2版本 4 years ago
wynne1005 32a6a6febf merge dev 4 years ago
wynne1005 715c918abc merge test 还原pom 4 years ago
wynne1005 bb9f3a487e Merge branch 'dev' into test 4 years ago
wynne1005 d9ea9c63ee feat(core): 添加根据组织 查询下面用户接口
添加根据组织 查询下面用户接口
4 years ago
wynne1005 8fecb1f7d8 还原merge pom 4 years ago
wynne1005 f8b6226dc5 fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
4 years ago
wynne1005 c67b054a75 fix(core): 升级mysql controller添加名称
升级mysql controller添加名称
4 years ago
wynne1005 f46e5d0bd7 Merge branch 'dev' into test 4 years ago
wynne1005 762458a1d5 feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
4 years ago
wynne1005 a78890b019 还原core pom 4 years ago
wynne1005 252969cbc9 冲突解决 4 years ago
汪云昊 c8507450f0 fix(core):poi版本问题 4 years ago
wynne1005 c1071277da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 4 years ago
汪云昊 32a14d23d8 fix(core):poi版本问题 4 years ago
wynne1005 4193e956ab 单点登录完成 4 years ago
汪云昊 2b9959b86e Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 7222a53840 feat(sms):平台短信功能 4 years ago
汪云昊 7e7f7ed1ec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 c64d619b0a 企业微信适配 5 years ago
汪云昊 40bc27dfaa 版本还原 5 years ago
汪云昊 7f6559e1af DEV版本还原 5 years ago
汪云昊 2e598ee33f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2b88f3ecf1 ptl调度接口 5 years ago
wei.peng dc488f3200 合并代码
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-console/src/main/resources/application-test.properties.bak
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
#	modules/i3plus-ics-gateway/src/main/resources/application-prod.properties
#	modules/i3plus-ics-gateway/src/main/resources/application-test.properties.bak
#	modules/i3plus-ics-gateway/src/main/resources/application.properties
#	modules/i3plus-ics-regist/src/main/resources/application-docker.properties
#	modules/i3plus-ics-regist/src/main/resources/application-test.properties.bak
#	modules/i3plus-ics-regist/src/main/resources/application.properties
5 years ago
汪云昊 55f8468be2 MDM基础功能 5 years ago
wei.peng 98e91b5411 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
贾文涛 a175b34a7e sonar代码检查增加单元测试覆盖率处理 5 years ago
wei.peng cb60879c72 pom DEV -> TEST 5 years ago
wei.peng 6544b76276 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
wei.peng 45cb63a4d4 Es 版本 5 years ago
贾文涛 0f9ec0bbb2 pom通过变量方式存在只能引用jar不能引用到项目文件的问题,暂时先还原为最初方式 5 years ago
汪云昊 929c0ad79e MAVEN 版本控制调整 5 years ago
贾文涛 d521e0c256 统一修改pom文件的项目版本问题 5 years ago
汪云昊 b43b2e9f19 Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application.properties
#	pom.xml
5 years ago
贾文涛 be20e5fc1f 修改打包时版本号的定义,后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
汪云昊 261524c9db sqlserver 数据库适配 5 years ago
汪云昊 eb2a68144c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 93b1479613 打印模板添加筛选条件 6 years ago
曾贞一 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