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

# Conflicts:
#	api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/ToolController.java

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/ToolController.java

@@ -30,7 +30,7 @@ public class ToolController {
      * @return
      */
     @GetMapping( value = "encrypt" )
-    public String encrypt(String plain) {
+    public String encrypt( String plain ) {
         return EncryptStringAes.encryptAes(plain, signKeyConfigBean.getKey());
     }
 
@@ -40,8 +40,8 @@ public class ToolController {
      * @param cipher 密文
      * @return
      */
-    @GetMapping( value = "decrypt" )
-    public String decrypt(String cipher) {
+    @PostMapping( value = "decrypt" )
+    public String decrypt( String cipher ) {
         return EncryptStringAes.decryptAes(cipher, signKeyConfigBean.getKey());
     }