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 |