LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V3.5.0 RC

Browse Source
This commit is contained in:
MaxKey
2022-05-01 09:28:30 +08:00
parent 585fa606de
commit 5d2cc1c296
15 changed files with 1660 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-web-frontend/maxkey-web-app/src/app/layout/basic/basic.component.ts
View File

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { Router } from '@angular/router';
import { SettingsService, User } from '@delon/theme';
import { environment } from '@env/environment';
import { CONSTS } from 'src/app/shared/consts';
import { LayoutDefaultOptions } from '../../theme/layout-default';
@@ -80,7 +81,7 @@ import { LayoutDefaultOptions } from '../../theme/layout-default';
</layout-default>
<global-footer style="border-top: 1px solid #e5e5e5; min-height: 120px; text-shadow: 0 1px 0 #fff;margin:0;">
<div style="margin-top: 30px">
MaxKey v3.5.0 GA<br />
MaxKey {{ version }}<br />
Copyright
<i nz-icon nzType="copyright"></i> 2022 <a href="//www.maxkey.top" target="_blank">http://www.maxkey.top</a><br />
Licensed under the Apache License, Version 2.0
@@ -91,6 +92,7 @@ import { LayoutDefaultOptions } from '../../theme/layout-default';
`
})
export class LayoutBasicComponent {
version = CONSTS.VERSION;
options: LayoutDefaultOptions = {
logoExpanded: `./assets/logo-full.svg`,
logoCollapsed: `./assets/logo.svg`,

2
maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.html
View File

@@ -19,7 +19,7 @@
<router-outlet></router-outlet>
<global-footer style="border-top: 1px solid #e5e5e5; min-height: 60px; text-shadow: 0 1px 0 #fff">
<div style="margin-top: 20px">
MaxKey v3.5.0 GA<br />
MaxKey {{ version }}<br />
Copyright
<i nz-icon nzType="copyright"></i> 2022 <a href="//www.maxkey.top" target="_blank">http://www.maxkey.top</a><br />
Licensed under the Apache License, Version 2.0

2
maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.ts
View File

@@ -1,6 +1,7 @@
import { Component, Inject, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
import { CONSTS } from 'src/app/shared/consts';
@Component({
selector: 'layout-passport',
@@ -8,6 +9,7 @@ import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
styleUrls: ['./passport.component.less']
})
export class LayoutPassportComponent implements OnInit {
version = CONSTS.VERSION;
links = [
{
title: '帮助',

3
maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts
View File

@@ -2,5 +2,6 @@ export const CONSTS = {
CONGRESS: 'congress',
ONLINE_TICKET: 'online_ticket',
REDIRECT_URI: 'redirect_uri',
REMEMBER: 'remember_me'
REMEMBER: 'remember_me',
VERSION: 'v3.5.0 GA'
};

11
maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/basic.component.ts
View File

@@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { SettingsService, User } from '@delon/theme';
import { environment } from '@env/environment';
import { CONSTS } from 'src/app/shared/consts';
import { LayoutDefaultOptions } from '../../theme/layout-default';
@@ -81,12 +82,20 @@ import { LayoutDefaultOptions } from '../../theme/layout-default';
<router-outlet></router-outlet>
</ng-template>
</layout-default>
<global-footer style="border-top: 1px solid #e5e5e5; min-height: 120px; text-shadow: 0 1px 0 #fff;margin:0;">
<div style="margin-top: 30px">
MaxKey {{ version }}<br />
Copyright
<i nz-icon nzType="copyright"></i> 2022 <a href="//www.maxkey.top" target="_blank">http://www.maxkey.top</a><br />
Licensed under the Apache License, Version 2.0
</div>
</global-footer>
<setting-drawer *ngIf="showSettingDrawer"></setting-drawer>
<theme-btn></theme-btn>
`
})
export class LayoutBasicComponent {
version = CONSTS.VERSION;
options: LayoutDefaultOptions = {
logoExpanded: `./assets/logo-full.svg`,
logoCollapsed: `./assets/logo.svg`,

2
maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.html
View File

@@ -17,7 +17,7 @@
<router-outlet></router-outlet>
<global-footer style="border-top: 1px solid #e5e5e5; min-height: 60px; text-shadow: 0 1px 0 #fff">
<div style="margin-top: 20px">
MaxKey v3.5.0 GA<br />
MaxKey {{ version }}<br />
Copyright
<i nz-icon nzType="copyright"></i> 2022 <a href="//www.maxkey.top" target="_blank">http://www.maxkey.top</a><br />
Licensed under the Apache License, Version 2.0

2
maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.ts
View File

@@ -1,5 +1,6 @@
import { Component, Inject, OnInit } from '@angular/core';
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
import { CONSTS } from 'src/app/shared/consts';
@Component({
selector: 'layout-passport',
@@ -7,6 +8,7 @@ import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
styleUrls: ['./passport.component.less']
})
export class LayoutPassportComponent implements OnInit {
version = CONSTS.VERSION;
links = [
{
title: '帮助',

1
maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/authentication.service.ts
View File

@@ -69,6 +69,7 @@ export class AuthenticationService {
this.cookieService.set(CONSTS.CONGRESS, authJwt.ticket, { domain: subHostName });
this.settingsService.setUser(user);
//console.log(authJwt);
this.tokenService.set(authJwt);
this.tokenService.get()?.expired;
}

3
maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts
View File

@@ -1,5 +1,6 @@
export const CONSTS = {
CONGRESS: 'congress',
REDIRECT_URI: 'redirect_uri',
REMEMBER: 'remember'
REMEMBER: 'remember',
VERSION: 'v3.5.0 GA'
};

2
maxkey-web-frontend/maxkey-web-mgt-app/src/environments/environment.ts
View File

@@ -13,7 +13,7 @@ export const environment = {
api: {
baseUrl: 'http://sso.maxkey.top:9527/maxkey-mgt/',
refreshTokenEnabled: true,
refreshTokenType: 'auth-refresh'
refreshTokenType: 're-request'
},
modules: [DelonMockModule.forRoot({ data: MOCKDATA })]
} as Environment;