yanyujia
|
339ad1f58c
|
pom依赖版本问题（暂时性解决）
|
2 years ago |
|
yanyujia
|
487158cf2e
|
Merge branch 'test' into test_les_yujia
|
2 years ago |
|
yanyujia
|
349c615167
|
安全审计和登录数据导出
|
2 years ago |
castle.zang
|
c22fb61322
|
修改core maven的版本管理
|
2 years ago |
|
castle.zang
|
f1ce146e04
|
北京麦格纳--防止sql注入修改请求方式，升级Log4j2到2.18.0
|
3 years ago |
zhang.xw
|
01644081a5
|
Merge branch 'test' into patch-dependency
|
3 years ago |
|
zhang.xw
|
d6f43baf8c
|
jar升级
|
3 years ago |
|
zhang.xw
|
6ced8be8a7
|
cdm
|
3 years ago |
feng.liu
|
877006b683
|
shiro升级：1.8.0->1.9.1
|
3 years ago |
nies
|
724fada6fa
|
升级依赖版本，合并test分支代码
|
3 years ago |
|
nies
|
6e082b66d2
|
增加点击劫持和xss等防护，修改新增人员时密码问题和角色菜单关系时不更新修改时间
|
3 years ago |
|
nies
|
d0c4586e2f
|
升级jackson版本
|
3 years ago |
|
nies
|
f7f4a59927
|
Merge branch 'test' into patch-dependency
|
3 years ago |
|
nies
|
f006f990c8
|
增加fastjson版本判断接口
|
3 years ago |
|
nies
|
d6e12e0363
|
合并代码
|
3 years ago |
|
nies
|
4c49c5c393
|
定时任务新增eam
|
3 years ago |
|
nies
|
feee2c102c
|
新增qms定时任务管理
|
3 years ago |
|
nies
|
0f99680cea
|
升级版本
|
3 years ago |
|
nies
|
ac474431e5
|
完善代码
|
3 years ago |
|
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 |