chore: 更新依赖版本

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/build.yml

@@ -21,6 +21,12 @@ jobs:
       - run: npm install -g @angular/cli
       - run: bash build.sh
 
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v2.1.4
+        with:
+          name: dist
+          path: ./dist/index/*
+
       - name: SCP
         uses: appleboy/scp-action@master
         with:

package.json

@@ -11,41 +11,41 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^10.0.3",
+    "@angular/animations": "^10.1.1",
-    "@angular/common": "^10.0.3",
+    "@angular/common": "^10.1.1",
-    "@angular/compiler": "^10.0.3",
+    "@angular/compiler": "^10.1.1",
-    "@angular/core": "^10.0.3",
+    "@angular/core": "^10.1.1",
-    "@angular/forms": "^10.0.3",
+    "@angular/forms": "^10.1.1",
-    "@angular/platform-browser": "^10.0.3",
+    "@angular/platform-browser": "^10.1.1",
-    "@angular/platform-browser-dynamic": "^10.0.3",
+    "@angular/platform-browser-dynamic": "^10.1.1",
-    "@angular/router": "^10.0.3",
+    "@angular/router": "^10.1.1",
-    "@angular/service-worker": "^10.0.3",
+    "@angular/service-worker": "^10.1.1",
     "jquery": "^3.5.1",
     "ng-zorro-antd": "^9.3.0",
     "nrm": "^1.2.1",
-    "rxjs": "^6.6.0",
+    "rxjs": "^6.6.3",
-    "tslib": "^2.0.0",
+    "tslib": "^2.0.1",
-    "zone.js": "^0.10.3"
+    "zone.js": "^0.11.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1000.2",
+    "@angular-devkit/build-angular": "^0.1001.1",
-    "@angular/cli": "^10.0.2",
+    "@angular/cli": "^10.1.1",
-    "@angular/compiler-cli": "^10.0.3",
+    "@angular/compiler-cli": "^10.1.1",
-    "@angular/language-service": "^10.0.3",
+    "@angular/language-service": "^10.1.1",
-    "@types/jasmine": "^3.5.11",
+    "@types/jasmine": "^3.5.14",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^14.0.22",
+    "@types/node": "^14.10.2",
     "codelyzer": "^6.0.0",
-    "jasmine-core": "^3.5.0",
+    "jasmine-core": "^3.6.0",
     "jasmine-spec-reporter": "^5.0.2",
-    "karma": "^5.1.0",
+    "karma": "^5.2.2",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage-istanbul-reporter": "^3.0.3",
-    "karma-jasmine": "^3.3.1",
+    "karma-jasmine": "^4.0.1",
     "karma-jasmine-html-reporter": "^1.5.4",
     "protractor": "^7.0.0",
-    "ts-node": "^8.10.2",
+    "ts-node": "^9.0.0",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
-    "typescript": "^3.9.6"
+    "typescript": "^4.0.2"
   }
 }

src/app/class/HttpReqAndResp.ts

@@ -6,7 +6,7 @@ export class RequestObj {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';
     data?: {};
     contentType?: 'application/json' | 'application/x-www-form-urlencoded';
-    queryParam?: {};
+    queryParam?: { [key: string]: any };
     header?: HttpHeaders | {
         [header: string]: string | string[];
     };

src/app/components/footer/footer.component.html

@@ -5,8 +5,8 @@
             鄂ICP备18023929号
         </a>
         <div>
-            © 2019 <a href="https://www.celess.cn">小海博客</a> -
+            © 2020 <a href="https://www.celess.cn">小海博客</a> -
-            <span>郑海 </span> <span *ngIf="gName">& {{gName}} </span>版权所有
+            <span>{{bName}} </span> <span *ngIf="gName">& {{gName}} </span>版权所有
         </div>
     </div>
 </div>

src/app/components/footer/footer.component.ts

@@ -11,7 +11,8 @@ export class FooterComponent implements OnInit {
     constructor(public componentStateService: ComponentStateService) {
     }
 
-    readonly gName: string;
+    readonly gName: string = '何梦幻';
+    readonly bName: string = '郑海';
 
     ngOnInit() {
     }

src/app/view/admin/admin-visitor/admin-visitor.component.ts

@@ -17,14 +17,6 @@ export class AdminVisitorComponent implements OnInit {
     headData: Data<Visitor>[];
     request: RequestObj
 
-    /***
-     * browserName: "Chrome 8"
-     browserVersion: "83.0.4103.116"
-     date: "2020-07-11 09:30:13"
-     id: 3131
-     ip: "127.0.0.1"
-     osname: "Windows 10"
-     */
     ngOnInit(): void {
         this.title.setTitle('小海博客 | 访客信息管理')
         this.request = {
@@ -33,14 +25,15 @@ export class AdminVisitorComponent implements OnInit {
             queryParam: {
                 count: 1,
                 page: 10,
-                showLocation: location
+                showLocation: true
             }
         }
         this.headData = [
             {fieldValue: 'id', title: '主键', show: false, primaryKey: true},
             {fieldValue: 'date', title: '访问日期', show: true},
-            {fieldValue: 'browserName', title: '浏览器', show: true},
             {fieldValue: 'ip', title: 'ip地址', show: true},
+            {fieldValue: 'location', title: '位置', show: true},
+            {fieldValue: 'browserName', title: '浏览器', show: true},
             {fieldValue: 'browserVersion', title: '浏览器版本', show: true},
             {fieldValue: 'osname', title: '系统', show: true}
         ]

src/app/view/admin/admin.component.ts

@@ -22,7 +22,6 @@ export class AdminComponent implements OnInit {
                 complete: () => null,
                 error: (err) => null,
                 next: data => {
-                    console.log('更新user')
                     this.user = data.result
                     if (data.result) this.initHelloWords()
                 }
@@ -68,7 +67,6 @@ export class AdminComponent implements OnInit {
 
     checkSamePwd = () => {
         return (control: AbstractControl): { [key: string]: any } | null => {
-            console.log('a')
             const newPwd = this.resetPwdFormGroup && this.resetPwdFormGroup.value.newPwd;
             return control.value !== newPwd ? {pwdNotSame: true} : null;
         };

src/app/view/admin/components/common-table/common-table.component.ts

@@ -39,7 +39,6 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
             this.changed = true;
         } else {
             this.filedData = this.cloneData(this.headData)
-            console.log(this.filedData)
         }
         this.calculateVisibleFieldLength();
 
@@ -60,10 +59,13 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
         this.loading = true;
         const pageValue = this.dataList.pageNum ? this.dataList.pageNum : 1;
         const countValue = this.dataList.pageSize ? this.dataList.pageSize : 10
-        this.request.queryParam = {
+
-            page: pageValue,
+        this.request.queryParam.page = pageValue;
-            count: countValue
+        this.request.queryParam.count = countValue;
-        }
+        // this.request.queryParam = {
+        //     page: pageValue,
+        //     count: countValue
+        // }
         this.pageInfo.emit({page: pageValue, pageSize: countValue})
         return this.httpService.Service<PageList<T>>(this.request).subscribe({
             next: resp => {
@@ -76,7 +78,6 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
 
     ngOnChanges(changes: SimpleChanges): void {
         if (changes.request && !changes.request.isFirstChange()) {
-            console.log(changes.request)
             this.request = changes.request.currentValue;
             this.getData().unsubscribe();
             this.getData();
@@ -148,6 +149,9 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
             dist = JSON.parse(JSON.stringify(source));
         }
         const action = this.headData.filter(value => value.isActionColumns).pop();
+        if (!action) {
+            return dist;
+        }
         const del = dist.filter(value => value.isActionColumns).pop()
         dist.splice(dist.indexOf(del), 1);
         dist.push(action);

src/app/view/link/link.component.html

@@ -42,7 +42,7 @@
             本站信息 <br>
             名称：小海博客<br>
             网址：https://www.celess.cn/<br>
-            图标：https://www.celess.cn/logo.ico<br>
+            图标：https://www.celess.cn/assets/logo.jpg<br>
             描述：小海博客，记录学习成长历程,主要关注与java后端的技术学习
         </p>
         <li>本站的友链申请会自动进行抓取，并在12h内进行审核</li>

src/index.html

@@ -7,7 +7,7 @@
     <meta content="width=device-width, initial-scale=1" name="viewport">
     <meta name="keywords" content="小海博客,个人博客,java博客,学习,IT,生活,前端,后端,移动端,java,spring,springboot,angular">
     <meta name="description" content="小海博客，记录学习成长历程,主要关注与java后端的技术学习">
-    <link rel="icon" type="image/x-icon" href="https://56462271.oss-cn-beijing.aliyuncs.com/web/logo.ico">
+    <link rel="icon" type="image/x-icon" href="assets/favicon.ico">
     <link rel="manifest" href="manifest.webmanifest">
     <meta name="theme-color" content="#1976d2">
 </head>