Commit e8c03071 by xieshixiang

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/ToolController.java
parents 85ca9ccc f363413a
...@@ -30,7 +30,7 @@ public class ToolController { ...@@ -30,7 +30,7 @@ public class ToolController {
* @return * @return
*/ */
@GetMapping( value = "encrypt" ) @GetMapping( value = "encrypt" )
public String encrypt(String plain) { public String encrypt( String plain ) {
return EncryptStringAes.encryptAes(plain, signKeyConfigBean.getKey()); return EncryptStringAes.encryptAes(plain, signKeyConfigBean.getKey());
} }
...@@ -40,8 +40,8 @@ public class ToolController { ...@@ -40,8 +40,8 @@ public class ToolController {
* @param cipher 密文 * @param cipher 密文
* @return * @return
*/ */
@GetMapping( value = "decrypt" ) @PostMapping( value = "decrypt" )
public String decrypt(String cipher) { public String decrypt( String cipher ) {
return EncryptStringAes.decryptAes(cipher, signKeyConfigBean.getKey()); return EncryptStringAes.decryptAes(cipher, signKeyConfigBean.getKey());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment