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 |
|
frin.fei
|
bff5ec179d
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
89f13b93b4
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
b030508da1
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
d571f2c357
|
eureka、feign整合
|
7 years ago |
|
yunhao.wang
|
ec137693cf
|
定时任务 完成
表达式 完成
邮件工具类
|
7 years ago |
|
yunhao.wang
|
59806414b9
|
SysFileService方法参数类型变更
|
7 years ago |
|
wei.peng
|
0673a88073
|
用户图像功能完成
|
7 years ago |
|
Silliter
|
82dd2dc9e6
|
单元测试开发工具类新增
|
7 years ago |
|
frin.fei
|
9a025cd3e3
|
eureka、feign整合
|
7 years ago |
|
wei.peng
|
04de7a67fe
|
Test Session USER Bug 修复
|
7 years ago |
|
wei.peng
|
612312e898
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
904476770b
|
Test Session USER Bug 修复
|
7 years ago |
|
alwaysfrin
|
1b6e373c0e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
alwaysfrin
|
eef6f5ad34
|
eureka服务注册中心
|
7 years ago |
|
wei.peng
|
651a6ce000
|
端口修改
|
7 years ago |
|
Silliter
|
9d111dfd59
|
单元测试开发工具类新增
|
7 years ago |
|
wei.peng
|
182fe328c9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
04ba139eb6
|
用户登录功能完成
|
7 years ago |
|
yunhao.wang
|
d1bbff246a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
b3149f21b4
|
定时任务
任务执行策略
|
7 years ago |
|
wei.peng
|
3bce009cfc
|
账号管理功能优化
|
7 years ago |
|
wei.peng
|
7087b4078e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
b3264ae909
|
用户信息拆分 合并代码处理
|
7 years ago |
|
frin.fei
|
4bc8e7b369
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
frin.fei
|
fc53c7d454
|
微服调整
|
7 years ago |
|
yunhao.wang
|
a1d612a3cd
|
系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
|
7 years ago |
|
wei.peng
|
b97b2276e9
|
用户信息拆分 合并代码处理
|
7 years ago |
|
wei.peng
|
9eeacc5286
|
用户信息拆分 合并代码处理
|
7 years ago |
|
yunhao.wang
|
9d61f5a6a5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
语言管理 完成
资源管理 完成
|
7 years ago |
|
wei.peng
|
b69ce2e2e6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
925c10da8b
|
用户信息拆分
|
7 years ago |
|
yunhao.wang
|
984d2dd7b3
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
|
7 years ago |
|
yunhao.wang
|
0fa2a4c605
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
|
7 years ago |
|
yunhao.wang
|
ae0e8392ac
|
系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
|
7 years ago |
|
alwaysfrin
|
43770f8bcc
|
1，对象hashcode和equals继承父对象
2，主键生成策略优化
|
7 years ago |
|
alwaysfrin
|
e26e8ac430
|
1，添加判断方法
2，切面中，补全新增和修改的用户基础信息
|
7 years ago |
|
Silliter
|
2a6cd366b1
|
单元测试开发工具类新增
|
7 years ago |
|
alwaysfrin
|
972b6bc064
|
base基类调整
|
7 years ago |
|
alwaysfrin
|
a9e6dc069f
|
代码调整优化
|
7 years ago |
|
wei.peng
|
6f852cbd9f
|
添加修改密码功能
更新字段 Bug 修复
|
7 years ago |
|
wei.peng
|
ffad29d5b9
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
811225796e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
7adb45b3bc
|
测试配置信息修改
|
7 years ago |
|
Silliter
|
0a8c8a9252
|
wms工厂仓库类书写
|
7 years ago |
|
alwaysfrin
|
3c97d315f7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java
|
7 years ago |
|
alwaysfrin
|
b82a9ec102
|
代码优化
|
7 years ago |
|
wei.peng
|
b03aa49948
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
Silliter
|
44bea05d62
|
wms工厂仓库类书写
|
7 years ago |
|
wei.peng
|
0083c56363
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
fa81fd3d16
|
代码优化调整
|
7 years ago |
|
wei.peng
|
8dd831e890
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
382525b188
|
添加用户获取用户角色关系接口
|
7 years ago |
|
alwaysfrin
|
b6d8c8f54a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
|
7 years ago |
|
alwaysfrin
|
c02b895cc6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
b147e319f7
|
日志分析工具持久化，baserepository优化
|
7 years ago |
|
Silliter
|
e5be5c9d73
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
Silliter
|
c82331c346
|
wms工厂仓库类书写
|
7 years ago |
|
alwaysfrin
|
50002af933
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java
|
7 years ago |
|
alwaysfrin
|
d7017351e7
|
日志分析工具
|
7 years ago |
|
yunhao.wang
|
c39dff1266
|
字典管理 批量删除
系统信息管理 get结果判断
硬件管理 批量修改状态
|
7 years ago |
|
yunhao.wang
|
19714088d2
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
4b31fac721
|
用户管理
角色管理
功能管理
组织管理
部门管理
岗位管理
功能优化
|
7 years ago |
|
wei.peng
|
fcc72d46eb
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
16a773ee90
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
1b8178fe82
|
文件资源 批量删除
时间表达式 批量删除
定时任务 批量删除，启用，禁用
|
7 years ago |
|
wei.peng
|
7cc85aab78
|
功能优化
|
7 years ago |
|
alwaysfrin
|
cfbe830662
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
5b5b07be3f
|
代码优化
|
7 years ago |
|
wei.peng
|
f3dd7177c3
|
修改分页API 注释
|
7 years ago |
|
wei.peng
|
8d98aaf173
|
角色管理 功能完成
用户管理 功能完成
添加岗位代码唯一验证
添加部门代码唯一验证
添加组织代码唯一验证
添加角色代码唯一验证
|
7 years ago |
|
yunhao.wang
|
3ab42503d1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
定时任务 全部完成
|
7 years ago |
|
yunhao.wang
|
d590bd7591
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
5b69db3644
|
角色权限管理功能完成
|
7 years ago |
|
yunhao.wang
|
3da77d43e9
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
消息管理 全部完成
文件管理 全部完成
任务表达式 全部完成
HqlPack 日期非空校验 调整
|
7 years ago |
|
alwaysfrin
|
16926429ec
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
fc5977d180
|
mongodb工具方法，日志部分使用mongo
|
7 years ago |
|
wei.peng
|
3af9e465ea
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
e82f083239
|
系统权限管理
系统角色管理
|
7 years ago |
|
yunhao.wang
|
8faf6218c7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
|
7 years ago |
|
alwaysfrin
|
e3fa15c69e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
1a40cde203
|
mongodb整合，功能优化调整
|
7 years ago |
|
yunhao.wang
|
5285693eb1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
|
7 years ago |
|
yunhao.wang
|
4fc97d235b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
2f1163dd32
|
硬件类型 批量删除
硬件管理 分页，排序
字典 列表查询
|
7 years ago |
|
wei.peng
|
5da6fc4f75
|
岗位管理功能完成
组织管理功能完成
|
7 years ago |
|
yunhao.wang
|
2d870ae379
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
356f23fd18
|
单元测试
|
7 years ago |
|
yunhao.wang
|
b5d18b4847
|
系统参数管理 复杂查询，分页，排序
字典管理 复杂查询，分页，排序
硬件类型 复杂查询，分页，排序
分页插件 开始行错误bug
|
7 years ago |
|
wei.peng
|
21091dadab
|
添加 岗位Tree
添加 部门Tree
添加 组织Tree
添加 功能Tree
岗位功能模块 开发完成
|
7 years ago |
|
wei.peng
|
5ca5df9de6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
64b4ce2200
|
添加 岗位Tree
添加 部门Tree
添加 组织Tree
添加 功能Tree
岗位功能模块 开发完成
|
7 years ago |
|
alwaysfrin
|
f5732c6ffb
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
3de1f6cf14
|
国家化处理
|
7 years ago |
|
yunhao.wang
|
8d8cd35235
|
枚举字段 整理
|
7 years ago |
|
wei.peng
|
e0d52bbf13
|
用户登录功能完成
单元测试 Demo 编写
|
7 years ago |
|
wei.peng
|
a548a318ba
|
用户登录功能完成
单元测试 Demo 编写
|
7 years ago |
|
wei.peng
|
d3bb38283d
|
版本冲突解决
|
7 years ago |
|
wei.peng
|
d8915185ed
|
用户登录开发
系统Tree 树开发
|
7 years ago |
|
wei.peng
|
dd58bd9c2e
|
添加Tree 树控制器
|
7 years ago |
|
yunhao.wang
|
baee2c5f93
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
646a3a5cb2
|
POM Bug 修复
prop 跨域修改
|
7 years ago |
|
yunhao.wang
|
68a3aac25a
|
规范实体字段
|
7 years ago |
|
alwaysfrin
|
35a204ea31
|
跨域提交
mq发送邮件
|
7 years ago |
|
alwaysfrin
|
70facfe86b
|
pom优化
|
7 years ago |
yunhaok
|
99ff3d783b
|
字典管理 完成
文件管理 完成
|
7 years ago |
|
yunhao.wang
|
018edb596c
|
硬件管理 完成
硬件类型管理 完成
|
7 years ago |
|
yunhao.wang
|
8cfa440e92
|
操作日志 完成
系统日志 完成
系统消息 完成
|
7 years ago |
|
wei.peng
|
d4deede0a9
|
用户管理 以及用户登陆功能完成
|
7 years ago |
|
wei.peng
|
8e673a70c9
|
异常信息 添加 VARIFY_EXCEPTION_DATA_EXIT
|
7 years ago |
|
wei.peng
|
fe1cb7a8c4
|
用户增删改功能开发
|
7 years ago |
|
wei.peng
|
6a35a0868b
|
用户业务功能完成
|
7 years ago |
|
wei.peng
|
98b7c78da7
|
用户业务功能完成
|
7 years ago |
|
yunhao.wang
|
7c757cdcb0
|
岗位命名规范
|
7 years ago |
|
yunhao.wang
|
e4ad6c599e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
d612bcb945
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
yunhao.wang
|
b053a8a4fe
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
2c35b0065e
|
基础业务CRUD
|
7 years ago |
|
wei.peng
|
018ee8900c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
|
7 years ago |
|
wei.peng
|
3c751ac130
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
alwaysfrin
|
45d05692a2
|
多路径跨域提交
|
7 years ago |
|
wei.peng
|
778faac1fc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
90e8b2b608
|
ignore整理
|
7 years ago |
|
wei.peng
|
7405bf575f
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
alwaysfrin
|
8ebe456cab
|
功能梳理
|
7 years ago |
|
alwaysfrin
|
cae7ba95de
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
41f15551aa
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
e002108f25
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java
|
7 years ago |
|
alwaysfrin
|
ebe644944d
|
ignore整理
|
7 years ago |
|
wei.peng
|
a822dad674
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
825795ab0a
|
系统先跑起来
|
7 years ago |
|
alwaysfrin
|
5e8f67a1e5
|
目录结构调整
|
7 years ago |
|
wei.peng
|
8647054744
|
移除.iml文件的版本控制
|
7 years ago |
|
wei.peng
|
c251261ace
|
移除.iml文件的版本控制
|
7 years ago |
|
wei.peng
|
a70f9006b7
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
2685bfc2ef
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
b1fccb8555
|
调整
|
7 years ago |
|
alwaysfrin
|
bd09479055
|
平台功能优化
|
7 years ago |
|
alwaysfrin
|
6348595b50
|
国际化
|
7 years ago |
|
alwaysfrin
|
7368b04ccd
|
国家化封装
|
7 years ago |
|
alwaysfrin
|
d9ea77507f
|
shiro优化
|
7 years ago |
|
alwaysfrin
|
537e5791c5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
643fd81dbd
|
shiro优化
|
7 years ago |
|
yunhao.wang
|
2d0fc26fc4
|
中文乱码
|
7 years ago |
|
wei.peng
|
a89ef37c18
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
b8f88a8b4d
|
impp核心功能初始化
|
7 years ago |
|
alwaysfrin
|
fe08a6ffbd
|
初始化
|
7 years ago |