diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index 5c5b5de..1618130 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -55,7 +55,7 @@

个人笔记

-

+

- {{item.create_time | dateFormat:'YYYY-MM-DD HH:mm'}} + {{item.createdAt | dateFormat:'YYYY-MM-DD HH:mm'}}
@@ -109,15 +109,15 @@

diff --git a/src/app/views/cointer/cointer.component.ts b/src/app/views/cointer/cointer.component.ts index 0e169d9..b4d024e 100644 --- a/src/app/views/cointer/cointer.component.ts +++ b/src/app/views/cointer/cointer.component.ts @@ -24,10 +24,10 @@ export class CointerComponent implements OnInit { title: '', content: '', tag: [], - create_time: '', - preview_content: '', - nike_name: '', - modify_time: '', + createdAt: '', + previewContent: '', + nikeName: '', + updatedAt: '', file: '' }; public seleventIndex = 1; //默认加载最近日记 @@ -104,8 +104,9 @@ export class CointerComponent implements OnInit { }; this.service.selNoteList(pdata).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + console.log(res); + if (statusValid(this, code, data)) { this.noteList = data; if (data.length> 0) { //如果是首次加载 获取对应的详情 @@ -115,13 +116,13 @@ export class CointerComponent implements OnInit { this.primitiveNoteInfo = { _id: '', title: '', - nike_name: '', + nikeName: '', content: '', tag: [], - create_time: '', - preview_content: '', + createdAt: '', + previewContent: '', file: '', - modify_time: '', + updatedAt: '', } } } @@ -148,8 +149,8 @@ export class CointerComponent implements OnInit { this.statusPop.noteLoading = true; this.service.selNoteDetail({ _id: _id }).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { this.primitiveNoteInfo = data; this.statusPop.noteLoading = false; } @@ -164,13 +165,13 @@ export class CointerComponent implements OnInit { //点击编辑 //编辑状态下保存文章 let pdata = Object.assign(this.primitiveNoteInfo, {}); - pdata.preview_content = this.primitiveNoteInfo.content ? + pdata.previewContent = this.primitiveNoteInfo.content ? this.primitiveNoteInfo.content.replace(/<[^>]*>/g, "").substring(0, 60) : ''; // pdata.content = this.htmlEncodeByRegExp(pdata.content); //保存转码 this.service.editNote(pdata).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { this.noteList[this.selNoteInfo.index] = pdata; this.messageService.add({ severity: 'success', summary: '提示', detail: '保存成功' }); this.editStatus = false; @@ -192,8 +193,8 @@ export class CointerComponent implements OnInit { //向后台请求插入记录 this.service.addNote(note).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { let shiftData = Object.assign({}, data); this.noteList.unshift(shiftData); this.selNoteInfo.index = 0; @@ -242,8 +243,8 @@ export class CointerComponent implements OnInit { //逻辑删除 this.service.logicDelete(pdata).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { this.updateData(); } } @@ -252,8 +253,8 @@ export class CointerComponent implements OnInit { //物理删除 this.service.physicsDelete(pdata).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { this.updateData(); } } @@ -280,8 +281,8 @@ export class CointerComponent implements OnInit { } this.service.recovery(pdata).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { this.updateData(); } } @@ -324,8 +325,8 @@ export class CointerComponent implements OnInit { data.append('file', file, file.name); this.service.upload(data).subscribe( res => { - let { data, code, message } = res; - if (statusValid(this, code, message)) { + let { data, code } = res; + if (statusValid(this, code, data)) { const range = this.editor.getSelection(true); const index = range.index + range.length; this.editor.insertEmbed(range.index, 'image', data.url); diff --git a/src/app/views/cointer/cointer.service.ts b/src/app/views/cointer/cointer.service.ts index 4b437c7..e541c21 100644 --- a/src/app/views/cointer/cointer.service.ts +++ b/src/app/views/cointer/cointer.service.ts @@ -13,32 +13,32 @@ export class CointerService { public selNoteList(data): any { return this.apiService - .post(`note/selNoteList`, data) + .get(`note/selNoteList`, data) } public editNote(data): any { return this.apiService - .post(`note/editNote`, data) + .put(`note/editNote/${data._id}`, data) } public selNoteDetail(data): any { return this.apiService - .post(`note/selNoteDetail`, data) + .get(`note/selNoteDetail/${data._id}`) } public logicDelete(data):any { return this.apiService - .post(`note/logicDelete`, data) + .put(`note/logicDelete/${data._id}`) } public physicsDelete(data):any{ return this.apiService - .post(`note/physicsDelete`, data) + .delete(`note/physicsDelete/${data._id}`) } public recovery(data):any{ return this.apiService - .post(`note/recovery`, data) + .put(`note/recovery/${data._id}`) } public upload(data):any{ diff --git a/src/app/views/login/login.component.ts b/src/app/views/login/login.component.ts index def629d..1d64638 100644 --- a/src/app/views/login/login.component.ts +++ b/src/app/views/login/login.component.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { LoginService } from './login.service'; import { WindowRef } from '../../global/windowRef.service'; import { apiConfig } from '../../global/apiConfig'; +import { statusValid } from '../../utils/status-valid'; @Component({ selector: 'app-login', templateUrl: './login.component.html', @@ -54,10 +55,8 @@ export class LoginComponent implements OnInit { .dtlogin(this.formModel) .subscribe( res => { - let { data, token, code, message } = res; - this.errMessage = message; - this.errMessage = message; - if (code === 200) { + let { data, token, code } = res; + if (statusValid(this, code, data)) { localStorage.setItem("noteToken", token); localStorage.setItem("noteUser", JSON.stringify(data)); this.router.navigateByUrl('/full/cointer'); @@ -71,7 +70,7 @@ export class LoginComponent implements OnInit { res => { let { data, token, code, message } = res; this.errMessage = message; - if (code === 200) { + if (statusValid(this, code, data)) { localStorage.setItem("noteToken", token); localStorage.setItem("noteUser", JSON.stringify(data)); this.router.navigateByUrl('/full/cointer'); diff --git a/src/app/views/oAuth/oauth-callback/oauth-callback.component.ts b/src/app/views/oAuth/oauth-callback/oauth-callback.component.ts index 804527f..c2aec0a 100644 --- a/src/app/views/oAuth/oauth-callback/oauth-callback.component.ts +++ b/src/app/views/oAuth/oauth-callback/oauth-callback.component.ts @@ -33,8 +33,8 @@ export class OauthCallbackComponent implements OnInit { .github_callback(`login/github_callback?code=${this.code}&state=${this.state}`) .subscribe( res => { - let { data, openId, token, code, message } = res; - if (statusValid(this, code, message)) { + let { data, openId, token, code } = res; + if (statusValid(this, code, data)) { if (openId) { //返回openid说明没有绑定邮箱,跳转到绑定邮箱页面 this.router.navigate(['/page/bindEmail',openId]);

AltStyle によって変換されたページ (->オリジナル) /