295 Commits (f15da3db8048dbd7edd0ffea9f643c4e3f5780a1)

Author SHA1 Message Date
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
frin.fei bff5ec179d eureka、feign整合 7 years ago