wei.peng
|
b9b8484a1a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
wei.peng
|
5849222d23
|
岗位冗余信息更新
|
6 years ago |
yunhao.wang
|
77c5237cc3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
yunhao.wang
|
b914aeaa28
|
定时任务重写
|
6 years ago |
alwaysfrin
|
9b7c85ff18
|
redis会话优化
|
6 years ago |
wei.peng
|
6ec88da286
|
用户重置密码次数限制
|
6 years ago |
wei.peng
|
ca4b1ae950
|
获取权限信息Bug 提交
|
6 years ago |
alwaysfrin
|
ebdf528d3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
alwaysfrin
|
10a3f3a563
|
sid授权调整
|
6 years ago |
wei.peng
|
195c2a2dcf
|
用户登录信息封装
|
6 years ago |
wei.peng
|
27648112d8
|
根据组织Id 集合、部门ID 集合 查询账号信息
|
6 years ago |
wei.peng
|
a6b20f4b59
|
用户管理更新
|
6 years ago |
wei.peng
|
ad8f4dc613
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
wei.peng
|
f7998ab767
|
用户管理更新
|
6 years ago |
yunhao.wang
|
4dc6158baf
|
bug解决
添加默认字典项
ics添加全局异常捕获
|
6 years ago |
wei.peng
|
13118c8ef5
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
|
6 years ago |
wei.peng
|
3355ed5f52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
wei.peng
|
9868b8b647
|
登录Bug 修复, Cloud 连接问题修复
|
6 years ago |
yunhao.wang
|
005c30c761
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
yunhao.wang
|
e25703f3de
|
定时任务
dashboard
|
6 years ago |
wei.peng
|
470759395d
|
添加 Cloud 获取组织或者部门下面的人员信息功能完成
|
6 years ago |
wei.peng
|
3c0f585eff
|
菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
|
6 years ago |
wei.peng
|
bdb1d04783
|
更新链接信息
|
6 years ago |
wei.peng
|
e16247a7fb
|
更新链接信息
|
6 years ago |
wei.peng
|
951b65e289
|
用户菜单权限优化
|
6 years ago |
wei.peng
|
9ed732ca0e
|
用户登录权限优化
|
6 years ago |
wei.peng
|
3eca86cf18
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
yunhao.wang
|
2eab7837a5
|
bug解决
|
6 years ago |
yunhao.wang
|
73985b0437
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java
|
6 years ago |
yunhao.wang
|
8e6883b2df
|
bug解决
|
6 years ago |
yunhao.wang
|
9aaa7f4f43
|
dev配置
|
6 years ago |
alwaysfrin
|
815930bd83
|
处理文件路径
|
6 years ago |
alwaysfrin
|
c6f6e99635
|
调整software序号
|
6 years ago |
alwaysfrin
|
38c0df1611
|
添加自定义组件
|
6 years ago |
wei.peng
|
9bba86fab8
|
数据不存在的时候返回失败
|
6 years ago |
wei.peng
|
dee9ce7bb0
|
添加 isChecked
|
6 years ago |
wei.peng
|
cdb6eb290b
|
用户登录记录功能完成
|
6 years ago |
wei.peng
|
6e0347a873
|
用户登录记录功能完成
|
6 years ago |
yunhao.wang
|
5bc9b93bd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
yunhao.wang
|
10cc6b0b1d
|
dashboard部分功能
修复bug
|
6 years ago |
alwaysfrin
|
e1fedeb9a5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
alwaysfrin
|
a9320298b7
|
扩展块功能
|
6 years ago |
alwaysfrin
|
518799fb8c
|
优化
|
6 years ago |
wei.peng
|
e77af7ef7b
|
添加SID 返回信息
|
6 years ago |
yunhao.wang
|
cacb6b7e75
|
解决冲突
|
6 years ago |
yunhao.wang
|
0f4b6a9ee9
|
解决冲突
|
6 years ago |
yunhao.wang
|
69d5a7424d
|
解决冲突
|
6 years ago |
wei.peng
|
d773297f78
|
userInfo.setOrganizeCode(organize.getOrganizeCode());
|
6 years ago |
wei.peng
|
0bb901bdfc
|
合并代码 解决冲突
|
6 years ago |
wei.peng
|
aaa52613ce
|
日志输出格式优化
|
6 years ago |
yunhao.wang
|
219f1dde42
|
解决冲突
|
6 years ago |
yunhao.wang
|
9829dc9381
|
解决bug
|
6 years ago |
wei.peng
|
887e176ba7
|
日志输出优化
统计账号数量优化
|
6 years ago |
wei.peng
|
6ecf276183
|
添加 ApiOperation
|
6 years ago |
wei.peng
|
0f414fcaeb
|
Junit Test 用户登录问题修复
|
7 years ago |
yunhao.wang
|
2c1088a431
|
微服务状态提醒
及部分dashboard
|
7 years ago |
alwaysfrin
|
48cfb1fa88
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
alwaysfrin
|
18dc8d980d
|
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/websocket/MessageWebSocket.java
|
7 years ago |
wei.peng
|
e336e7e5bb
|
动态 Table 功能优化
|
7 years ago |
wei.peng
|
67e4ee2457
|
用户账号数量功能提交
|
7 years ago |
wei.peng
|
2e058f91e2
|
动态 Table 功能优化
|
7 years ago |
alwaysfrin
|
5094263555
|
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/websocket/MessageWebSocket.java
|
7 years ago |
alwaysfrin
|
6f55b50bec
|
调整
|
7 years ago |
wei.peng
|
e9b01fe54e
|
remove .idea
|
7 years ago |
wei.peng
|
b524929d7e
|
Base Url 修改
|
7 years ago |
wei.peng
|
ba940403fa
|
配置文件修改 Test to dev
|
7 years ago |
wei.peng
|
67873a6210
|
配置文件修改 Test to dev
|
7 years ago |
wei.peng
|
0a1c9649b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
wei.peng
|
453caba58a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
wei.peng
|
bfd3809daf
|
用户功能优化
|
7 years ago |
alwaysfrin
|
8938b70866
|
调整
|
7 years ago |
alwaysfrin
|
bcf28a2f7d
|
调整
|
7 years ago |
alwaysfrin
|
8d8203aafc
|
结构错误
|
7 years ago |
alwaysfrin
|
4fac35c583
|
结构错误
|
7 years ago |
alwaysfrin
|
6f276de76f
|
结构错误
|
7 years ago |
wei.peng
|
12f1dfb021
|
测试数据库切换
|
7 years ago |
yunhao.wang
|
696678930c
|
单号规则管理excel导入导出
|
7 years ago |
wei.peng
|
879683a646
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
wei.peng
|
9affe5c611
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
wei.peng
|
dfbc0b5eeb
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
wei.peng
|
b382c5ae00
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
wei.peng
|
b32d868279
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
wei.peng
|
42a9154afe
|
发布 正式版本 1.0
|
7 years ago |
yunhao.wang
|
9db39d97cd
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
|
7 years ago |
yunhao.wang
|
b6caf12c92
|
test数据库配置
|
7 years ago |
yunhao.wang
|
dbf65a91da
|
dev数据库配置
|
7 years ago |
yunhao.wang
|
b84402a40a
|
数据库配置
|
7 years ago |
wei.peng
|
fcc97cb438
|
发布 正式版本 1.0
|
7 years ago |
wei.peng
|
850ea37153
|
发布 正式版本 1.0
|
7 years ago |
yunhao.wang
|
126e23e3cd
|
项目pom版本更新为test
|
7 years ago |
wei.peng
|
d53cd353dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
673f6bcc3d
|
发布 正式版本 1.0
|
7 years ago |
yunhao.wang
|
74c78570ed
|
项目pom版本更新为dev
|
7 years ago |
wei.peng
|
16c2012fc7
|
打包处理
|
7 years ago |
yunhao.wang
|
7a0657665e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
a57c4ee19e
|
Excel导入导出
|
7 years ago |
wei.peng
|
402bca0a8c
|
代码优化
|
7 years ago |
jimmy
|
7c90e3f1d2
|
提交代码
|
7 years ago |
Silliter
|
13f2b51221
|
优化代码
|
7 years ago |
yunhao.wang
|
c091f1ad05
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
b15b09df52
|
单号规则初始化
|
7 years ago |
amy
|
5fe4b562e9
|
按钮权限添加
|
7 years ago |
gragon.xu
|
5cafca1840
|
权限excel
|
7 years ago |
jimmy
|
0a46fe045a
|
权限按钮
|
7 years ago |
alwaysfrin
|
151717db13
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
alwaysfrin
|
d1ff081470
|
重复idbug解决
|
7 years ago |
yunhao.wang
|
129de18e45
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
8ed83d0c39
|
资源管理,硬件管理细节处理
|
7 years ago |
frin.fei
|
ddd1be828c
|
集群心跳机制
|
7 years ago |
frin.fei
|
65d633bad9
|
参数配置调整
|
7 years ago |
wei.peng
|
c1decc086e
|
登录功能优化
|
7 years ago |
wei.peng
|
e6a734ea27
|
测试环境配置信息修改
|
7 years ago |
wei.peng
|
60dd3a56aa
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
6a521dee37
|
异常处理优化
|
7 years ago |
alwaysfrin
|
7b880d6eda
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
alwaysfrin
|
1b8f4c01ba
|
微服调用调整
|
7 years ago |
wei.peng
|
e1233e9361
|
功能代码优化
|
7 years ago |
wei.peng
|
9bf2152762
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
28b17c83a6
|
功能代码优化
|
7 years ago |
yunhao.wang
|
b26279be1d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java
|
7 years ago |
yunhao.wang
|
5b154b40df
|
字典管理优化
|
7 years ago |
wei.peng
|
063c1dfb5c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
alwaysfrin
|
599f010a86
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
alwaysfrin
|
2d2075f3aa
|
微服调用调整
|
7 years ago |
wei.peng
|
6ad1b82084
|
异常处理优化
|
7 years ago |
Silliter
|
aae03fe591
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
Silliter
|
c5b0c7176b
|
解决冲突
|
7 years ago |
alwaysfrin
|
4d6c58c598
|
微服调用调整
|
7 years ago |
yunhao.wang
|
e707662809
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
yunhao.wang
|
3840dea649
|
功能细节调整
|
7 years ago |
alwaysfrin
|
8ed50726bb
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
alwaysfrin
|
b7887e25c3
|
微服调用调整
|
7 years ago |
wei.peng
|
5919a2f97e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
wei.peng
|
26efe9a1e9
|
功能代码优化
|
7 years ago |
frin.fei
|
ccd01af553
|
微服调整
|
7 years ago |
alwaysfrin
|
90141be1fc
|
微服调用测试
|
7 years ago |
frin.fei
|
4374746bf3
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
frin.fei
|
fa4284c76e
|
eureka微服调整
|
7 years ago |
alwaysfrin
|
49940fd6a6
|
spring gateway添加
细节调整
|
7 years ago |
wei.peng
|
f31b8e659a
|
功能代码优化
|
7 years ago |
yunhao.wang
|
1e6b4719fe
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
de29bed18d
|
消息异常处理
|
7 years ago |
wei.peng
|
33bef44265
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
yunhao.wang
|
3a46256ff0
|
定时任务
websocket
|
7 years ago |
wei.peng
|
cb95f76804
|
异常处理优化
|
7 years ago |
wei.peng
|
dbcaf5221e
|
密码找回功能完成
|
7 years ago |
yunhao.wang
|
1756977958
|
用户消息
websocket
|
7 years ago |
yunhao.wang
|
b5fcc65f99
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java
|
7 years ago |
yunhao.wang
|
da1c50f9a0
|
用户消息
websocket
|
7 years ago |
yunhao.wang
|
c9ef53ef80
|
定时任务
单号生成规则
|
7 years ago |
wei.peng
|
53b0b86130
|
功能代码优化
|
7 years ago |
wei.peng
|
5cc176395d
|
自动填充信息Bug 修复
|
7 years ago |
wei.peng
|
22f9126b2c
|
自动填充信息Bug 修复
|
7 years ago |
wei.peng
|
f6ad0ad70d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
yunhao.wang
|
ce0cfaa741
|
开关调整
|
7 years ago |
wei.peng
|
d2e12829d5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
yunhao.wang
|
0c69ad329c
|
消息管理封装
|
7 years ago |
wei.peng
|
3d159a9bfb
|
异常处理优化
|
7 years ago |
yunhao.wang
|
c9d9a908d9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
e1f7b6dea0
|
消息队列调整
系统参数管理
数据初始化文件
|
7 years ago |
frin.fei
|
e03911e9f2
|
eureka微服调整
|
7 years ago |
frin.fei
|
771c3cfc2b
|
eureka微服调整
|
7 years ago |
wei.peng
|
d78f782726
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
d8bc8186df
|
异常处理优化
|
7 years ago |
frin.fei
|
fbc33e3d0c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
|
7 years ago |
frin.fei
|
2c4b04e259
|
eureka微服整合
|
7 years ago |
yunhao.wang
|
e093c5c6d7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
yunhao.wang
|
42aaa4ba29
|
单号生成规则
邮件配置信息来源改为系统配置信息
|
7 years ago |
wei.peng
|
267152a2ad
|
1、复杂树 功能完成
|
7 years ago |
wei.peng
|
2d7d61eb1c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
wei.peng
|
49b65a92bc
|
1、用户信息结构调整
|
7 years ago |
yunhao.wang
|
cf633033a3
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
b7500c7324
|
系统资源 批量添加
|
7 years ago |
wei.peng
|
4d993d8f72
|
1、初始化导入数据功能完成
|
7 years ago |
wei.peng
|
c847ef907f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
d78f260e13
|
1、初始化导入数据功能完成
|
7 years ago |
yunhao.wang
|
962b18ba1b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/impp-framework
# Conflicts:
# modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java
|
7 years ago |
wei.peng
|
9c42a21a0b
|
1、BaseRepositoryImpl 根据ID 查询Bug 修复
2、更新字段名,更新对象名称
|
7 years ago |
wei.peng
|
350fcb59dd
|
1、更新字段名,更新对象名称
|
7 years ago |
frin.fei
|
fe99b50028
|
初始化服务注册中心icloud center service
|
7 years ago |
frin.fei
|
7ba41c5876
|
微服调整
|
7 years ago |
frin.fei
|
8c00e5e36f
|
微服调整
|
7 years ago |
wei.peng
|
1ee4d5c16f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
23a6a8a99a
|
代码优化
|
7 years ago |
yunhao.wang
|
97d4ced06e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yunhao.wang
|
4cd25e7e2f
|
邮件消息队列调整
|
7 years ago |
frin.fei
|
2009825d82
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
|
7 years ago |
frin.fei
|
48b1cec739
|
微服单独划分
|
7 years ago |
wei.peng
|
abefec9e97
|
连接添加前缀 /impp
|
7 years ago |
yunhao.wang
|
cb6d498143
|
注释消息队列
|
7 years ago |
yunhao.wang
|
3a8be23b6f
|
站内信 全部完成
|
7 years ago |
wei.peng
|
b035e3170c
|
RDD Update
|
7 years ago |
wei.peng
|
239c9e83d7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
wei.peng
|
03b7bc0803
|
动态功能权限 功能完成
|
7 years ago |
frin.fei
|
b68025dda1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
frin.fei
|
f022c0e529
|
eureka、feign整合
|
7 years ago |
yunhao.wang
|
c2e1417ce1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
yunhao.wang
|
d944fd77c1
|
文件丢失撤回
|
7 years ago |
wei.peng
|
a1bdff557d
|
文件丢失找回
|
7 years ago |
wei.peng
|
87d694abb6
|
文件丢失找回
|
7 years ago |