 贾文涛
|
0f9ec0bbb2
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
6 years ago |
wei.peng
|
52f81dd65f
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
6 years ago |
汪云昊
|
69e6a1a4ad
|
版本调整
|
6 years ago |
|
汪云昊
|
9b949f7719
|
查询条件补充
|
6 years ago |
|
汪云昊
|
929c0ad79e
|
MAVEN 版本控制调整
|
6 years ago |
|
贾文涛
|
d521e0c256
|
统一修改pom文件的项目版本问题
|
6 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
|
6 years ago |
|
汪云昊
|
76ffd402f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
45873bea1a
|
资源模块化
资源工具类优化
|
6 years ago |
|
贾文涛
|
be20e5fc1f
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
|
wei.peng
|
95eadae8c7
|
授权拦截功能完成 .
|
6 years ago |
|
wei.peng
|
80b7193551
|
Dashboard 日志查询完成
|
6 years ago |
|
wei.peng
|
1da559dd7a
|
Bug 修复
|
6 years ago |
|
wei.peng
|
92758d80e0
|
日志查询优化, Es Tool 添加 聚合函数
|
6 years ago |
|
wei.peng
|
88fe498fea
|
表格查询功能完成
|
6 years ago |
|
wei.peng
|
cf4506b475
|
Es 工具封装
|
6 years ago |
|
wei.peng
|
6ffb1685d7
|
Es 工具封装
|
6 years ago |
|
wei.peng
|
5dd3f6a38a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
a07ad4e519
|
提交代码
|
6 years ago |
|
汪云昊
|
261524c9db
|
sqlserver 数据库适配
|
6 years ago |
jenkins
|
9d00e8db32
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
b790f29c83
|
资源唯一校验调整为key+languageCode+softType
|
6 years ago |
|
jenkins
|
9c6c862a59
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
560678f21c
|
添加 Mongo DB 开关
|
6 years ago |
|
jenkins
|
5bf534eba4
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
922e715807
|
用户白名单查询接口-
|
6 years ago |
|
jenkins
|
788bc29c9d
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
001f1145a2
|
资源导出与增量导出优化
|
6 years ago |
|
jenkins
|
91890944f0
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
c2d1d786a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
c29b5c7a87
|
自定义报表 调用调整
|
6 years ago |
|
jenkins
|
b0329fde7f
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
e348bd909a
|
资源模块数据去重bug
|
6 years ago |
|
jenkins
|
42be566f64
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
6b15fcc83a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
5accf981ca
|
资源导出与增量导出优化
|
6 years ago |
|
jenkins
|
f5b2047b95
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
22c1e27131
|
自定义表单功能优化
|
6 years ago |
|
jenkins
|
96ca8df39e
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
7b78ebb791
|
资源模块 优化缓存key
|
6 years ago |
|
jenkins
|
9c794cae2c
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
9f924df9b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
c82a3e24ef
|
软适配 报文微服务接口优化
平台压力测试接口
OPCUA工具优化
|
6 years ago |
|
wei.peng
|
10834f4a61
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
6e17755a7c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
b61b59ff76
|
日志存储优化
|
6 years ago |
|
jenkins
|
f92fd8705e
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
e14006489d
|
资源去重
批量导入优化
|
6 years ago |
|
jenkins
|
a70c91a2b4
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
4b240a0d79
|
资源模块数据 缓存条件变更
|
6 years ago |
|
jenkins
|
46f80b9ec9
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
0958b06552
|
资源模块数据
|
6 years ago |
|
wei.peng
|
38d5bc10da
|
账号查询 Bug 修复
|
6 years ago |
|
jenkins
|
b07d0b0d7b
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
5d154f05eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
0a3db523a0
|
合并代码 2019年12月30日16:08:19
|
6 years ago |
|
汪云昊
|
1b86018f11
|
资源加载优化
|
6 years ago |
|
wei.peng
|
fe20003918
|
自定义报表 结构调整
|
6 years ago |
|
wei.peng
|
02171105fe
|
Swagger 注解使用调整
|
6 years ago |
|
jenkins
|
71d431dbd1
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
0f19f9d4ab
|
文件乱码
|
6 years ago |
|
汪云昊
|
c5d6607760
|
资源加载优化
|
6 years ago |
|
jenkins
|
ad13e409dd
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
4ef23b28e5
|
资源模块数据
模板软删除
软适配list传参
|
6 years ago |
|
jenkins
|
ba2b229a3f
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
e2970d6b27
|
资源导入优化
|
6 years ago |
|
jenkins
|
25531640e5
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
f0fffac2a8
|
·
|
6 years ago |
|
汪云昊
|
a97983a819
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
fe49dd6e01
|
会话文件展示地址封装
|
6 years ago |
|
汪云昊
|
ed44b5c5ae
|
资源查询泛型
|
6 years ago |
|
汪云昊
|
bee313ca39
|
资源查询添加requestBody
|
6 years ago |
|
jenkins
|
cce073f575
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
f53bbf4a53
|
资源接口
|
6 years ago |
|
汪云昊
|
0a611e804e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
41caae6e04
|
资源增量导入优化
|
6 years ago |
|
汪云昊
|
bdca81cd58
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
d8f50038ed
|
优化mq日志等级
|
6 years ago |
|
汪云昊
|
cc59162c14
|
增量导入
|
6 years ago |
|
jenkins
|
124f4a275e
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
7d9c551129
|
语言资源初始化位置调整
|
6 years ago |
|
汪云昊
|
ff786035e6
|
Excel导入导出工具优化
|
6 years ago |
|
jenkins
|
5a44316918
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
91e94d7fd1
|
文件及资源工具优化
|
6 years ago |
|
汪云昊
|
b1e0501191
|
文件及资源工具优化
|
6 years ago |
|
汪云昊
|
8a814612e9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
889a2bbf86
|
日志清除job
|
6 years ago |
|
jenkins
|
ece1eec7ae
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
8355ee89d0
|
资源批量新增未初始化
|
6 years ago |
|
汪云昊
|
8d86ffdab8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
e2a25ecf2f
|
解除冲突
|
6 years ago |
|
汪云昊
|
68c7b90cf5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
b11989a0c6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
5488fa1f81
|
Job测试
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
|
6 years ago |
|
wei.peng
|
7697d78c25
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
d961db07ef
|
雪花ID 生成器 改为prop 配置
|
6 years ago |
|
汪云昊
|
1cd5bbeb9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
296b553d84
|
用户权限Bug 修复
|
6 years ago |
|
wei.peng
|
460232f330
|
功能菜单国际化 完成
|
6 years ago |
|
wei.peng
|
da490cef12
|
模板修改功能删除字段 bug 修复
|
6 years ago |
|
汪云昊
|
1cea3efd97
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
462b930d2a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
eb2ab39905
|
功能权限国际完成
|
6 years ago |
|
wei.peng
|
e19ac01628
|
功能权限 国际化 开机启动
|
6 years ago |
|
汪云昊
|
a374402944
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
b444a83f5f
|
LAC调整微服务指令集操作方式
OPC UA工具订阅方式调整
|
6 years ago |
|
wei.peng
|
ee01e5e822
|
功能权限国际完成
|
6 years ago |
|
wei.peng
|
ef41d94ea2
|
功能权限 倒入导出 添加产品类型校验
|
6 years ago |
|
wei.peng
|
5a50d231ad
|
功能权限国际完成
|
6 years ago |
|
汪云昊
|
76edae3eb7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
4c2639efe4
|
添加系统配置接口
|
6 years ago |
|
汪云昊
|
e7425cc5d9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f1a7bb0063
|
Excel导出最多行数取值错误
定时任务及Excel导入导出优化
|
6 years ago |
|
wei.peng
|
9680b64a5a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
30722cd53c
|
Core 服务 用户查询优化
|
6 years ago |
|
汪云昊
|
66a28a1360
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
ba11bf2125
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
|
汪云昊
|
a399834960
|
LAC 前端联调调整
|
6 years ago |
|
汪云昊
|
0b870408a9
|
移除资源重载方法
|
6 years ago |
|
wei.peng
|
8fc2bc4a6f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
717069660b
|
Log4j 配置文件优化
|
6 years ago |
|
wei.peng
|
78fa8fa075
|
添加查询账号接口
|
6 years ago |
|
wei.peng
|
5584f2e01d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
e582bfc4ba
|
软适配微服务接口
|
6 years ago |
|
汪云昊
|
03fcb24389
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
2c1fee7cb2
|
打印模板取消必填校验
|
6 years ago |
|
汪云昊
|
eb2a68144c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
93b1479613
|
打印模板添加筛选条件
|
6 years ago |
|
汪云昊
|
ed59c28f84
|
FTP适配器
|
6 years ago |
|
jenkins
|
4df1b25ed1
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
ca6cb7f611
|
适配记录添加id参数
|
6 years ago |
jimmy.zeng
|
79c39e9f8a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
ef8099c70e
|
系统菜单默认排序值改动
|
6 years ago |
|
汪云昊
|
fc0615c21b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
147bb61f76
|
excel通用导入优化
|
6 years ago |
|
汪云昊
|
fa72dc94ea
|
国际化资源获取
|
6 years ago |
|
jenkins
|
cfff526bd9
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
7798fd60b7
|
异常信息国际化
|
6 years ago |
|
汪云昊
|
fe9fe00eb3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
c4011ae4df
|
软件适配器 数据源适配器
单号生成高并发优化
|
6 years ago |
|
wei.peng
|
4bfc121189
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
f640e3af69
|
自定义表单-同步对象功能优化
自定义表单-动态页面数据导出
|
6 years ago |
|
汪云昊
|
809c899bd6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
24ff03d659
|
立即刷新任务
|
6 years ago |
|
汪云昊
|
493daf78aa
|
立即刷新任务
|
6 years ago |
|
wei.peng
|
3b7e1f782a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
b405c86bdb
|
微服务配置调整。
|
6 years ago |
|
wei.peng
|
36b15ccf0b
|
合并代码
|
6 years ago |
|
wei.peng
|
0667bc76b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
2e047d0978
|
微服务配置调整。
|
6 years ago |
 曾贞一
|
48ec96da9a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
5fe0105c33
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
09a4d94143
|
用户默认分页配置功能开发
用户获取首页插件Bug 修复
|
6 years ago |
|
wei.peng
|
66a68731c9
|
修复Bug 修改部门信息 组织信息不改变
|
6 years ago |
|
汪云昊
|
13403a35cc
|
周期修改关联数据
|
6 years ago |
crish
|
ba470d5ea2
|
获取core服务打印模板信息， 返回值添加具体泛型类型
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
fdfe282e8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
ce896c80d0
|
oracle ojdbc版本调整
|
6 years ago |
|
crish
|
570bf2ec14
|
条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
汪云昊
|
221eaa3e89
|
模板打印数据，加入白名单
|
6 years ago |
|
汪云昊
|
dc45feb6d7
|
模板打印数据，加入白名单
|
6 years ago |
|
汪云昊
|
08d2888087
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
|
6 years ago |
|
汪云昊
|
7ca830ae71
|
模板打印数据，加入白名单
|
6 years ago |
|
wei.peng
|
6f31a8849a
|
合并代码
|
6 years ago |
|
wei.peng
|
4461f9298e
|
获取模板详情列表功能接口开发完成
|
6 years ago |
|
wei.peng
|
910cd25d8f
|
异常国际化功能开发完成
|
6 years ago |
|
wei.peng
|
a7d2a584c2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
91d791960a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
a7f7b89365
|
获取模板 微服务调用重新编写
|
6 years ago |
|
crish
|
bb386b5032
|
权限测试
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
wei.peng
|
97c339598b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
crish
|
a50e6d7e63
|
获取平台打印模板信息
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
wei.peng
|
fa1b652137
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
ae9457a667
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
42a159d023
|
IMPP 平台功能功能优化 . 软适适配功能开发
|
6 years ago |
|
crish
|
507cd718e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
crish
|
0a61d16157
|
冲突解决
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
汪云昊
|
4d4b977f13
|
软件适配器-定时适配任务
|
6 years ago |
|
汪云昊
|
c73e81234f
|
job添加serialVersionUID
|
6 years ago |
|
汪云昊
|
fc8e880971
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
fb70966fbc
|
表单菜单排序
|
6 years ago |
|
汪云昊
|
39d675d18c
|
添加字典分组
|
6 years ago |
|
曾贞一
|
184eea5d7a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
b1ebda5a22
|
日志输出补全
|
6 years ago |
|
wei.peng
|
bd8a35265f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
0aa3a70f10
|
平台权限系功能优化
|
6 years ago |
|
汪云昊
|
e2a2dd18d8
|
添加字典分组
优化redis资源键
|
6 years ago |
|
汪云昊
|
7b7439fda5
|
更新最后修改日期
|
6 years ago |
|
曾贞一
|
b8c6326a63
|
合并冲突
|
6 years ago |
|
曾贞一
|
c1aaf04b6c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
46a47d5570
|
文件服务异常抛出
添加定时任务错过处理状态
|
6 years ago |
|
wei.peng
|
62a0622273
|
DEV 版本发布
|
6 years ago |
|
汪云昊
|
0aac9388be
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
44ae93782b
|
Redis Bean 名称优化
|
6 years ago |
|
曾贞一
|
e458f22bad
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
ccf3591686
|
定时任务去组织权限
|
6 years ago |
|
wei.peng
|
c10b7b0663
|
修改用户密码Bug修复
|
6 years ago |
|
wei.peng
|
c2cd2f9b07
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
5d528350ce
|
用户管理修改密码 Bug 修复
|
6 years ago |
|
汪云昊
|
8bc1adc3dc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |