Evaluation license expires Fri Dec 24 21:00:00 CST 2337

ZhongJi/common/common-security

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 4
Last Commit: 12 四月 22
Commits this week: 0
Total Lines of Code (LoC): 2,604
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
星期四 09 三月 2023
8:48 下午

ciel

#

需求1：变更单提交后自动开启，无需手动点“开启”按钮

需求2：“02 负责人审批”阶段 ，提交申请的时候审批人默认是“申请人的经理”，但是也给用户可以更改选项

Options
    • -1
    • +26
    ./main/java/com/sinba/common/security/action/HRMSJobAction.java
    • -11
    • +25
    ./main/java/com/sinba/common/security/service/HRMSJobService.java
    • -0
    • +3
    ./main/java/com/sinba/common/security/service/IHRMSJobService.java
    • -0
    • +3
    ./main/resources/struts/struts-security.xml
  5. … 6 more files in changeset.
星期五 03 三月 2023
7:56 下午

ciel

#正式许可更新机构目录会导致启动特别慢，用户机构特别多
Options
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/CompanyService.java
星期二 15 十一月 2022
10:54 上午

zane

# 中集调整
Options
    • -5
    • +6
    ./main/java/com/sinba/common/security/service/HRMSJobService.java
星期三 26 十月 2022
11:34 上午

zane

变更模块：在工单基本信息中显示“企业工号”、“所属岗位”
Options
    • -0
    • +7
    ./main/java/com/sinba/common/security/service/IHRMSJobService.java
    • -0
    • +4
    ./main/java/com/sinba/common/security/service/HRMSJobService.java
  3. … 12 more files in changeset.
星期四 20 十月 2022
5:20 下午

zane

ZJ-5 SVN52603、SVN52611 需求一：与HR系统对接： 1.HR提供返回机构以及机构对应领导信息的接口（API接口对接） 2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口
Options
    • -0
    • +1
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -70
    • +118
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
    • -1
    • +6
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -3
    • +5
    ./main/java/com/sinba/common/security/service/HRMSJobService.java
  5. … 9 more files in changeset.
星期三 19 十月 2022
2:42 下午

zane

ZJ-5 SVN52603、SVN52611 需求一：与HR系统对接： 1.HR提供返回机构以及机构对应领导信息的接口（API接口对接） 2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口
Options
    • -0
    • +83
    ./main/java/com/sinba/common/security/entity/HRMSJob.java
    • -0
    • +31
    ./main/java/com/sinba/common/security/service/IHRMSJobService.java
    • -0
    • +49
    ./main/java/com/sinba/common/security/dto/HRMSJobQueryDTO.java
    • -2
    • +4
    ./main/resources/spring/applicationContext-security.xml
    • -0
    • +59
    ./main/java/com/sinba/common/security/dao/HRMSJobDAO.java
    • -0
    • +8
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -0
    • +25
    ./main/java/com/sinba/common/security/dao/IHRMSJobDAO.java
    • -0
    • +66
    ./main/java/com/sinba/common/security/dto/HRMSJobGridDTO.java
    • -0
    • +6
    ./main/resources/struts/struts-security.xml
    • -0
    • +91
    ./main/java/com/sinba/common/security/action/HRMSJobAction.java
    • -193
    • +556
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
    • -0
    • +109
    ./main/java/com/sinba/common/security/service/HRMSJobService.java
  13. … 24 more files in changeset.
星期二 11 十月 2022
1:56 下午

zane

ZJ-5 SVN52603、SVN52611 需求一：与HR系统对接： 1.HR提供返回机构以及机构对应领导信息的接口（API接口对接） 2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口
Options
    • -17
    • +7
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
星期五 23 九月 2022
9:19 上午

zane

中集需求一：与HR系统对接

1.HR提供返回机构以及机构对应领导信息的接口（API接口对接）

2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口

Options
    • -6
    • +19
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
8:54 上午

zane

中集需求一：与HR系统对接

1.HR提供返回机构以及机构对应领导信息的接口（API接口对接）

2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口

Options
    • -3
    • +3
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
星期四 22 九月 2022
5:57 下午

zane

ZJ-5 中集需求一：与HR系统对接

1.HR提供返回机构以及机构对应领导信息的接口（API接口对接）

2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口

Options
    • -237
    • +0
    ./main/java/com/sinba/common/security/entity/Employee.java
    • -0
    • +132
    ./main/java/com/sinba/common/security/dto/PositionDTO.java
    • -129
    • +0
    ./main/java/com/sinba/common/security/entity/Position.java
    • -0
    • +258
    ./main/java/com/sinba/common/security/dto/EmployeeDTO.java
    • -69
    • +100
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
  6. … 11 more files in changeset.
2:14 下午

zane

ZJ-5 中集需求一：与HR系统对接

1.HR提供返回机构以及机构对应领导信息的接口（API接口对接）

2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口

Options
    • -0
    • +237
    ./main/java/com/sinba/common/security/entity/Employee.java
    • -1
    • +4
    ./main/resources/spring/applicationContext-security.xml
    • -0
    • +10
    ./main/java/com/sinba/common/security/dto/OrganizationDTO.java
    • -11
    • +68
    ./main/java/com/sinba/common/security/service/OrganizationInnerService.java
    • -0
    • +129
    ./main/java/com/sinba/common/security/entity/Position.java
    • -3
    • +13
    ./main/java/com/sinba/common/security/entity/Organization.java
    • -0
    • +5
    ./main/java/com/sinba/common/security/service/IOrganizationInnerService.java
    • -0
    • +432
    ./main/java/com/sinba/common/security/service/SyncOrganizationJob.java
  9. … 15 more files in changeset.
9:44 上午

ciel

#ZJ-4需求5 二次指派后回到开启流程之前的状态

1、点击任务重新指派后，分段式统计并体现任务情况

2、导出的数据 是否把所有参与人与处理时效都导出来（涉及多人分多列）

Options
    • -0
    • +2
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +12
    ./main/java/com/sinba/common/security/dao/UserDAO.java
    • -0
    • +4
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -0
    • +2
    ./main/java/com/sinba/common/security/dao/IUserDAO.java
  5. … 55 more files in changeset.
星期三 21 九月 2022
4:16 下午

andy

中集二开

***修改变更指派时，重复查询以及循环遍历问题

***优化修改变更回访时，参数固定问题

***修改用户只要有终端角色，页面显示BUG

Options
    • -1
    • +1
    ./main/java/com/sinba/common/security/dao/UserDAO.java
    • -1
    • +10
    ./main/java/com/sinba/common/security/dto/UserQueryDTO.java
    • -8
    • +0
    ./main/java/com/sinba/common/security/action/UserAction.java
  4. … 6 more files in changeset.
星期二 13 九月 2022
11:22 上午

andy

中集二开：需求三
Options
    • -2
    • +17
    ./main/java/com/sinba/common/security/action/UserAction.java
  2. … 10 more files in changeset.
星期二 06 九月 2022
9:57 上午

ciel

#漏上传
Options
    • -0
    • +65
    ./main/java/com/sinba/common/security/dto/UserSyncDTO.java
星期四 04 八月 2022
6:59 下午

ciel

#调整为MQ消费
Options
    • -226
    • +141
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -2
    • +2
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -4
    • +6
    ./main/java/com/sinba/common/security/service/ILDAPService.java
    • -26
    • +26
    ./main/java/com/sinba/common/security/service/UserInfoService.java
  5. … 1 more file in changeset.
1:53 下午

ciel

#AD同步链接数问题优化

#需求保存报错

Options
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -1
    • +12
    ./main/java/com/sinba/common/security/dto/LDAPDTO.java
    • -23
    • +28
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -2
    • +3
    ./main/java/com/sinba/common/security/dao/LDAPDAO.java
  5. … 1 more file in changeset.
星期日 10 七月 2022
10:37 下午

ciel

#编号重复问题处理，504缓存问题处理
Options
    • -1
    • +1
    ./main/java/com/sinba/common/security/action/OrganizationAction.java
  2. … 11 more files in changeset.
星期四 07 七月 2022
6:19 下午

ciel

#请求导出优化迁移
Options
    • -1
    • +1
    ./main/java/com/sinba/common/security/dao/UserDAO.java
  2. … 1 more file in changeset.
星期一 20 六月 2022
11:57 上午

ciel

#导出慢问题优化
Options
    • -2
    • +2
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -2
    • +6
    ./main/java/com/sinba/common/security/dao/UserDAO.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/dao/IUserDAO.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
  5. … 1 more file in changeset.
星期六 18 六月 2022
7:24 下午

ciel

#导出慢问题优化
Options
    • -1
    • +1
    ./main/java/com/sinba/common/security/dao/IUserDAO.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +5
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -0
    • +12
    ./main/java/com/sinba/common/security/dao/UserDAO.java
  5. … 1 more file in changeset.
星期三 25 五月 2022
10:53 下午

ciel

#讨论调整的代码
Options
    • -0
    • +4
    ./main/java/com/sinba/common/security/dao/UserDAO.java
    • -2
    • +0
    ./main/java/com/sinba/common/security/entity/User.java
    • -2
    • +0
    ./main/java/com/sinba/common/security/entity/Holiday.java
  4. … 5 more files in changeset.
星期一 23 五月 2022
11:18 下午

ciel

#日志调整

#统计调整

Options
    • -12
    • +12
    ./main/java/com/sinba/common/security/dao/UserDAO.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/OperationService.java
    • -2
    • +3
    ./main/java/com/sinba/common/jaas/service/BTLoginModule.java
    • -3
    • +6
    ./main/java/com/sinba/common/sso/util/utilproper.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/FunctionService.java
    • -1
    • +3
    ./main/java/com/sinba/common/security/action/CompanyAction.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/OrganizationService.java
    • -9
    • +12
    ./main/java/com/sinba/common/sso/service/LoginService.java
    • -2
    • +2
    ./main/java/com/sinba/common/security/action/LoginFailureHandler.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/CustomerService.java
    • -1
    • +1
    ./main/java/com/sinba/common/jaas/service/SaasDBLoginModule.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/SupplierService.java
    • -2
    • +3
    ./main/java/com/sinba/common/jaas/service/SSOLoginModule.java
    • -1
    • +3
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -7
    • +9
    ./main/java/com/sinba/common/util/EncryptUtils.java
  16. … 16 more files in changeset.
星期三 18 五月 2022
9:25 下午

ciel

代码优化
Options
    • -190
    • +6
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +3
    ./main/java/com/sinba/common/security/dao/IUserDAO.java
    • -26
    • +118
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -0
    • +12
    ./main/java/com/sinba/common/security/dao/UserDAO.java
    • -0
    • +1
    ./main/java/com/sinba/common/security/service/ILDAPService.java
星期二 17 五月 2022
9:40 下午

ciel

#添加休眠时间
Options
    • -10
    • +14
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -5
    • +14
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -1
    • +2
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
5:30 下午

ciel

#定期任务分组
Options
    • -0
    • +10
    ./main/java/com/sinba/common/security/dto/LDAPUserDTO.java
    • -3
    • +6
    ./main/java/com/sinba/common/security/dao/LDAPDAO.java
    • -7
    • +8
    ./main/java/com/sinba/common/security/service/UserInfoService.java
    • -52
    • +60
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -1
    • +1
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -2
    • +2
    ./main/java/com/sinba/common/security/service/ILDAPService.java
  7. … 9 more files in changeset.
2:41 下午

ciel

#文件写入分段
Options
    • -56
    • +2
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -22
    • +186
    ./main/java/com/sinba/common/security/service/UserInfoService.java
9:39 上午

ciel

#初次同步时会存一份数据进行备份，后续同步会进行比对，只更新有变化的数据
Options
    • -7
    • +134
    ./main/java/com/sinba/common/security/service/LDAPService.java
星期一 16 五月 2022
3:51 下午

ciel

#AD同步分解事务
Options
    • -249
    • +10
    ./main/java/com/sinba/common/security/service/LDAPService.java
    • -0
    • +2
    ./main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +254
    ./main/java/com/sinba/common/security/service/UserInfoService.java
3:12 下午

ciel

#不使用队列进行同步
Options
    • -16
    • +2
    ./main/java/com/sinba/common/security/service/LDAPService.java