汪云昊
|
c2d32ddb9e
|
异常枚举类更新
|
5 years ago |
|
汪云昊
|
beec05de19
|
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/configuration/AppStartSystemInit.java
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java
|
5 years ago |
|
汪云昊
|
a401687449
|
缺失资源接口优化
|
5 years ago |
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 |
|
汪云昊
|
acae46c408
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
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 |
|
汪云昊
|
483d88812f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
5 years ago |
|
汪云昊
|
e5b2bfe2ba
|
未翻译资源优化
|
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 |
|
汪云昊
|
31f1bd21c0
|
资源缓存key规则调整
|
5 years ago |
|
汪云昊
|
e47d7de18a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
db19be9c3e
|
资源缓存key规则调整
|
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 |
|
wei.peng
|
613c4d4ade
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/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 |
|
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 |
|
汪云昊
|
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 |
|
汪云昊
|
261524c9db
|
sqlserver 数据库适配
|
5 years ago |
jenkins
|
9d00e8db32
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
b790f29c83
|
资源唯一校验调整为key+languageCode+softType
|
5 years ago |
|
jenkins
|
9c6c862a59
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
560678f21c
|
添加 Mongo DB 开关
|
5 years ago |
|
jenkins
|
5bf534eba4
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
922e715807
|
用户白名单查询接口-
|
5 years ago |
|
jenkins
|
788bc29c9d
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
001f1145a2
|
资源导出与增量导出优化
|
5 years ago |
|
jenkins
|
91890944f0
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
c2d1d786a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
5 years ago |
|
wei.peng
|
c29b5c7a87
|
自定义报表 调用调整
|
5 years ago |
|
jenkins
|
b0329fde7f
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
e348bd909a
|
资源模块数据去重bug
|
5 years ago |
|
jenkins
|
42be566f64
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
6b15fcc83a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
5 years ago |
|
汪云昊
|
5accf981ca
|
资源导出与增量导出优化
|
5 years ago |
|
jenkins
|
f5b2047b95
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
22c1e27131
|
自定义表单功能优化
|
5 years ago |
|
jenkins
|
96ca8df39e
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
7b78ebb791
|
资源模块 优化缓存key
|
5 years ago |
|
jenkins
|
9c794cae2c
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
9f924df9b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
c82a3e24ef
|
软适配 报文微服务接口优化
平台压力测试接口
OPCUA工具优化
|
5 years ago |
|
wei.peng
|
10834f4a61
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
wei.peng
|
6e17755a7c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
5 years ago |
|
wei.peng
|
b61b59ff76
|
日志存储优化
|
5 years ago |
|
jenkins
|
f92fd8705e
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
e14006489d
|
资源去重
批量导入优化
|
5 years ago |
|
jenkins
|
a70c91a2b4
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
4b240a0d79
|
资源模块数据 缓存条件变更
|
5 years ago |
|
jenkins
|
46f80b9ec9
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
0958b06552
|
资源模块数据
|
5 years ago |
|
wei.peng
|
38d5bc10da
|
账号查询 Bug 修复
|
5 years ago |
|
jenkins
|
b07d0b0d7b
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
5d154f05eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
5 years ago |
|
wei.peng
|
0a3db523a0
|
合并代码 2019年12月30日16:08:19
|
5 years ago |
|
汪云昊
|
1b86018f11
|
资源加载优化
|
5 years ago |
|
wei.peng
|
fe20003918
|
自定义报表 结构调整
|
5 years ago |
|
wei.peng
|
02171105fe
|
Swagger 注解使用调整
|
5 years ago |
|
jenkins
|
71d431dbd1
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
0f19f9d4ab
|
文件乱码
|
5 years ago |
|
汪云昊
|
c5d6607760
|
资源加载优化
|
5 years ago |
|
jenkins
|
ad13e409dd
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
4ef23b28e5
|
资源模块数据
模板软删除
软适配list传参
|
5 years ago |
|
jenkins
|
ba2b229a3f
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
e2970d6b27
|
资源导入优化
|
5 years ago |
|
jenkins
|
25531640e5
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
f0fffac2a8
|
·
|
5 years ago |
|
汪云昊
|
a97983a819
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
fe49dd6e01
|
会话文件展示地址封装
|
5 years ago |