From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java
index 41f593f..d2a8e8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java
@@ -18,11 +18,11 @@
@Resource
AuthorizeService authorizeService;
//鐢熸垚涓存椂鎺堟潈鍙湁涓�澶�
-// @PostMapping("/makeTempLicense")
-// public JSONObject makeTempLicense() {
-// JSONObject jsonObject = authorizeService.makeTempLicense();
-// return jsonObject;
-// }
+ @PostMapping("/makeTempLicense")
+ public JSONObject makeTempLicense() {
+ JSONObject jsonObject = authorizeService.makeTempLicense();
+ return jsonObject;
+ }
//鑾峰彇鏈哄櫒鐮�
@ApiOperation("鑾峰彇鏈哄櫒鐮�")
@PostMapping("/getMachineCode")
@@ -45,16 +45,16 @@
return data;
}
- //鑾峰彇鎺堟潈
+ //鍔犲瘑
@PostMapping(value = "/getLicense")
public String getLicense(@RequestBody String data) {
- String EncryptedStr = authorizeService.getLicense(data);
+ String EncryptedStr = authorizeService.encryption(data);
return EncryptedStr;
}
- //瑙ｆ瀽鎺堟潈
+ //瑙ｅ瘑
@PostMapping(value = "/parsLicense")
public String parsLicense(@RequestBody String data) {
- String DecryptStr = authorizeService.parsLicense(data);
+ String DecryptStr = authorizeService.decryption(data);
return DecryptStr;
}
}
--
Gitblit v1.9.3