汪云昊
|
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 |
|
汪云昊
|
ed44b5c5ae
|
资源查询泛型
|
5 years ago |
|
汪云昊
|
bee313ca39
|
资源查询添加requestBody
|
5 years ago |
|
jenkins
|
cce073f575
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
f53bbf4a53
|
资源接口
|
5 years ago |
|
汪云昊
|
0a611e804e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
41caae6e04
|
资源增量导入优化
|
5 years ago |
|
汪云昊
|
bdca81cd58
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
d8f50038ed
|
优化mq日志等级
|
5 years ago |
|
汪云昊
|
cc59162c14
|
增量导入
|
5 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 |
|
汪云昊
|
bb80706032
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
c279c46a84
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
wei.peng
|
6ab0a53fe8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
9381d57d26
|
1. 修改配置文件
|
6 years ago |
|
wei.peng
|
4ab6b5ef06
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
于学杰
|
6699347729
|
1. 增加 YFAS 宁德工厂的配置文件
|
6 years ago |
|
wei.peng
|
91e7774952
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
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
|
1d6eb9cb2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
a3ae9dc14e
|
登录会话添加设备ID
自定义表单添加数据表唯一教研
自定义表单添加映射类型
|
6 years ago |
|
汪云昊
|
cb1c6d063f
|
定时任务压力测试
组织级权限
|
6 years ago |
|
wei.peng
|
f1c8d1ed9b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
92a4afe861
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
33769c4171
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
0e2f85c872
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
01ae477360
|
基础操作,数据补全
|
6 years ago |
|
wei.peng
|
73ad451a26
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
f8862e889f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
9169fb53e1
|
FastDfs 超时修改,日志输出调优
|
6 years ago |
|
wei.peng
|
48311c063c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test
# Conflicts:
# src/main/resources/application-dev.properties
数据库配置 show_sql -> false
|
6 years ago |
|
wei.peng
|
884f20bc66
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
4919263f81
|
用户查询功能优化
|
6 years ago |
|
wei.peng
|
a02ad7a551
|
表单以及平台Bug 修复
|
6 years ago |
|
汪云昊
|
983fbf268e
|
字典查询子节点接口
|
6 years ago |
|
汪云昊
|
c910eafc47
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
97c78467e2
|
动态表单动态操作 功能优化
|
6 years ago |
|
汪云昊
|
fe2372ad33
|
任务周期修改错误
|
6 years ago |
|
汪云昊
|
d2cfe8e675
|
文件上传优化
字段删除异常
日志添加索引
|
6 years ago |
|
wei.peng
|
7110affac4
|
用户更新的时候更新帐号的冗余信息
|
6 years ago |
|
wei.peng
|
d425d1259c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
460723a2c1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
wei.peng
|
8a3322a7e4
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
01d4c7d70e
|
Fast DFS 上传非空判断
|
6 years ago |
|
wei.peng
|
590097a89e
|
Fast DFS 上传非空判断
|
6 years ago |
|
wei.peng
|
56cc2cdda7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
fc3b9cb701
|
关闭单帐号单登录
|
6 years ago |
|
wei.peng
|
725cfb8ec6
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test
# Conflicts:
# src/main/resources/application-dev.properties
版本合并 环境标识 test to docker
|
6 years ago |
|
wei.peng
|
524b953025
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
5b94a2f002
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
d88d751e89
|
添加邮件类型
|
6 years ago |
|
wei.peng
|
23ba09efce
|
Fast DFS 上传非空判断
|
6 years ago |
|
汪云昊
|
bfbf8107a4
|
重置docker环境配置文件
|
6 years ago |
|
汪云昊
|
8734e71bd8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
ed7be29c1c
|
优化邮箱异常提示
|
6 years ago |
|
wei.peng
|
c024a7ed98
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
6d342bd44c
|
数据库链接超时延长 至 5 分钟
|
6 years ago |
|
汪云昊
|
d33255ca76
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
jenkins
|
897a4dfbd4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
2a71da6b1a
|
配置调整
|
6 years ago |
|
wei.peng
|
2e5a265847
|
添加 Redis Util Tool
|
6 years ago |
|
wei.peng
|
2cda3ecdaf
|
安灯 添加跨服务获取帐号列表接口
|
6 years ago |
|
wei.peng
|
e67b93dd4c
|
测试环境数据库配置修改
|
6 years ago |
|
jenkins
|
a73c837b68
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
17746e308d
|
数据库链接配置修改 , 单用户登录.
|
6 years ago |
|
jenkins
|
8ae252ef70
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
f089942c7b
|
事件现象基础信息
|
6 years ago |
|
jenkins
|
de23645e3d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
b656592889
|
excel工具类优化
|
6 years ago |
|
jenkins
|
11fb13ae5b
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
10b82dbea2
|
WMS微服务消息接口调用
|
6 years ago |
|
汪云昊
|
90561827e5
|
excel工具类优化
|
6 years ago |
|
汪云昊
|
0b9ed93fc1
|
redis资源键调整
|
6 years ago |
|
wei.peng
|
b38009a931
|
测试环境配置修改
|
6 years ago |
|
wei.peng
|
5d636532fc
|
修改数据库链接参数
|
6 years ago |
|
wei.peng
|
da58556193
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application.properties
|
6 years ago |
|
wei.peng
|
0266c89860
|
测试环境配置修改
|
6 years ago |
|
wei.peng
|
067bab119e
|
修改数据库链接参数
|
6 years ago |
|
wei.peng
|
b87e44638f
|
修改数据库链接参数
|
6 years ago |
|
wei.peng
|
25c47cb7f4
|
修改数据库链接参数
|
6 years ago |
彭伟
|
fb2136662e
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application.properties'
|
6 years ago |
|
wei.peng
|
9ab7c178f7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application.properties
|
6 years ago |
wei.peng
|
156fc52811
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
wei.peng
|
e5e4e5cc2d
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
wei.peng
|
ca61c97c90
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
wei.peng
|
c1e6f1ef55
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
jenkins
|
95671091a2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
9ef91a8c63
|
解决冲突
细节优化
自定义表单功能管理 添加 是否设计字段
|
6 years ago |
|
jenkins
|
95a3ba8b0b
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
6d38d85d50
|
增加动态报表对外接口-多条件删除
移除默认属性校验
移除查询数据库所有表的部分字段（部分字段SQLServer不支持）
|
6 years ago |
|
wei.peng
|
660ebb056d
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
677b0fa790
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
1c0e408f06
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
5923751a2b
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
jenkins
|
148dd2ac8a
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
f4e0d6da4d
|
细节优化
定时任务-公用消息推送
文件大小限制
|
6 years ago |
|
汪云昊
|
0ecc7308e2
|
spring文件上传上限调至10G
|
6 years ago |
allen.zhang
|
ec56ff968d
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
67e3ae4ce7
|
报表 表单打通
|
6 years ago |
|
汪云昊
|
bb8cc0971d
|
优化-字典缓存初始化
|
6 years ago |
|
汪云昊
|
6e9af743de
|
表单布局解决行列数量不准确
|
6 years ago |
|
wei.peng
|
96705b6638
|
自定义拦截器DEMO 完成
|
6 years ago |
|
汪云昊
|
667c334531
|
字典功能优化
|
6 years ago |
|
汪云昊
|
8871725802
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
cbe588449e
|
平台字典优化
websocket
|
6 years ago |
|
wei.peng
|
c8445c0ae5
|
登录获取组织ID 为Null bug 修复
|
6 years ago |
|
wei.peng
|
dec6086c96
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
96f9f3efe2
|
Docker 配置添加完成
|
6 years ago |
|
wei.peng
|
c07431e8d7
|
发布提交
|
6 years ago |
|
wei.peng
|
642f841fda
|
用户获取角色添加状态控制
|
6 years ago |
|
wei.peng
|
c60e404776
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
cfc2ddbe79
|
解决WebSocket session并发问题
|
6 years ago |
|
汪云昊
|
34e5be9586
|
WebSocket异常处理
|
6 years ago |
|
wei.peng
|
b0bc7ecada
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
bc4147fd96
|
解决WebSocket session并发问题
|
6 years ago |
|
wei.peng
|
9dc29aa080
|
消息获取用户列表数据权限控制
|
6 years ago |
|
wei.peng
|
acce40f801
|
数据源 自动切换 Bug 修复
|
6 years ago |
|
wei.peng
|
e1a224f1a1
|
FastDfs 添加日志
|
6 years ago |
|
wei.peng
|
0384180d4d
|
FastDfs 添加日志
|
6 years ago |
|
wei.peng
|
0d8bf92b80
|
添加中文简写
|
6 years ago |
|
wei.peng
|
a5bbdcb18b
|
添加中文简写
|
6 years ago |
|
wei.peng
|
3526f9e0b6
|
工厂数量控制
用户数量控制
|
6 years ago |
|
wei.peng
|
c785735265
|
用户数据权限控制
|
6 years ago |
|
wei.peng
|
15946e082a
|
修改用户改动后无法登录登录Bug
|
6 years ago |
|
汪云昊
|
daa1379fc4
|
授权id调整
|
6 years ago |
|
汪云昊
|
4a4049c44e
|
单号获取微服务调用调整
|
6 years ago |
|
汪云昊
|
bb6e213900
|
平台授权id调整
|
6 years ago |
alwaysfrin
|
6b1620772b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
d54ab69ee5
|
事务和redis的bug处理
|
6 years ago |
|
wei.peng
|
3d110244d7
|
功能目录导入导出
|
6 years ago |
|
wei.peng
|
3dc91ad160
|
功能目录导入导出
|
6 years ago |
|
wei.peng
|
6265ab6f5d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
d9f32002ca
|
初始化功能目录
|
6 years ago |
|
allen.zhang
|
c69d52364f
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
18e0d0d60a
|
读写分离
|
6 years ago |
|
allen.zhang
|
67446e5215
|
Merge branch 'dev' into test
|
6 years ago |
Silliter
|
739524b3f6
|
docker配置文件修改
|
6 years ago |
|
allen.zhang
|
2c15ede4f0
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
3a083c00c7
|
读写分离
|
6 years ago |
|
汪云昊
|
18b04a720e
|
长文本数据调整
|
6 years ago |
|
Silliter
|
234ce910c9
|
core测试环境配置文件修改
|
6 years ago |
|
Silliter
|
7af35bd641
|
Merge branch 'dev' into test
|
6 years ago |
|
alwaysfrin
|
f241277bdc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
3fb4018626
|
事务调整及demo
|
6 years ago |
|
jenkins
|
98c655b0c5
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
0e6990d3b7
|
用户登录完成后设置默认组织
|
6 years ago |
|
Silliter
|
be7b0c1795
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
Silliter
|
b826dec8b4
|
开发用户列表微服务接口
|
6 years ago |
|
jenkins
|
fa83993a31
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
a325fbf14f
|
添加会话组织管理
|
6 years ago |
|
wei.peng
|
144e86dd90
|
加密狗 功能开发
|
6 years ago |
|
wei.peng
|
1341ab9e64
|
数据库读写分离dbslave
产品授权添加
|
6 years ago |
|
jenkins
|
c54b4c5155
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
3eb83cd6a0
|
Andon定时任务微服务调用调整
|
6 years ago |
|
jenkins
|
d9ce4fb108
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
c5f5c5db9f
|
平台微服务调用调整
|
6 years ago |
|
jenkins
|
9debf5e04f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
8baaab8f44
|
添加批量生成单号接口及微服务调用方法
|
6 years ago |
|
Silliter
|
333735b7de
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
83f553b90e
|
Docker 配置修改
|
6 years ago |
|
wei.peng
|
df2fb2c7c4
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test
# Conflicts:
# modules/i3plus-block-form/src/main/resources/application-test.properties
# modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
|
6 years ago |
|
wei.peng
|
dfa66046f2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
3d1e97d4ef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
6eee60bccd
|
添加注释
|
6 years ago |
|
yunhao.wang
|
e706e644c5
|
添加注释
|
6 years ago |
|
wei.peng
|
9d7d9a77bc
|
添加注释
|
6 years ago |
|
alwaysfrin
|
ebf890d8d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
ab7cb06923
|
安灯和硬件适配初始化
|
6 years ago |
|
Silliter
|
578ab55fb2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
5681936c74
|
Docker 配置添加完成
|
6 years ago |
|
jenkins
|
e7bf273f69
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Rock.Yu
|
6e7a6120e5
|
1. 修改 Docker 配置文件
|
6 years ago |
|
wei.peng
|
8f8c0f3f2b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
8e6c2556a1
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ca22ff7b9
|
根据部门获取用户信息接口Bug修复
|
6 years ago |
|
jenkins
|
d4b84598fb
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
3ae4cc40b7
|
配置文件优化 禁止提交配置文件防止环境错乱
|
6 years ago |
|
wei.peng
|
53954638fc
|
配置文件优化 禁止提交配置文件防止环境错乱
|
6 years ago |
|
汪云昊
|
f85e081678
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
a6964950dd
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
1ade313c48
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
6798b62ae9
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
|
6 years ago |
|
汪云昊
|
febcd68e3e
|
更新 'modules/i3plus-core-apiservice/src/main/resources/application-test.properties'
3306修改为3308
|
6 years ago |
|
jenkins
|
88c3c6b685
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
1bdc2cf3f8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
a6301d2d8c
|
事务持久化调整
|
6 years ago |
|
yunhao.wang
|
82b8371747
|
自定义按钮功能接口
消息优化
|
6 years ago |
|
wei.peng
|
8e4a8298a8
|
配置更新
|
6 years ago |
|
wei.peng
|
b01cc47629
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
4dff4c6fc3
|
配置更新
|
6 years ago |
|
Silliter
|
5812b5b7b5
|
合并dev分支代码
|
6 years ago |
|
alwaysfrin
|
c33076e0a1
|
配置文件调整
|
6 years ago |
|
alwaysfrin
|
839280ed60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
cc17ff9c13
|
DdlPack，封装bug
|
6 years ago |
|
yunhao.wang
|
609c302699
|
添加用户消息删除接口
添加系统消息微服调用方法
|
6 years ago |
|
yunhao.wang
|
0a70f12896
|
消息细节调整
|
6 years ago |
|
yunhao.wang
|
04e77f98b6
|
添加MES,MES_PCN定时任务及通用微服务调用方法
|
6 years ago |
|
yunhao.wang
|
046667f876
|
sweb公告处理
|
6 years ago |
|
jenkins
|
1194828efa
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
db704d7263
|
SWEB通知队列推送
|
6 years ago |
|
yunhao.wang
|
19e4fe21c1
|
消息队列参数改为json字符串
|
6 years ago |
|
wei.peng
|
725ed07621
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
3016839d7a
|
添加Log 输出
|
6 years ago |
|
alwaysfrin
|
c6f8e367f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
d5fc84f126
|
DdlPack，封装bug
|
6 years ago |
|
yunhao.wang
|
9e72f9df2e
|
细节优化
|
6 years ago |
|
Rock.Yu
|
0ac2ef2179
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
Rock.Yu
|
cd623dd121
|
1. 增加 Docker 配置文件
|
6 years ago |
|
jenkins
|
1d4d25d1c2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
bc117cc0f4
|
表单菜单权限接口
|
6 years ago |
|
Silliter
|
e5615c77c0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
97720e02a2
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
alwaysfrin
|
f9461369d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
Silliter
|
57b276e6e0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
50f69d91e0
|
定时任务微服调用方法
|
6 years ago |
|
yunhao.wang
|
034e3b77a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-core-api/i3plus-core-api.iml
# modules/i3plus-core-apiservice/i3plus-core-apiservice.iml
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
|
6 years ago |
|
yunhao.wang
|
115e3e64b2
|
功能表单接口优化
|
6 years ago |
|
yunhao.wang
|
b4b4820cd4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
601cc4edd8
|
平台-用户操作组织修改接口
表单-拦截器添加执行顺序
表单-功能明细前后端联调
|
6 years ago |
|
Silliter
|
cb36356667
|
优化打印模板，开发禁用启用接口
|
6 years ago |
|
yunhao.wang
|
132e4e341a
|
消息微服调用优化
|
6 years ago |
|
yunhao.wang
|
4ca229997b
|
表单-布局新增行列设置初始数据
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
|
6 years ago |
|
yunhao.wang
|
afaf6c8f58
|
消息附件管理
|
6 years ago |
|
yunhao.wang
|
dc610d9f00
|
消息队列配置调整
|
6 years ago |
|
yunhao.wang
|
3f7643f0e8
|
权限分配调整接口
消息调整添加微服务支持
添加sweb通知处理队列
|
6 years ago |
|
yunhao.wang
|
b37acbfcab
|
前端联调接口优化
单号生成工具类bug解决
|
6 years ago |
|
alwaysfrin
|
c802aae056
|
部分细节调整
|
6 years ago |
|
wei.peng
|
a44320d7ea
|
自定义表单 数据操作接口 DAO 层优化
|
6 years ago |
jiajack
|
52a826058c
|
删除iml文件
|
6 years ago |
|
yunhao.wang
|
8b4600606b
|
细节优化
bug修复
|
6 years ago |
|
yunhao.wang
|
cc0e350e73
|
bug修复
|
6 years ago |
|
yunhao.wang
|
733d41578c
|
表单功能接口优化
文件微服接口优化
自动填充单元测试
|
6 years ago |
|
Silliter
|
b8a7bde452
|
打印模板优化
|
6 years ago |
|
alwaysfrin
|
8baa8c52c4
|
hql封装优化
|
6 years ago |
|
Silliter
|
89b7bf03df
|
合并代码
|
6 years ago |
|
yunhao.wang
|
4d96152b3e
|
微服文件管理接口
|
6 years ago |
|
alwaysfrin
|
2e66e522f0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
385b321791
|
hql封装优化
|
6 years ago |
|
yunhao.wang
|
6c4bcfccf1
|
配置文件调整
|
6 years ago |
|
yunhao.wang
|
d63d31eb11
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application.properties
|
6 years ago |
|
yunhao.wang
|
407f4ce0d8
|
配置文件调整
|
6 years ago |
|
alwaysfrin
|
2438ae45cf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
b715eff7e3
|
优化调整
|
6 years ago |
|
yunhao.wang
|
2a57625b20
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
9487810c72
|
定时任务异常通知测试类
|
6 years ago |
|
yunhao.wang
|
841d6e4d10
|
自定义表单 功能权限管理接口
微服调整 平台角色获取方法调整
|
6 years ago |
|
alwaysfrin
|
fa6d248ea0
|
hql封装优化
|
6 years ago |
|
Silliter
|
c65a86e7cb
|
优化打印模板
|
6 years ago |
|
wei.peng
|
87e15fcd13
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
alwaysfrin
|
0955b9ac13
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
0098aba8c4
|
shiro会话id优化，自动update赋值优化
|
6 years ago |
|
wei.peng
|
b7bf845853
|
测试环境数据迁移 240
测试环境Redis 迁移 240
测试环境MQ 迁移 240
测试环境 APP 迁移 241
|
6 years ago |
|
yunhao.wang
|
10c6b8d011
|
字典添加所属模块
|
6 years ago |
|
yunhao.wang
|
06a995ab3e
|
定时任务优化
表单布局优化
|
6 years ago |
|
yunhao.wang
|
96b5fe90ef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
73776f6c27
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
7f1f76eef2
|
结构优化调整，自动填充功能调整
|
6 years ago |
|
yunhao.wang
|
5e65210d18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
6bb5aebb66
|
字典添加默认代码查询接口
|
6 years ago |
|
Silliter
|
721f6f576b
|
优化打印模板
|
6 years ago |
|
Silliter
|
8f7349698d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
d656d82622
|
定时任务优化
|
6 years ago |
|
alwaysfrin
|
238cc817da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
0a10d99845
|
eureka优化调整，exception优化
|
6 years ago |
|
wei.peng
|
10ee0ad5a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
cebc793b53
|
IP 配置修改
|
6 years ago |
|
yunhao.wang
|
05852898c3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
7c0c97ba61
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
f177a89d34
|
定时任务优化
|
6 years ago |
|
alwaysfrin
|
dbcaa33735
|
eureka优化调整，exception优化
|
6 years ago |
|
yunhao.wang
|
73a84c63a9
|
定时任务计划添加参数
|
6 years ago |
|
yunhao.wang
|
da76a0a512
|
自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
|
6 years ago |
|
yunhao.wang
|
ea0f5ce0f0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
5161c9cefa
|
表单报表部分功能
定时任务优化
|
6 years ago |
|
alwaysfrin
|
b824bf93a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
Silliter
|
d3dd40bb86
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
a67bfdc11a
|
优化调整
|
6 years ago |
|
alwaysfrin
|
87a1666861
|
优化调整
|
6 years ago |
|
yunhao.wang
|
eee75ce2e4
|
jdbc
|
6 years ago |
|
yunhao.wang
|
002e863030
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
2d81c898d8
|
字典微服务调整
定时任务优化
自定义表单实体
|
6 years ago |
|
wei.peng
|
ace9524733
|
FindBugs 提示Bug 修改
|
6 years ago |
|
wei.peng
|
cf0bcf0a40
|
FindBugs 提示Bug 修改
|
6 years ago |
|
yunhao.wang
|
0e26184ff0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
76c234ced3
|
字典微服务调整
定时任务优化
|
6 years ago |
|
Silliter
|
17f9142c03
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
14e85f58a8
|
优化条码打印
|
6 years ago |
|
yunhao.wang
|
b2873e80ae
|
定时任务微服优化
|
6 years ago |
|
alwaysfrin
|
59599bae23
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
b1a6ea2581
|
添加mes、mes-pcn、sweb三个微服
|
6 years ago |
|
Silliter
|
e5b8641903
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
fd74559fd8
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
e3454af8f6
|
字典树查询
单号规则计算优化
字典微服调用方法及调用案例
|
6 years ago |
|
Silliter
|
cdf0d91389
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |