wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

This commit is contained in:
wangliwen 2022-10-22 10:51:31 +08:00
parent b14d805a4c 6feb229b22
commit 6402a9667d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
View File

@ -193,7 +193,8 @@ public class ActivitiNoticeAspect {
if ("能力申请流程".equals(activitiNoticeOperation.process())) { if ("能力申请流程".equals(activitiNoticeOperation.process())) {
type = 0; type = 0;
//【进度通知】您发起的+资源名称+申请已通过+审核部门（已审核部门）+审核，下一节点为+审核部门+审核。 //【进度通知】您发起的+资源名称+申请已通过+审核部门（已审核部门）+审核，下一节点为+审核部门+审核。
content = "【进度通知】您发起的" + resourceName + "申请已被" + userDTO.getDeptName() + "的" + userDTO.getRealName() + "审核，审核结果为：" + finalResult; SysUserDTO assignee = sysUserService.get(Long.valueOf(delegateTask.getAssignee()));
content = "【进度通知】您发起的" + resourceName + "申请已被" + assignee.getDeptName() + "的" + assignee.getRealName() + "审核，审核结果为：" + finalResult;
} else if ("能力资源上架".equals(activitiNoticeOperation.process())) { } else if ("能力资源上架".equals(activitiNoticeOperation.process())) {
type = 2; type = 2;
} else if ("能力资源下架".equals(activitiNoticeOperation.process())) { } else if ("能力资源下架".equals(activitiNoticeOperation.process())) {

5
renren-admin/src/main/resources/application-prod.yml
View File

@ -64,3 +64,8 @@ synchro:
url: jdbc:mysql://15.72.183.91:3306/monitor_manage?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false url: jdbc:mysql://15.72.183.91:3306/monitor_manage?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
username: root username: root
password: w@CmM1mBVQkPhdrc password: w@CmM1mBVQkPhdrc
# 前端地址入口，门户和管理端
front:
portal-url: http://15.72.183.90:7008
manage-url: http://15.72.183.90:8001