From c569f7a63f667c76b72e94d0273cf6fbc19a0452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=B5=B7?= Date: Thu, 16 Apr 2020 18:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4class=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=B9=B6=E9=83=A8=E5=88=86class=E5=88=B0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index/src/app/api/api.service.ts | 24 +++++----- index/src/app/api/http/http.service.ts | 7 ++- index/src/app/app.component.ts | 6 +-- .../src/app/class/{article.ts => Article.ts} | 16 +++++++ index/src/app/class/Comment.ts | 20 +++++++++ index/src/app/class/ErrDispatch.ts | 2 +- index/src/app/class/HttpReqAndResp.ts | 45 +++++++++++++++++++ index/src/app/class/Request.ts | 12 ----- index/src/app/class/Response.ts | 11 ----- index/src/app/class/{category.ts => Tag.ts} | 17 ++++--- index/src/app/class/{loginReq.ts => User.ts} | 11 +++++ index/src/app/class/articleReq.ts | 14 ------ index/src/app/class/commentReq.ts | 18 -------- index/src/app/class/pageList.ts | 20 --------- index/src/app/class/tag.ts | 5 --- index/src/app/class/user.ts | 10 ----- .../app/components/header/header.component.ts | 1 - .../src/app/view/article/article.component.ts | 4 +- .../app/view/category/category.component.ts | 10 ++--- index/src/app/view/index/index.component.ts | 8 ++-- .../components/login/login.component.ts | 4 +- .../registration/registration.component.ts | 4 +- index/src/app/view/tag/tag.component.ts | 4 +- .../publish-form/publish-form.component.ts | 5 +-- index/src/app/view/write/write.component.ts | 6 +-- 25 files changed, 145 insertions(+), 139 deletions(-) rename index/src/app/class/{article.ts => Article.ts} (61%) create mode 100644 index/src/app/class/HttpReqAndResp.ts delete mode 100644 index/src/app/class/Request.ts delete mode 100644 index/src/app/class/Response.ts rename index/src/app/class/{category.ts => Tag.ts} (50%) rename index/src/app/class/{loginReq.ts => User.ts} (56%) delete mode 100644 index/src/app/class/articleReq.ts delete mode 100644 index/src/app/class/commentReq.ts delete mode 100644 index/src/app/class/pageList.ts delete mode 100644 index/src/app/class/tag.ts delete mode 100644 index/src/app/class/user.ts diff --git a/index/src/app/api/api.service.ts b/index/src/app/api/api.service.ts index a2d4e53..4e1a4b7 100644 --- a/index/src/app/api/api.service.ts +++ b/index/src/app/api/api.service.ts @@ -1,19 +1,21 @@ import {Injectable} from '@angular/core'; +import {HttpClient} from '@angular/common/http'; +import {Observable, Observer, of} from 'rxjs'; + import {Article} from '../class/Article'; import {HttpService} from './http/http.service'; -import {PageList} from '../class/pageList'; +import {PageList} from '../class/HttpReqAndResp'; import {ErrDispatch} from '../class/ErrDispatch'; -import {ArticleReq} from '../class/ArticleReq'; -import {Category} from '../class/Category'; +import {ArticleReq} from '../class/Article'; +import {Tag} from '../class/Tag'; import {Comment} from '../class/Comment'; -import {CommentReq} from '../class/CommentReq'; +import {CommentReq} from '../class/Comment'; import {Link} from '../class/Link'; import {User} from '../class/User'; -import {LoginReq} from '../class/LoginReq'; -import {Observable, Observer, of} from 'rxjs'; -import {Response} from '../class/Response'; -import {HttpClient} from '@angular/common/http'; -import {LocalStorageService} from '../utils/local-storage.service'; +import {LoginReq} from '../class/User'; +import {Response} from '../class/HttpReqAndResp'; + +import {LocalStorageService} from '../services/local-storage.service'; @Injectable({ providedIn: 'root' @@ -90,14 +92,14 @@ export class ApiService extends HttpService { } categories() { - return super.Service({ + return super.Service({ path: '/categories', method: 'GET' }); } tags(pageNumber: number = 1, pageSize: number = 10) { - return super.Service({ + return super.Service({ path: '/tags', method: 'GET', queryParam: { diff --git a/index/src/app/api/http/http.service.ts b/index/src/app/api/http/http.service.ts index 3a04dbc..ecea0d2 100644 --- a/index/src/app/api/http/http.service.ts +++ b/index/src/app/api/http/http.service.ts @@ -1,12 +1,11 @@ import {Injectable} from '@angular/core'; -import {RequestObj} from '../../class/Request'; +import {RequestObj} from '../../class/HttpReqAndResp'; import {HttpClient} from '@angular/common/http'; import {environment} from '../../../environments/environment'; -import {LocalStorageService} from '../../utils/local-storage.service'; -import {Response} from '../../class/Response'; +import {LocalStorageService} from '../../services/local-storage.service'; +import {Response} from '../../class/HttpReqAndResp'; import {Observable, Observer, Subject} from 'rxjs'; import {ErrDispatch} from '../../class/ErrDispatch'; -import {multicast} from 'rxjs/operators'; @Injectable({ providedIn: 'root' diff --git a/index/src/app/app.component.ts b/index/src/app/app.component.ts index 72f8711..db08f54 100644 --- a/index/src/app/app.component.ts +++ b/index/src/app/app.component.ts @@ -1,5 +1,5 @@ import {Component, ElementRef, OnInit, TemplateRef, ViewChild} from '@angular/core'; -import {LoginReq} from './class/LoginReq'; +import {LoginReq} from './class/User'; import {HeaderComponent} from './components/header/header.component'; @Component({ @@ -14,14 +14,14 @@ export class AppComponent { registration() { // todo :: 登录 - console.log('registration'); + // console.log('registration'); this.regModal = true; } login() { // TODO :: 注册 - console.log('login'); + // console.log('login'); this.loginModal = true; } diff --git a/index/src/app/class/article.ts b/index/src/app/class/Article.ts similarity index 61% rename from index/src/app/class/article.ts rename to index/src/app/class/Article.ts index eec7335..b5c1986 100644 --- a/index/src/app/class/article.ts +++ b/index/src/app/class/Article.ts @@ -17,3 +17,19 @@ export class Article { readingNumber?: number; open?: string; } + + +export class ArticleReq { + category: string; + id?: number; + mdContent: string; + open: boolean; + tags: string; + title: string; + type: boolean; + url?: string; + + constructor() { + this.type = true; + } +} diff --git a/index/src/app/class/Comment.ts b/index/src/app/class/Comment.ts index de9c4c2..3637817 100644 --- a/index/src/app/class/Comment.ts +++ b/index/src/app/class/Comment.ts @@ -10,3 +10,23 @@ export class Comment { comment: boolean; respComment: Comment[]; } + + +export class CommentReq { + id?: number; + comment: boolean; + content: string; + pid: number; + articleID: number; + responseId: string; + + constructor(comment: boolean) { + this.comment = comment; + this.responseId = ''; + if (!comment) { + this.articleID = -1; + } + this.pid = -1; + this.id = null; + } +} \ No newline at end of file diff --git a/index/src/app/class/ErrDispatch.ts b/index/src/app/class/ErrDispatch.ts index c73acdc..79c04fa 100644 --- a/index/src/app/class/ErrDispatch.ts +++ b/index/src/app/class/ErrDispatch.ts @@ -1,4 +1,4 @@ -import {RequestObj} from './Request'; +import {RequestObj} from './HttpReqAndResp'; export interface ErrDispatch { errHandler(code: number, msg: string, request?: RequestObj): void; diff --git a/index/src/app/class/HttpReqAndResp.ts b/index/src/app/class/HttpReqAndResp.ts new file mode 100644 index 0000000..7ef4596 --- /dev/null +++ b/index/src/app/class/HttpReqAndResp.ts @@ -0,0 +1,45 @@ +import {HttpHeaders} from '@angular/common/http'; + +export class RequestObj { + path: string; + method: 'GET' | 'POST' | 'PUT' | 'DELETE'; + data?: {}; + contentType?: 'application/json' | 'application/x-www-form-urlencoded'; + queryParam?: {}; + header?: HttpHeaders | { + [header: string]: string | string[]; + }; +} + +export class Response { + code: number; + msg: string; + result: T; + date: number; + + constructor(t: T) { + this.code = 0; + this.result = t; + } +} + +export class PageList { + total: number; + list: T[]; + pageNum: number; + pageSize: number; + size: number; + startRow: number; + endRow: number; + pages: number; + prePage: number; + nextPage: number; + isFirstPage: boolean; + isLastPage: boolean; + hasPreviousPage: boolean; + hasNextPage: boolean; + navigatePages: number; + navigatepageNums: number[]; + navigateFirstPage: number; + navigateLastPage: number; +} diff --git a/index/src/app/class/Request.ts b/index/src/app/class/Request.ts deleted file mode 100644 index 59795c7..0000000 --- a/index/src/app/class/Request.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {HttpHeaders} from '@angular/common/http'; - -export class RequestObj { - path: string; - method: 'GET' | 'POST' | 'PUT' | 'DELETE'; - data?: {}; - contentType?: 'application/json' | 'application/x-www-form-urlencoded'; - queryParam?: {}; - header?: HttpHeaders | { - [header: string]: string | string[]; - }; -} diff --git a/index/src/app/class/Response.ts b/index/src/app/class/Response.ts deleted file mode 100644 index be8ed99..0000000 --- a/index/src/app/class/Response.ts +++ /dev/null @@ -1,11 +0,0 @@ -export class Response { - code: number; - msg: string; - result: T; - date: number; - - constructor(t: T) { - this.code = 0; - this.result = t; - } -} diff --git a/index/src/app/class/category.ts b/index/src/app/class/Tag.ts similarity index 50% rename from index/src/app/class/category.ts rename to index/src/app/class/Tag.ts index 8023668..0fc4dd1 100644 --- a/index/src/app/class/category.ts +++ b/index/src/app/class/Tag.ts @@ -1,5 +1,12 @@ -export class Category { - id: number; - name: string; - articles?: number[]; -} +export class Category { + id: number; + name: string; + articles?: number[]; +} + + +export class Tag { + id: number; + name: string; + articles?: number[]; +} diff --git a/index/src/app/class/loginReq.ts b/index/src/app/class/User.ts similarity index 56% rename from index/src/app/class/loginReq.ts rename to index/src/app/class/User.ts index 95be647..09c84c3 100644 --- a/index/src/app/class/loginReq.ts +++ b/index/src/app/class/User.ts @@ -1,3 +1,14 @@ +export class User { + id: number; + email: string; + displayName: string; + emailStatus: boolean; + avatarImgUrl: string; + desc: string; + role: string; + token?: string; +} + export class LoginReq { email: string; isRememberMe: boolean; diff --git a/index/src/app/class/articleReq.ts b/index/src/app/class/articleReq.ts deleted file mode 100644 index c6f3fe0..0000000 --- a/index/src/app/class/articleReq.ts +++ /dev/null @@ -1,14 +0,0 @@ -export class ArticleReq { - category: string; - id?: number; - mdContent: string; - open: boolean; - tags: string; - title: string; - type: boolean; - url?: string; - - constructor() { - this.type = true; - } -} diff --git a/index/src/app/class/commentReq.ts b/index/src/app/class/commentReq.ts deleted file mode 100644 index 307da4a..0000000 --- a/index/src/app/class/commentReq.ts +++ /dev/null @@ -1,18 +0,0 @@ -export class CommentReq { - id?: number; - comment: boolean; - content: string; - pid: number; - articleID: number; - responseId: string; - - constructor(comment: boolean) { - this.comment = comment; - this.responseId = ''; - if (!comment) { - this.articleID = -1; - } - this.pid = -1; - this.id = null; - } -} \ No newline at end of file diff --git a/index/src/app/class/pageList.ts b/index/src/app/class/pageList.ts deleted file mode 100644 index e2104dc..0000000 --- a/index/src/app/class/pageList.ts +++ /dev/null @@ -1,20 +0,0 @@ -export class PageList { - total: number; - list: T[]; - pageNum: number; - pageSize: number; - size: number; - startRow: number; - endRow: number; - pages: number; - prePage: number; - nextPage: number; - isFirstPage: boolean; - isLastPage: boolean; - hasPreviousPage: boolean; - hasNextPage: boolean; - navigatePages: number; - navigatepageNums: number[]; - navigateFirstPage: number; - navigateLastPage: number; -} diff --git a/index/src/app/class/tag.ts b/index/src/app/class/tag.ts deleted file mode 100644 index 09af239..0000000 --- a/index/src/app/class/tag.ts +++ /dev/null @@ -1,5 +0,0 @@ -export class Tag { - id: number; - name: string; - articles?: number[]; -} diff --git a/index/src/app/class/user.ts b/index/src/app/class/user.ts deleted file mode 100644 index e291b97..0000000 --- a/index/src/app/class/user.ts +++ /dev/null @@ -1,10 +0,0 @@ -export class User { - id: number; - email: string; - displayName: string; - emailStatus: boolean; - avatarImgUrl: string; - desc: string; - role: string; - token?: string; -} diff --git a/index/src/app/components/header/header.component.ts b/index/src/app/components/header/header.component.ts index 8477897..ec7cd99 100644 --- a/index/src/app/components/header/header.component.ts +++ b/index/src/app/components/header/header.component.ts @@ -4,7 +4,6 @@ import {NavigationEnd, Router, RouterEvent} from '@angular/router'; import {filter} from 'rxjs/operators'; import {ApiService} from '../../api/api.service'; import {User} from '../../class/User'; -import {LocalStorageService} from '../../utils/local-storage.service'; @Component({ selector: 'app-header', diff --git a/index/src/app/view/article/article.component.ts b/index/src/app/view/article/article.component.ts index 35cea5e..37c56e6 100644 --- a/index/src/app/view/article/article.component.ts +++ b/index/src/app/view/article/article.component.ts @@ -4,8 +4,8 @@ import {ApiService} from '../../api/api.service'; import {Article} from '../../class/Article'; import {Title} from '@angular/platform-browser'; import {User} from '../../class/User'; -import {CommentReq} from '../../class/CommentReq'; -import {PageList} from '../../class/pageList'; +import {CommentReq} from '../../class/Comment'; +import {PageList} from '../../class/HttpReqAndResp'; import {Comment} from '../../class/Comment'; declare var editormd; diff --git a/index/src/app/view/category/category.component.ts b/index/src/app/view/category/category.component.ts index 73cba32..aacb981 100644 --- a/index/src/app/view/category/category.component.ts +++ b/index/src/app/view/category/category.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit} from '@angular/core'; import {ApiService} from '../../api/api.service'; -import {Category} from '../../class/Category'; +import {Tag} from '../../class/Tag'; import {NzMessageService} from 'ng-zorro-antd'; -import {PageList} from '../../class/pageList'; +import {PageList} from '../../class/HttpReqAndResp'; import {Article} from '../../class/Article'; import {ActivatedRoute} from '@angular/router'; import {Location} from '@angular/common'; @@ -22,8 +22,8 @@ export class CategoryComponent implements OnInit { private title: Title) { } - categoryList: Category[] = []; - private category: Category; + categoryList: Tag[] = []; + private category: Tag; articleList: PageList
; name: string; @@ -58,7 +58,7 @@ export class CategoryComponent implements OnInit { }); } - changeCategory(category: Category) { + changeCategory(category: Tag) { if (this.name === category.name) { return; } diff --git a/index/src/app/view/index/index.component.ts b/index/src/app/view/index/index.component.ts index 9bb7fa4..362fb6a 100644 --- a/index/src/app/view/index/index.component.ts +++ b/index/src/app/view/index/index.component.ts @@ -3,11 +3,11 @@ import {ApiService} from '../../api/api.service'; import {Article} from '../../class/Article'; import {NzIconService, NzMessageService} from 'ng-zorro-antd'; import {SvgIconUtil} from '../../utils/svgIconUtil'; -import {PageList} from '../../class/pageList'; +import {PageList} from '../../class/HttpReqAndResp'; import {ErrDispatch} from '../../class/ErrDispatch'; -import {RequestObj} from '../../class/Request'; +import {RequestObj} from '../../class/HttpReqAndResp'; import {Router} from '@angular/router'; -import {Category} from '../../class/Category'; +import {Tag} from '../../class/Tag'; import {Title} from '@angular/platform-browser'; @Component({ @@ -36,7 +36,7 @@ export class IndexComponent implements OnInit, ErrDispatch { desc: string; articles: PageList
; tagNameAndNumber: { name: string, size: number }[]; - categoryList: Category[]; + categoryList: Tag[]; counts: { articleCount: number, visitorCount: number, diff --git a/index/src/app/view/login-registration/components/login/login.component.ts b/index/src/app/view/login-registration/components/login/login.component.ts index 1bdbdcf..c323aa7 100644 --- a/index/src/app/view/login-registration/components/login/login.component.ts +++ b/index/src/app/view/login-registration/components/login/login.component.ts @@ -1,8 +1,8 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {NzMessageService} from 'ng-zorro-antd'; import {ApiService} from '../../../../api/api.service'; -import {LoginReq} from '../../../../class/LoginReq'; -import {LocalStorageService} from '../../../../utils/local-storage.service'; +import {LoginReq} from '../../../../class/User'; +import {LocalStorageService} from '../../../../services/local-storage.service'; import {ActivatedRoute, Router} from '@angular/router'; import {LoginRegistrationService} from '../../service/login-registration.service'; import {Title} from '@angular/platform-browser'; diff --git a/index/src/app/view/login-registration/components/registration/registration.component.ts b/index/src/app/view/login-registration/components/registration/registration.component.ts index 49bf2d9..c4788a7 100644 --- a/index/src/app/view/login-registration/components/registration/registration.component.ts +++ b/index/src/app/view/login-registration/components/registration/registration.component.ts @@ -4,8 +4,8 @@ import {ApiService} from '../../../../api/api.service'; import {NzMessageService} from 'ng-zorro-antd'; import {Router} from '@angular/router'; import {ErrDispatch} from '../../../../class/ErrDispatch'; -import {RequestObj} from '../../../../class/Request'; -import {LoginReq} from '../../../../class/LoginReq'; +import {RequestObj} from '../../../../class/HttpReqAndResp'; +import {LoginReq} from '../../../../class/User'; import {Title} from '@angular/platform-browser'; @Component({ diff --git a/index/src/app/view/tag/tag.component.ts b/index/src/app/view/tag/tag.component.ts index 9ef573a..61c24b9 100644 --- a/index/src/app/view/tag/tag.component.ts +++ b/index/src/app/view/tag/tag.component.ts @@ -1,8 +1,6 @@ import {Component, OnInit} from '@angular/core'; -import {Category} from '../../class/Category'; -import {PageList} from '../../class/pageList'; +import {PageList} from '../../class/HttpReqAndResp'; import {Article} from '../../class/Article'; -import {Tag} from '../../class/Tag'; import {ApiService} from '../../api/api.service'; import {NzMessageService} from 'ng-zorro-antd'; import {Location} from '@angular/common'; diff --git a/index/src/app/view/write/components/publish-form/publish-form.component.ts b/index/src/app/view/write/components/publish-form/publish-form.component.ts index db10075..534ac7b 100644 --- a/index/src/app/view/write/components/publish-form/publish-form.component.ts +++ b/index/src/app/view/write/components/publish-form/publish-form.component.ts @@ -1,7 +1,6 @@ import {Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup, Validators} from '@angular/forms'; -import {ApiService} from '../../../../api/api.service'; -import {Category} from '../../../../class/Category'; +import {Tag} from '../../../../class/Tag'; @Component({ selector: 'c-publish-form', @@ -16,7 +15,7 @@ export class PublishFormComponent implements OnInit { @ViewChild('inputElement', {static: false}) tagInputElement: ElementRef; @Input() tagNacList: { name: string, size: number }[]; - @Input() categoryList: Category[]; + @Input() categoryList: Tag[]; @Input() primaryData: { id: number, type: boolean, tags: string, category: string, url?: string }; @Output() submitEvent = new EventEmitter<{ id: number, type: boolean, tags: string, category: string, url?: string }>(); diff --git a/index/src/app/view/write/write.component.ts b/index/src/app/view/write/write.component.ts index fe2ecf8..bbe109c 100644 --- a/index/src/app/view/write/write.component.ts +++ b/index/src/app/view/write/write.component.ts @@ -1,11 +1,11 @@ import {Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {ArticleReq} from '../../class/ArticleReq'; +import {ArticleReq} from '../../class/Article'; import {EditorConfig} from '../../class/EditorConfig'; import {ActivatedRoute, Router} from '@angular/router'; import {ApiService} from '../../api/api.service'; import {NzMessageService} from 'ng-zorro-antd'; import {User} from '../../class/User'; -import {Category} from '../../class/Category'; +import {Tag} from '../../class/Tag'; import {Title} from '@angular/platform-browser'; @Component({ @@ -31,7 +31,7 @@ export class WriteComponent implements OnInit { public article: ArticleReq = new ArticleReq(); userInfo: User; - categoryList: Category[]; + categoryList: Tag[]; tagNacList: { name: string, size: number }[]; primaryData = {}; // 发布新文章时，文章相同会被拦回 此处判断一下