Merge pull request #6 from xpunch/dev

1.2.0

Author: xpunch

.dockerignore

@@ -1,2 +1 @@
-docs
-frontend
+**

config/config.go

@@ -4,7 +4,7 @@ import "time"
 
 const (
 	Name    = "go.micro.dashboard"
-	Version = "1.1.0"
+	Version = "1.2.0"
 )
 
 const (

docs/docs.go

@@ -1,22 +1,21 @@
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag
-
 package docs
 
 import (
 	"bytes"
 	"encoding/json"
 	"strings"
+	"text/template"
 
-	"github.com/alecthomas/template"
 	"github.com/swaggo/swag"
 )
 
 var doc = `{
     "schemes": {{ marshal .Schemes }},
     "swagger": "2.0",
     "info": {
-        "description": "{{.Description}}",
+        "description": "{{escape .Description}}",
         "title": "{{.Title}}",
         "termsOfService": "http://swagger.io/terms/",
         "contact": {},
@@ -763,7 +762,7 @@ type swaggerInfo struct {
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = swaggerInfo{
-	Version:     "1.1.0",
+	Version:     "1.2.0",
 	Host:        "",
 	BasePath:    "/",
 	Schemes:     []string{},
@@ -782,6 +781,13 @@ func (s *s) ReadDoc() string {
 			a, _ := json.Marshal(v)
 			return string(a)
 		},
+		"escape": func(v interface{}) string {
+			// escape tabs
+			str := strings.Replace(v.(string), "\t", "\\t", -1)
+			// replace " with \", and if that results in \\", replace that with \\\"
+			str = strings.Replace(str, "\"", "\\\"", -1)
+			return strings.Replace(str, "\\\\\"", "\\\\\\\"", -1)
+		},
 	}).Parse(doc)
 	if err != nil {
 		return doc
@@ -796,5 +802,5 @@ func (s *s) ReadDoc() string {
 }
 
 func init() {
-	swag.Register(swag.Name, &s{})
+	swag.Register("swagger", &s{})
 }

docs/swagger.json

@@ -5,7 +5,7 @@
         "title": "Go Micro Dashboard",
         "termsOfService": "http://swagger.io/terms/",
         "contact": {},
-        "version": "1.1.0"
+        "version": "1.2.0"
     },
     "basePath": "/",
     "paths": {

docs/swagger.yaml

@@ -187,7 +187,7 @@ info:
   description: go micro dashboard restful-api
   termsOfService: http://swagger.io/terms/
   title: Go Micro Dashboard
-  version: 1.1.0
+  version: 1.2.0
 paths:
   /api/account/login:
     post:

frontend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "go-micro-dashboard",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "scripts": {
     "ng": "ng",
     "start": "ng s -o",

frontend/package.json

@@ -9,7 +9,6 @@ import {
 } from '@angular/common/http';
 import { Injectable, Injector } from '@angular/core';
 import { Router } from '@angular/router';
-import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
 import { ALAIN_I18N_TOKEN, _HttpClient } from '@delon/theme';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
 import { Observable, of, throwError } from 'rxjs';
@@ -63,10 +62,6 @@ export class DefaultInterceptor implements HttpInterceptor {
     if (!headers?.has('Accept-Language') && lang) {
       res['Accept-Language'] = lang;
     }
-    const token = this.injector.get<ITokenService>(DA_SERVICE_TOKEN).get()?.token
-    if (token) {
-      res['Authorization'] = 'Bearer ' + token;
-    }
     return res;
   }
 

frontend/src/app/core/net/default.interceptor.ts

@@ -18,7 +18,12 @@ const alainConfig: AlainConfig = {
     license: `A59B099A586B3851E0F0D7FDBF37B603`,
     licenseA: `C94CEE276DB2187AE6B65D56B3FC2848`
   },
-  auth: { login_url: '/passport/login' }
+  auth: {
+    login_url: '/passport/login',
+    token_send_key: 'Authorization',
+    token_send_template: 'Bearer ${token}',
+    ignores: [/\/login/, /assets\//, /passport\//, /\/version/,],
+  }
 };
 
 const alainModules: any[] = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()];

frontend/src/app/global-config.module.ts

@@ -2,9 +2,14 @@
   <div class="wrap">
     <div class="top">
       <div class="head">
-        <span class="title" >Go Micro Dashboard</span>
+        <img class="logo" src="./assets/logo-color.png">
+        <p class="title">Go Micro Dashboard</p>
       </div>
     </div>
     <router-outlet></router-outlet>
+    <global-footer>
+      <a href="https://github.com/xpunch" target="_blank">X Punch</a>
+      <p>{{version}}</p>
+    </global-footer>
   </div>
-</div>
+</div>