汪云昊
|
ff786035e6
|
Excel导入导出工具优化
|
6 years ago |
|
汪云昊
|
91e94d7fd1
|
文件及资源工具优化
|
6 years ago |
|
汪云昊
|
b1e0501191
|
文件及资源工具优化
|
6 years ago |
|
汪云昊
|
889a2bbf86
|
日志清除job
|
6 years ago |
|
汪云昊
|
8355ee89d0
|
资源批量新增未初始化
|
6 years ago |
|
汪云昊
|
e2a25ecf2f
|
解除冲突
|
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
|
d961db07ef
|
雪花ID 生成器 改为prop 配置
|
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 |
|
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 |
|
wei.peng
|
4c2639efe4
|
添加系统配置接口
|
6 years ago |
|
汪云昊
|
f1a7bb0063
|
Excel导出最多行数取值错误
定时任务及Excel导入导出优化
|
6 years ago |
|
wei.peng
|
30722cd53c
|
Core 服务 用户查询优化
|
6 years ago |
|
汪云昊
|
ba11bf2125
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
|
汪云昊
|
a399834960
|
LAC 前端联调调整
|
6 years ago |
|
汪云昊
|
0b870408a9
|
移除资源重载方法
|
6 years ago |
|
wei.peng
|
717069660b
|
Log4j 配置文件优化
|
6 years ago |
|
wei.peng
|
78fa8fa075
|
添加查询账号接口
|
6 years ago |
|
汪云昊
|
e582bfc4ba
|
软适配微服务接口
|
6 years ago |
|
汪云昊
|
2c1fee7cb2
|
打印模板取消必填校验
|
6 years ago |
|
汪云昊
|
93b1479613
|
打印模板添加筛选条件
|
6 years ago |
|
汪云昊
|
ed59c28f84
|
FTP适配器
|
6 years ago |
|
汪云昊
|
ca6cb7f611
|
适配记录添加id参数
|
6 years ago |
|
wei.peng
|
ef8099c70e
|
系统菜单默认排序值改动
|
6 years ago |
|
汪云昊
|
147bb61f76
|
excel通用导入优化
|
6 years ago |
|
汪云昊
|
fa72dc94ea
|
国际化资源获取
|
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
|
f640e3af69
|
自定义表单-同步对象功能优化
自定义表单-动态页面数据导出
|
6 years ago |
|
汪云昊
|
24ff03d659
|
立即刷新任务
|
6 years ago |
|
汪云昊
|
493daf78aa
|
立即刷新任务
|
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 |
|
汪云昊
|
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 |
|
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 |
|
crish
|
a50e6d7e63
|
获取平台打印模板信息
Signed-off-by: crish <570360737@qq.com>
|
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 |
|
汪云昊
|
fb70966fbc
|
表单菜单排序
|
6 years ago |
|
汪云昊
|
39d675d18c
|
添加字典分组
|
6 years ago |
|
wei.peng
|
b1ebda5a22
|
日志输出补全
|
6 years ago |
|
wei.peng
|
0aa3a70f10
|
平台权限系功能优化
|
6 years ago |
|
汪云昊
|
e2a2dd18d8
|
添加字典分组
优化redis资源键
|
6 years ago |
|
汪云昊
|
7b7439fda5
|
更新最后修改日期
|
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 |
|
汪云昊
|
ccf3591686
|
定时任务去组织权限
|
6 years ago |
|
wei.peng
|
c10b7b0663
|
修改用户密码Bug修复
|
6 years ago |
|
wei.peng
|
5d528350ce
|
用户管理修改密码 Bug 修复
|
6 years ago |
|
汪云昊
|
bb80706032
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
0f8c88a939
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties
|
6 years ago |
|
wei.peng
|
c4fd04af06
|
数据库链接错误。
|
6 years ago |
于学杰
|
eea8c23503
|
1. 修改数据库连接
|
6 years ago |
|
于学杰
|
9381d57d26
|
1. 修改配置文件
|
6 years ago |
|
于学杰
|
6699347729
|
1. 增加 YFAS 宁德工厂的配置文件
|
6 years ago |
|
汪云昊
|
b9a3bbabaf
|
定时任务日志信息优化
|
6 years ago |
|
wei.peng
|
88894c8245
|
用户信息补漏
|
6 years ago |
|
wei.peng
|
12610a45e9
|
组织功能优化
|
6 years ago |
|
汪云昊
|
ef28b1476e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
545d46564c
|
功能优化
|
6 years ago |
|
汪云昊
|
d82a2d72d0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
b660f6c49b
|
组织集合查询接口
|
6 years ago |
|
wei.peng
|
a3ae9dc14e
|
登录会话添加设备ID
自定义表单添加数据表唯一教研
自定义表单添加映射类型
|
6 years ago |
|
汪云昊
|
cb1c6d063f
|
定时任务压力测试
组织级权限
|
6 years ago |
|
wei.peng
|
d02bbbf949
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
48757c33b2
|
自定义报表表单打通， 用户在线设置功能优化
|
6 years ago |
 曾贞一
|
d9325996c2
|
获取系统配置信息 优化
|
6 years ago |
|
曾贞一
|
ca8a97cffc
|
获取系统配置信息 优化
|
6 years ago |
|
wei.peng
|
71d5a5cd8c
|
用户权限调整
|
6 years ago |
|
wei.peng
|
669dd8296c
|
添加序列化ID , 用户登录在线机制完成
|
6 years ago |
|
曾贞一
|
436172c607
|
获取系统配置信息
|
6 years ago |
|
曾贞一
|
014397a8cf
|
获取系统配置信息
|
6 years ago |
|
曾贞一
|
6c46e9d9a1
|
WMS获取系统配置信息
|
6 years ago |
|
wei.peng
|
642c074aa1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
2679cd0a9f
|
单号生成工具优化
|
6 years ago |
|
wei.peng
|
ddd413c6ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
0531af8389
|
添加组织功能优化
|
6 years ago |
|
汪云昊
|
b29812c8f9
|
单号生成工具优化
|
6 years ago |
|
wei.peng
|
1eb27e961a
|
用户获取菜单信息调整
|
6 years ago |
|
wei.peng
|
01ae477360
|
基础操作,数据补全
|
6 years ago |
|
wei.peng
|
bb415e5299
|
用户权限调整
|
6 years ago |
|
wei.peng
|
9ebc618a92
|
用户权限调整 帐号管理权限完成
|
6 years ago |
|
wei.peng
|
11736e79ba
|
用户权限调整 部门权限调整完成
|
6 years ago |
|
wei.peng
|
c5c650d7ce
|
用户权限调整 组织功能完成
|
6 years ago |
|
wei.peng
|
f787d270ba
|
用户权限调整 岗位功能调整完成
|
6 years ago |
|
wei.peng
|
76642b4ca9
|
用户权限调整 岗位功能调整完成
|
6 years ago |
|
wei.peng
|
0ff59b4306
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
d798139565
|
用户权限调整
|
6 years ago |
|
曾贞一
|
fd1b1bf7f4
|
平台数据树修复
|
6 years ago |
|
wei.peng
|
bd08a64e27
|
用户权限调整
|
6 years ago |
|
汪云昊
|
4b10421349
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
6c2eea3909
|
定时删除日志
|
6 years ago |
|
wei.peng
|
6e21f73a86
|
用户权限调整
|
6 years ago |
|
wei.peng
|
4b27ed9917
|
用户权限调整
|
6 years ago |
|
wei.peng
|
e741f81809
|
用户权限调整
|
6 years ago |
|
wei.peng
|
cb135ade39
|
用户权限调整
|
6 years ago |
|
曾贞一
|
39c1e511a9
|
组织树 数据权限修复
|
6 years ago |
|
wei.peng
|
aaf76a00dc
|
树DEMO 功能完成
|
6 years ago |
|
wei.peng
|
540b1faca0
|
树DEMO 功能完成
|
6 years ago |
|
wei.peng
|
e89057e452
|
本地无法启动,更新代码
|
6 years ago |
|
wei.peng
|
9169fb53e1
|
FastDfs 超时修改,日志输出调优
|
6 years ago |
|
wei.peng
|
4919263f81
|
用户查询功能优化
|
6 years ago |
|
wei.peng
|
a02ad7a551
|
表单以及平台Bug 修复
|
6 years ago |
|
汪云昊
|
983fbf268e
|
字典查询子节点接口
|
6 years ago |
|
wei.peng
|
97c78467e2
|
动态表单动态操作 功能优化
|
6 years ago |
|
汪云昊
|
fe2372ad33
|
任务周期修改错误
|
6 years ago |
|
汪云昊
|
d2cfe8e675
|
文件上传优化
字段删除异常
日志添加索引
|
6 years ago |
|
wei.peng
|
7110affac4
|
用户更新的时候更新帐号的冗余信息
|
6 years ago |
|
汪云昊
|
1a90e0efd8
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
f585ea56e4
|
文件上传接口
excel通用导出优化
|
6 years ago |
|
wei.peng
|
265ce168fd
|
用户单帐号多平台登录
|
6 years ago |
|
wei.peng
|
11eadf9c15
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
bb0f8f86c9
|
文件上传微服务接口优化
excel通用导出优化
任务提示优化
|
6 years ago |
|
wei.peng
|
e96fd395ff
|
Excel 导入没有清理数据,添加登录平台枚举
|
6 years ago |
|
汪云昊
|
c2e658bf9f
|
邮件异常提示优化
EXCEL数据通用导出
|
6 years ago |