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 |