fix: 修改log显示口径

client/components/TimeLine/TimeLine.js

@@ -128,7 +128,7 @@ class TimeTree extends Component {
             <span className="logtype">{logType[item.type]}动态</span>
             <span className="logtime">{formatTime(item.add_time)}</span>
           </div>
-          <span className="logcontent">{item.content}</span>
+          <span className="logcontent" dangerouslySetInnerHTML={{__html: item.content}}></span>
         </Timeline.Item>);
       });
     } else {

server/controllers/group.js

@@ -105,7 +105,7 @@ class groupController extends baseController {
             result = yapi.commons.fieldSelect(result, ['_id', 'group_name', 'group_desc', 'uid', 'members','type']);
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 新增了分组 "${params.group_name}"`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 新增了分组 "${params.group_name}"`,
                 type: 'group',
                 uid: this.getUid(),
                 username: username,
@@ -201,8 +201,12 @@ class groupController extends baseController {
                 guest: "访客"
             };
             if(add_members.length){
+                let members = add_members.map((item)=>{
+                    return `<a href = "/user/profile/${item.uid}">${item.username}</a>`
+                })
+                members = members.join("、");
                 yapi.commons.saveLog({
-                    content: `用户 "${username}" 新增了分组成员 "${add_members.reduce((str, item) => (str ? str + '、' : '') + item.username, '')}" 为 "${rolename[params.role]}"`,
+                    content: `<a href="/user/profile/${this.getUid()}">${username}</a> 新增了分组成员 ${members} 为 ${rolename[params.role]}`,
                     type: 'group',
                     uid: this.getUid(),
                     username: username,
@@ -262,7 +266,7 @@ class groupController extends baseController {
             };
             let groupUserdata = await this.getUserdata(params.member_uid, params.role);
             yapi.commons.saveLog({
-                content: `用户 "${username}" 更改了分组成员 "${groupUserdata.username}" 的权限为 "${rolename[params.role]}"`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更改了分组成员 <a href="/user/profile/${params.member_uid}">${groupUserdata.username}</a> 的权限为 "${rolename[params.role]}"`,
                 type: 'group',
                 uid: this.getUid(),
                 username: username,
@@ -338,7 +342,7 @@ class groupController extends baseController {
             };
             let groupUserdata = await this.getUserdata(params.member_uid, params.role);
             yapi.commons.saveLog({
-                content: `用户 "${username}" 删除了分组成员 "${groupUserdata.username}"`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 删除了分组成员 <a href="/user/profile/${params.member_uid}">${groupUserdata.username}</a>`,
                 type: 'group',
                 uid: this.getUid(),
                 username: username,
@@ -494,7 +498,7 @@ class groupController extends baseController {
             let result = await groupInst.up(id, data);
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 更新了 "${data.group_name}" 分组`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了 <a href="/group/${id}">${data.group_name}</a> 分组`,
                 type: 'group',
                 uid: this.getUid(),
                 username: username,

server/controllers/interface.js

@@ -158,7 +158,8 @@ class interfaceController extends baseController {
             yapi.emitHook('interface_add', result._id).then();
             this.catModel.get(params.catid).then((cate) => {
                 let username = this.getUsername();
-                let title = `用户 "${username}" 为分类 "${cate.name}" 添加了接口 "${data.title}"`
+                let title = `<a href="/user/profile/${this.getUid()}">${username}</a> 为分类 <a href="/project/${params.project_id}/interface/api/cat_${params.catid}">${cate.name}</a> 添加了接口 <a href="/project/${params.project_id}/interface/api/${result._id}">${data.title}</a> `
+                
                 yapi.commons.saveLog({
                     content: title,
                     type: 'project',
@@ -484,7 +485,7 @@ class interfaceController extends baseController {
             if (data.catid) {
                 this.catModel.get(+data.catid).then((cate) => {
                     yapi.commons.saveLog({
-                        content: `用户 "${username}" 更新了分类 "${cate.name}" 下的接口 "${interfaceData.title}"`,
+                        content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了分类 <a href="/project/${cate.project_id}/interface/api/cat_${data.catid}">${cate.name}</a> 下的接口 <a href="project/${cate.project_id}/interface/api/${id}">${interfaceData.title}</a>`,
                         type: 'project',
                         uid: this.getUid(),
                         username: username,
@@ -496,7 +497,7 @@ class interfaceController extends baseController {
                 let cateid = interfaceData.catid;
                 this.catModel.get(cateid).then((cate) => {
                     yapi.commons.saveLog({
-                        content: `用户 "${username}" 更新了分类 "${cate.name}" 下的接口 "${interfaceData.title}"`,
+                        content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了分类 <a href="/project/${cate.project_id}/interface/api/cat_${cateid}">${cate.name}</a> 下的接口 <a href="project/${cate.project_id}/interface/api/${id}>${interfaceData.title}</a>`,
                         type: 'project',
                         uid: this.getUid(),
                         username: username,
@@ -562,7 +563,7 @@ class interfaceController extends baseController {
             let username = this.getUsername();
             this.catModel.get(inter.catid).then((cate) => {
                 yapi.commons.saveLog({
-                    content: `用户 "${username}" 删除了分类 "${cate.name}" 下的接口 "${inter.title}"`,
+                    content: `<a href="/user/profile/${this.getUid()}">${username}</a> 删除了分类 <a href="/project/${cate.project_id}/interface/api/cat_${inter.catid}">${cate.name}</a> 下的接口 "${inter.title}"`,
                     type: 'project',
                     uid: this.getUid(),
                     username: username,
@@ -639,7 +640,7 @@ class interfaceController extends baseController {
 
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 添加了分类 "${params.name}"`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 添加了分类  <a href="/project/${params.project_id}/interface/api/cat_${result._id}">${params.name}</a>`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,
@@ -670,7 +671,7 @@ class interfaceController extends baseController {
                 return ctx.body = yapi.commons.resReturn(null, 400, '没有权限');
             }
             yapi.commons.saveLog({
-                content: `用户 "${username}" 更新了分类 "${cate.name}"`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了分类 <a href="/project/${cate.project_id}/interface/api/cat_${params.catid}">${cate.name}</a>`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,
@@ -700,7 +701,7 @@ class interfaceController extends baseController {
 
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 删除了分类 "${catData.name}" 及该分类下的接口`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 删除了分类 <a href="/project/${catData.project_id}/interface/api/cat_${id}">${catData.name}</a> 及该分类下的接口`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,

server/controllers/log.js

@@ -48,7 +48,7 @@ class logController extends baseController {
                 projectLogList.forEach((item, index)=>{
                     item = item.toObject();
                     if(item.type === 'project'){
-                        item.content = `在 ${projectDatas[item.typeid].name} 项目: ` + item.content;
+                        item.content = `在 <a href="/group/${item.typeid}">${projectDatas[item.typeid].name}</a> 项目: ` + item.content;
                     }
                     projectLogList[index] = item;
                 })

server/controllers/project.js

@@ -134,11 +134,11 @@ class projectController extends baseController {
             }
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 添加了项目 "${params.name}"`,
-                type: 'group',
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 添加了项目 <a href="/project/${result._id}">${params.name}</a>`,
+                type: 'project',
                 uid: this.getUid(),
                 username: username,
-                typeid: params.group_id
+                typeid: result._id
             });
             ctx.body = yapi.commons.resReturn(result);
         } catch (e) {
@@ -204,9 +204,13 @@ class projectController extends baseController {
         try {
             let result = await this.Model.addMember(params.id, add_members);
             if(add_members.length){
+                let members = add_members.map((item)=>{
+                    return `<a href = "/user/profile/${item.uid}">${item.username}</a>`
+                })
+                members = members.join("、");
                 let username = this.getUsername();
                 yapi.commons.saveLog({
-                    content: `用户 "${username}" 添加了项目成员 "${add_members.reduce((str, item) => (str ? str + '、' : '') + item.username, '')}"`,
+                    content: `<a href="/user/profile/${this.getUid()}">${username}</a> 添加了项目成员 ${members}`,
                     type: 'project',
                     uid: this.getUid(),
                     username: username,
@@ -258,7 +262,7 @@ class projectController extends baseController {
             let username = this.getUsername();
             yapi.getInst(userModel).findById(params.member_uid).then((member)=>{
                 yapi.commons.saveLog({
-                    content: `用户 "${username}" 删除了项目中的成员 "${member.username}"`,
+                    content: `<a href="/user/profile/${this.getUid()}">${username}</a> 删除了项目中的成员 <a href="/user/profile/${params.member_uid}">${member.username}</a>`,
                     type: 'project',
                     uid: this.getUid(),
                     username: username,
@@ -469,14 +473,18 @@ class projectController extends baseController {
         }
 
         params.role = ['owner', 'dev', 'guest'].find(v => v === params.role) || 'dev';
-
+        let rolename = {
+            'owner': '组长',
+            'dev': '开发者',
+            'guest': '访客'
+        };
         try {
             let result = await projectInst.changeMemberRole(params.id, params.member_uid, params.role);
 
             let username = this.getUsername();
             yapi.getInst(userModel).findById(params.member_uid).then((member)=>{
                 yapi.commons.saveLog({
-                    content: `用户 "${username}" 修改了项目中的成员 "${member.username}" 的角色为 "${params.role}"`,
+                    content: `<a href="/user/profile/${this.getUid()}">${username}</a> 修改了项目中的成员 <a href="/user/profile/${params.member_uid}">${member.username}</a> 的角色为 "${rolename[params.role]}"`,
                     type: 'project',
                     uid: this.getUid(),
                     username: username,
@@ -522,7 +530,7 @@ class projectController extends baseController {
             this.followModel.updateById(this.getUid(), id, data).then(()=>{
                 let username = this.getUsername();
                 yapi.commons.saveLog({
-                    content: `用户 "${username}" 修改了项目图标、颜色`,
+                    content: `<a href="/user/profile/${this.getUid()}">${username}</a> 修改了项目图标、颜色`,
                     type: 'project',
                     uid: this.getUid(),
                     username: username,
@@ -601,7 +609,7 @@ class projectController extends baseController {
             let result = await this.Model.up(id, data);
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 更新了项目 "${projectData.name}"`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了项目 <a href="/user/profile/${id}}">${projectData.name}</a> ""`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,
@@ -652,7 +660,7 @@ class projectController extends baseController {
             let result = await this.Model.up(id, data);
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `用户 "${username}" 更新了项目 "${projectData.name}" 环境`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了项目 <a href="/user/profile/${id}">${projectData.name}"</a> 环境`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,