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

ZhongJi

common

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 6
Last Commit: 22 九月 22
Commits this week: 0
Total Lines of Code (LoC): 5,144
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

Subversion Details

1 property
  • svn:mergeinfo = /CODE/branch/2.0.2/common:10427-10705 /CODE/branch/2.0.3/common:10805-11356 /CODE/branch/2.0.4/common:11387-12264 /CODE/branch/2.5.2RC/common:24004-24504 /CODE/branch/2.6GA/common:25307-25468 /CODE/branch/2.9.1GA/common:29056-29683 /CODE/branch/2.9RC/common:28355-28553 /CODE/branch/2.9RC/itsm/common:28354 /CODE/branch/3.1GA/itsm/common:32788-32881 /CODE/branch/3.1RC/itsm/common:32201-32350 /CODE/branch/3.5RC/itsm/common:40708-40785 /CODE/branch/Customer/2.9GA2Saas/common:29685-31619,31621-31799 /CODE/branch/Customer/中集更新/zhongji3.5.7GA/itsm/common:52451-52550 /CODE/branch/Guoyu_ITSM/2.6.2GA/common:27094-27663 /CODE/branch/Guoyu_Person_Work/lywork/3.2GA/itsm/common:35063-35220 /CODE/branch/dameng/itsm/common:48190-48480 /CODE/branch/liucheng/itsm/common:48089-49485,49487-49565 /CODE/branch/lywork/2.5RC/common:24898-24938 /CODE/branch/xlp/2.1GA/common:14206-14255 /CODE/tags/ITSM/2.9GA/common:28850-29055 /CODE/tags/ITSM/2.9GA2/common:29684 /CODE/tags/ITSM/3.1GA/itsm/common:32882-33037
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
星期三 21 九月 2022
1:33 下午

sam

显示需求

1、请求详细、请求列表 中请求人所属机构字段（显示分公司名称、所属产业）

2、在导出基础数据时，列表中新增请求人邮箱、所属产业、企业名称，将请求人所属机构信息导出

Options
    • -0
    • +41
    ./common-tools/src/main/java/com/sinba/common/tools/util/ZhongJiUtils.java
  2. … 3 more files in changeset.
星期二 20 九月 2022
5:27 下午

andy

中集28人天二开：

需求三：修改终端用户新增请求时去掉紧急度，优先级，影响

Options
    • -0
    • +1
    ./common-tools/src/main/java/com/sinba/common/tools/service/UserReturnVisitService.java
  2. … 3 more files in changeset.
11:16 上午

andy

中集28人天二开需求7：

邮件回访评分可以二次编辑：

1.三个工作日不评价的默认满意

2.满意度选项调整为:满意、非常满意、不满意、非常不满意

3.满意度选项可以在回访事项中手动调整，调整按钮有权限才可以看到

导出请求数据添加回访字段：

1.请求导出添加2个字段：满意度和满意是否默认

2.满意度显示请求回访的满意度

3.满意是否默认显示是否是三个工作日不评价的默认满意

4.添加回访内容字段

Options
    • -3
    • +3
    ./common-tools/src/main/java/com/sinba/common/tools/service/UserReturnVisitService.java
    • -3
    • +3
    ./common-sla/src/main/java/com/sinba/common/sla/util/CalcPredictTimeUtils.java
    • -0
    • +8
    ./common-tools/src/main/java/com/sinba/common/tools/dao/UserReturnVisitDAO.java
    • -0
    • +2
    ./common-tools/src/main/java/com/sinba/common/tools/dao/IUserReturnVisitDAO.java
  5. … 35 more files in changeset.
星期五 16 九月 2022
10:29 上午

ciel

#1.请求编号生成规则调整为根据请求分类编码生成，原有旧数据不用做调整，保持原有编码

2.在标题未填写时，先请求分类不自动添加标题描述

3.编辑后重新匹配sla，未算挂起时间（非工作日情况处理）

Options
    • -0
    • +10
    ./common-tools/src/main/java/com/sinba/common/tools/dao/CostDAO.java
    • -0
    • +3
    ./common-tools/src/main/java/com/sinba/common/tools/service/ICostService.java
    • -0
    • +7
    ./common-tools/src/main/java/com/sinba/common/tools/dao/ICostDAO.java
    • -0
    • +5
    ./common-tools/src/main/java/com/sinba/common/tools/service/CostService.java
  5. … 13 more files in changeset.
星期二 13 九月 2022
11:22 上午

andy

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

ciel

#漏上传
Options
    • -0
    • +65
    ./common-security/src/main/java/com/sinba/common/security/dto/UserSyncDTO.java
星期三 24 八月 2022
11:56 上午

ciel

#附件后缀添加格式
Options
    • -1
    • +1
    ./common-tools/src/main/java/com/sinba/common/tools/action/UploadAction.java
  2. … 11 more files in changeset.
星期四 04 八月 2022
6:59 下午

ciel

#调整为MQ消费
Options
    • -226
    • +141
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -4
    • +6
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
    • -7
    • +4
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserConsumer.java
    • -26
    • +26
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
1:53 下午

ciel

#AD同步链接数问题优化

#需求保存报错

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

ciel

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

ciel

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

ciel

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

ciel

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

ciel

#讨论调整的代码
Options
    • -0
    • +4
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -2
    • +0
    ./common-security/src/main/java/com/sinba/common/security/entity/User.java
    • -4
    • +1
    ./common-tools/src/main/java/com/sinba/common/noticeRule/service/NoticeRuleService.java
    • -2
    • +0
    ./common-security/src/main/java/com/sinba/common/security/entity/Holiday.java
    • -1
    • +0
    ./common-config/src/main/java/com/sinba/common/config/server/service/ServerUrlService.java
  6. … 3 more files in changeset.
星期一 23 五月 2022
11:18 下午

ciel

#日志调整

#统计调整

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

ciel

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

ciel

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

ciel

#定期任务分组
Options
    • -0
    • +10
    ./common-security/src/main/java/com/sinba/common/security/dto/LDAPUserDTO.java
    • -1
    • +1
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserConsumer.java
    • -1
    • +8
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/dto/ScheduledTaskDTO.java
    • -3
    • +6
    ./common-security/src/main/java/com/sinba/common/security/dao/LDAPDAO.java
    • -1
    • +11
    ./common-tools/src/main/java/com/sinba/common/tools/service/ADUpdateJob.java
    • -1
    • +9
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/dto/ScheduledTaskRequestDTO.java
    • -7
    • +8
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -0
    • +8
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/entity/ScheduledTask.java
    • -52
    • +60
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -0
    • +2
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/service/ScheduledTaskService.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -1
    • +8
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/dto/ScheduledTaskGridDTO.java
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
  14. … 2 more files in changeset.
2:41 下午

ciel

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

ciel

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

ciel

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

ciel

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

ciel

#优化AD同步组织机构保存
Options
    • -1
    • +1
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserConsumer.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
    • -0
    • +11
    ./common-security/src/main/java/com/sinba/common/security/dto/LDAPUserDTO.java
    • -0
    • +29
    ./common-security/src/main/java/com/sinba/common/security/dao/LDAPDAO.java
    • -39
    • +111
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -0
    • +10
    ./common-security/src/main/java/com/sinba/common/security/dto/UserDTO.java
星期日 15 五月 2022
8:12 下午

ciel

#AD配置调整
Options
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
4:16 下午

ciel

#AD优化
Options
    • -33
    • +242
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -1
    • +1
    ./common-security/src/main/resources/spring/applicationContext-AD-activemq.xml
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/ldapmq/LdapAddUserProducer.java
    • -0
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
    • -2
    • +0
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -0
    • +31
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserMessageConsumer.java
    • -64
    • +12
    ./common-security/src/main/java/com/sinba/common/ldapmq/LdapAddUserConverter.java
    • -0
    • +29
    ./common-security/src/main/java/com/sinba/common/security/dto/LDAPUserDTO.java
    • -7
    • +10
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserConsumer.java
  10. … 5 more files in changeset.
星期四 12 五月 2022
9:01 上午

steven

#jquery修改
Options
    • -78
    • +1
    ./pom.xml
  2. … 13 more files in changeset.
星期三 11 五月 2022
5:58 下午

matts

struts 漏洞升级
Options
    • -2
    • +3
    ./common-tools/src/main/resources/struts/struts-attendance.xml
    • -3
    • +3
    ./common-config/src/main/resources/struts/struts-historyData.xml
    • -2
    • +3
    ./common-bpm/src/main/resources/struts/struts-bpm.xml
    • -2
    • +3
    ./common-config/src/main/resources/struts/struts-authorization.xml
    • -3
    • +3
    ./common-config/src/main/resources/struts/struts-attachment.xml
    • -3
    • +3
    ./common-config/src/main/resources/struts/struts-customFilter.xml
    • -3
    • +3
    ./common-eav/src/main/resources/struts/struts-eav.xml
    • -3
    • +3
    ./common-rules/src/main/resources/struts/struts-rules.xml
    • -3
    • +3
    ./common-config/src/main/resources/struts/struts-userCustom.xml
    • -3
    • +3
    ./common-config/src/main/resources/struts/struts-eventCategory.xml
    • -3
    • +3
    ./common-tools/src/main/resources/struts/struts-tools.xml
    • -3
    • +3
    ./common-config/src/main/resources/struts/struts-updatelevel.xml
    • -1
    • +1
    ./pom.xml
    • -3
    • +3
    ./common-tools/src/main/resources/struts/struts-eventTask.xml
    • -2
    • +3
    ./common-config/src/main/resources/struts/struts-cloudScript.xml
  16. … 67 more files in changeset.
星期四 05 五月 2022
8:06 下午

ciel

#AD域用户，第一次编辑后，不显示用户主角色，第二次编辑才会显示终端用户的主角色。

#新建工单-请求人输入拼音或工号，点击后无法带出

Options
    • -4
    • +27
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
  2. … 1 more file in changeset.
星期五 22 四月 2022
7:36 下午

ciel

#中集集团SLA分段计时相关功能
Options
    • -0
    • +10
    ./common-sla/src/main/java/com/sinba/common/sla/service/SLARuleService.java
    • -0
    • +2
    ./common-sla/src/main/java/com/sinba/common/sla/service/ISLARuleService.java
    • -0
    • +5
    ./common-sla/src/main/java/com/sinba/common/sla/action/SLARuleAction.java
  4. … 2 more files in changeset.
5:32 下午

ciel

#中集集团SLA分段计时相关功能开发
Options
    • -1
    • +1
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/dao/IProcessTaskRecordDAO.java
    • -0
    • +2
    ./common-bpm/src/main/java/com/sinba/common/bpm/api/IBPI.java
    • -1
    • +1
    ./common-bpm/src/main/java/com/sinba/common/bpm/api/IProcessTaskRecordService.java
    • -1
    • +5
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/dao/ProcessTaskRecordDAO.java
    • -1
    • +7
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/JbpmService.java
    • -0
    • +2
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/listener/ForeachEventListener.java
    • -7
    • +10
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/JbpmBPI.java
    • -3
    • +5
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/ProcessTaskRecordServiceImpl.java
  9. … 9 more files in changeset.