1104 Commits (3748b554a18a4588046b1626deb88940106c3538)
 

Author SHA1 Message Date
wei.peng 3748b554a1 合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
5 years ago
wei.peng 4b0fb3bc25 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test 5 years ago
wei.peng 25fcebd5fc 授权加密问题修复 5 years ago
wei.peng 3d131a9815 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 5 years ago
wei.peng eb8e823194 启动加载优化 5 years ago
wei.peng 94e62a1aa2 合并代码
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
5 years ago
wei.peng 1df00af97c 熔断配置调整
Mongol 配置调整
5 years ago
wei.peng ff681162df 合并代码 5 years ago
wei.peng 935316241f 对象历史记录 Pojo 创建 5 years ago
wei.peng bc735ab7c4 1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
5 years ago
wei.peng e5c31e3531 日志查询Bug 修复 5 years ago
wei.peng 1bd9fe9e06 授权获取优化,启动加载授权 5 years ago
wei.peng cd74a32e58 1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
5 years ago
wei.peng 9e83ffa513 Bug 修复 5 years ago
wei.peng 12aa1482cf Bug 修复 5 years ago
汪云昊 bb7fa4dd83 Merge branch 'dev' of yunhao.wang/i3plus-core into dev 5 years ago
汪云昊 31f1bd21c0 资源缓存key规则调整 5 years ago
汪云昊 e47d7de18a Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 3f3adc8845 Merge branch 'dev' of yunhao.wang/i3plus-core into dev 5 years ago
汪云昊 db19be9c3e 资源缓存key规则调整 5 years ago
汪云昊 bf7169d287 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 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
彭伟 5f9399ad88 Merge branch 'dev' of wei.peng/i3plus-core into dev 5 years ago
wei.peng 45cb63a4d4 Es 版本 5 years ago
wei.peng 613c4d4ade Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 5 years ago
汪云昊 340c0a160f Merge branch 'dev' of yunhao.wang/i3plus-core into dev 5 years ago
汪云昊 f9437464f0 缺失资源管理功能 5 years ago
wei.peng 531dc97d36 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 5 years ago
贾文涛 0f9ec0bbb2 pom通过变量方式存在只能引用jar不能引用到项目文件的问题,暂时先还原为最初方式 5 years ago
汪云昊 d59859a882 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
wei.peng 52f81dd65f 自定义报表-折线图,饼图,柱状图,矩形图 完成 5 years ago
汪云昊 69e6a1a4ad 版本调整 5 years ago
汪云昊 9b949f7719 查询条件补充 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
汪云昊 3fbc2febd2 Merge branch 'dev' of yunhao.wang/i3plus-core into dev 5 years ago
汪云昊 76ffd402f2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 5 years ago
汪云昊 45873bea1a 资源模块化
资源工具类优化
5 years ago
贾文涛 be20e5fc1f 修改打包时版本号的定义,后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
wei.peng 95eadae8c7 授权拦截功能完成 . 5 years ago
wei.peng 80b7193551 Dashboard 日志查询完成 5 years ago
wei.peng 1da559dd7a Bug 修复 5 years ago
wei.peng 92758d80e0 日志查询优化, Es Tool 添加 聚合函数 5 years ago
wei.peng 88fe498fea 表格查询功能完成 5 years ago
wei.peng cf4506b475 Es 工具封装 5 years ago
wei.peng 6ffb1685d7 Es 工具封装 5 years ago
wei.peng 5dd3f6a38a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 5 years ago
wei.peng a07ad4e519 提交代码 5 years ago