diff --git a/.gitmodules b/.gitmodules
index 23d7ab33..0debe27d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,3 +29,11 @@
 	path = tools/Black_screen
 	url = https://github.com/PJ-568/Black_screen.git
 	branch = min
+[submodule "tools/Base64"]
+	path = tools/Base64
+	url = https://github.com/SFantasy/Base64.git
+	branch = gh-pages
+[submodule "tools/Base64_converter"]
+	path = tools/Base64_converter
+	url = https://github.com/rossy/base64.git
+	branch = gh-pages
diff --git a/data.json b/data.json
index e35f04cb..df1b2cdf 100644
--- a/data.json
+++ b/data.json
@@ -24,6 +24,16 @@
         "url":"/lib/tools/Black_screen/",
         "type":"测试工具"
     },
+    {
+        "name":"在线 Base64 加解密",
+        "url":"/lib/tools/Base64/",
+        "type":"加密解密"
+    },
+    {
+        "name":"在线文件转 Base64",
+        "url":"/lib/tools/Base64_converter/",
+        "type":"加密解密"
+    },
     {
         "name":"通用 LPC 角色生成器",
         "url":"/lib/tools/Universal-LPC-Spritesheet-Character-Generator/",
diff --git a/js/api.js b/js/api.js
index 7259f1d7..66ce3c42 100644
--- a/js/api.js
+++ b/js/api.js
@@ -78,6 +78,20 @@ var classify = [{
 	}]
 }, {
 	"id": 3,
+	"name": "加密解密",
+	"list": [{
+		"name": "在线 Base64 加解密",
+		"url": "/incert/?link=/lib/tools/Base64/",
+		"hot": 0,
+		"img": ""
+	}, {
+		"name": "在线文件转 Base64",
+		"url": "/incert/?link=/lib/tools/Base64_converter/",
+		"hot": 0,
+		"img": ""
+	}]
+}, {
+	"id": 4,
 	"name": "代码工具",
 	"list": [{
 		"name": "Judge0 IDE 在线代码编辑器",
@@ -86,7 +100,7 @@ var classify = [{
 		"img": ""
 	}]
 }, {
-	"id": 4,
+	"id": 5,
 	"name": "游戏美术",
 	"list": [{
 		"name": "通用 LPC 角色生成器",
@@ -95,7 +109,7 @@ var classify = [{
 		"img": ""
 	}]
 }, {
-	"id": 5,
+	"id": 6,
 	"name": "测试工具",
 	"list": [{
 		"name": "黑色全屏",
@@ -109,7 +123,7 @@ var classify = [{
 		"img": ""
 	}]
 }, {
-	"id": 6,
+	"id": 7,
 	"name": "文档手册",
 	"list": [{
 		"name": "Rust 语言圣经（镜像）",
@@ -123,7 +137,7 @@ var classify = [{
 		"img": ""
 	}]
 }, {
-	"id": 7,
+	"id": 8,
 	"name": "公共库",
 	"list": [{
 		"name": "Staticfile CDN",
@@ -152,7 +166,7 @@ var classify = [{
 		"img": ""
 	}]
 }, {
-	"id": 8,
+	"id": 9,
 	"name": "文字工具",
 	"list": [{
 		"name": "狗屁不通文章生成器",
@@ -166,7 +180,7 @@ var classify = [{
 		"img": ""
 	}]
 }, {
-	"id": 9,
+	"id": 10,
 	"name": "软件模拟",
 	"list": [{
 		"name": "在线 x86 虚拟机",
diff --git a/tools/Base64 b/tools/Base64
new file mode 160000
index 00000000..dc019459
--- /dev/null
+++ b/tools/Base64
@@ -0,0 +1 @@
+Subproject commit dc01945905e9ac93d33662a2d2ee672d5aeb9da5
diff --git a/tools/Base64_converter b/tools/Base64_converter
new file mode 160000
index 00000000..14b25bc3
--- /dev/null
+++ b/tools/Base64_converter
@@ -0,0 +1 @@
+Subproject commit 14b25bc3d305b2ff28f874848686f111700f3bcc