admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-06 17:08:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
shimingxy 2024-07-18 17:46:52 +08:00
parent 806c9b55de
commit dc73b1d30e
3 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts
View File

@ -14,16 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit, OnDestroy, AfterViewInit, Optional } from '@angular/core';
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
Inject,
OnInit,
OnDestroy,
AfterViewInit,
Optional
} from '@angular/core';
import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { throwIfAlreadyLoaded } from '@core'; import { throwIfAlreadyLoaded } from '@core';
@ -40,7 +31,6 @@ import {ImageCaptchaService} from '../../../service/image-captcha.service';
import { SocialsProviderService } from '../../../service/socials-provider.service'; import { SocialsProviderService } from '../../../service/socials-provider.service';
import { CONSTS } from '../../../shared/consts'; import { CONSTS } from '../../../shared/consts';
import { stringify } from 'querystring'; import { stringify } from 'querystring';
@Component({ @Component({
@ -95,7 +85,6 @@ export class UserLoginComponent implements OnInit, OnDestroy {
}); });
} }
ngOnInit(): void { ngOnInit(): void {
//set redirect_uri , is BASE64URL //set redirect_uri , is BASE64URL
if (this.route.snapshot.queryParams[CONSTS.REDIRECT_URI]) { if (this.route.snapshot.queryParams[CONSTS.REDIRECT_URI]) {
@ -326,7 +315,6 @@ export class UserLoginComponent implements OnInit, OnDestroy {
} }
} }
}); });
} }
// #endregion // #endregion
@ -396,13 +384,13 @@ export class UserLoginComponent implements OnInit, OnDestroy {
qrScanMaxkey(data: any) { qrScanMaxkey(data: any) {
// @ts-ignore // @ts-ignore
document.getElementById("div_qrcodelogin").innerHTML = ''; document.getElementById('div_qrcodelogin').innerHTML = '';
// @ts-ignore // @ts-ignore
var qrcode = new QRCode("div_qrcodelogin", { var qrcode = new QRCode('div_qrcodelogin', {
width: 200, width: 200,
height: 200, height: 200,
colorDark: "#000000", colorDark: '#000000',
colorLight: "#ffffff" colorLight: '#ffffff'
}).makeCode(data.state); }).makeCode(data.state);
//3分钟监听二维码 //3分钟监听二维码
this.count = 90; this.count = 90;

3
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java
View File

@ -46,6 +46,7 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -107,7 +108,7 @@ public class LoginEntryPoint {
* @return * @return
*/ */
@Operation(summary = "登录接口", description = "用户登录地址",method="GET") @Operation(summary = "登录接口", description = "用户登录地址",method="GET")
@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE}) @GetMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<?> get( public ResponseEntity<?> get(
@RequestParam(value = "remember_me", required = false) String rememberMeJwt) { @RequestParam(value = "remember_me", required = false) String rememberMeJwt) {
logger.debug("/get."); logger.debug("/get.");

5
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java
View File

@ -65,8 +65,9 @@ public class OneTimePasswordController {
@RequestMapping(value = {"/timebased"}) @RequestMapping(value = {"/timebased"})
@ResponseBody @ResponseBody
public ResponseEntity<?> timebased( public ResponseEntity<?> timebased(
@RequestParam String generate,@CurrentUser UserInfo currentUser) { @RequestParam(name="generate") String generate,
HashMap<String,Object >timebased =new HashMap<String,Object >(); @CurrentUser UserInfo currentUser) {
HashMap<String,Object >timebased =new HashMap<>();
generate(generate,currentUser); generate(generate,currentUser);