From 0e4c3d4e8ef775f5adf2d7e991dd83bb7abca6c9 Mon Sep 17 00:00:00 2001
From: baiy <wo@baiy.org>
Date: Wed, 11 Aug 2021 17:18:26 +0800
Subject: [PATCH] =?UTF-8?q?#60=20=E6=B7=BB=E5=8A=A0=20hex=20string=20?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    |  3 +-
 package.json                 |  2 +-
 src/config.js                |  8 +++--
 src/tool.router.js           |  4 +++
 src/views/tool/hexString.vue | 58 ++++++++++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 src/views/tool/hexString.vue

diff --git a/README.md b/README.md
index 474ec1c..8492a87 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ npm run serve -adapter=utools
 |---|---|---|
 |哈希|`md5`, `sha1`, `sha256`, `sha512`,`sm3`|√|
 |加密/解密|`AES`,`DES`,`RC4`,`Rabbit`,`TripleDes`,`sm2`|√|
-|BASE64编码|`加密`,`解密`|√|
+|BASE64编码|`加密`,`解密`,`支持文件`|√|
 |URL编码|`编码`,`解码`|√|
 |时间戳|双向转换|√|
 |二维码|`生成`,`解析`|√|
@@ -63,6 +63,7 @@ npm run serve -adapter=utools
 |ascii编码转换|`十进制`, `十六进制`, `八进制`, `二进制`, `字符串`|√|
 |变量名格式转换|`Var Name`, `var-name`, `VAR_NAME`, `VarName`, `varName`, `var_name`, `var name`|√|
 |jwt解码|`header`, `payload`|√|
+|Hex/String转换|`hex to string`, `string to hex`, `十六进制转字符串`, `字符串转十六进制`|√|
 
 ## 第三方开源库
 项目诞生离不开这些优秀的开源程序
diff --git a/package.json b/package.json
index 571ac51..6a7e31d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "c-tool",
-    "version": "1.6.4",
+    "version": "1.6.5",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve --port 8081",
diff --git a/src/config.js b/src/config.js
index cceb253..69b36c8 100644
--- a/src/config.js
+++ b/src/config.js
@@ -40,6 +40,7 @@ const tool = [
     {'name': 'ascii', 'title': 'ascii转换', 'cat': ['conversion']},
     {'name': 'variableConversion', 'title': '变量名转换', 'cat': ['conversion']},
     {'name': 'jwt', 'title': 'jwt解码', 'cat': ['conversion']},
+    {'name': 'hexString', 'title': 'Hex/String转换', 'cat': ['conversion']},
 ]
 
 // 工具类功能配置
@@ -54,7 +55,8 @@ const utools = {
     keyword: {
         hash: ['md5', 'sha1', 'sha256', 'sha512', 'sm3'],
         encrypt: ['AES', 'DES', 'RC4', 'Rabbit', 'TripleDes', 'sm2'],
-        jwt: ['jwtDecode']
+        jwt: ['jwtDecode'],
+        hexString: ['hex to string', 'string to hex', '十六进制转字符串', '字符串转十六机制'],
     },
     cmds: {
         timestamp: [
@@ -71,14 +73,14 @@ const utools = {
                 "type": "regex",
                 "match": "/[a-zA-z]+://[^\\s]*/i",
                 "minLength": 8,
-                "feature":'generate' // 适配工具内功能
+                "feature": 'generate' // 适配工具内功能
 
             },
             {
                 "type": "regex",
                 "match": "/[a-zA-z]+://[^\\s]*/i",
                 "minLength": 8,
-                "feature":'reader' // 适配工具内功能
+                "feature": 'reader' // 适配工具内功能
             }
         ],
         ip: [
diff --git a/src/tool.router.js b/src/tool.router.js
index 31a7805..7ce6d8a 100644
--- a/src/tool.router.js
+++ b/src/tool.router.js
@@ -105,6 +105,10 @@ const routes = [
     {
         path: '/tool/jwt',
         component: r => require(['./views/tool/jwt.vue'], r)
+    },
+    {
+        path: '/tool/hexString',
+        component: r => require(['./views/tool/hexString.vue'], r)
     }
 ]
 
diff --git a/src/views/tool/hexString.vue b/src/views/tool/hexString.vue
new file mode 100644
index 0000000..39fc7be
--- /dev/null
+++ b/src/views/tool/hexString.vue
@@ -0,0 +1,58 @@
+<template>
+    <div>
+        <Input v-model="current.input" :rows="7" type="textarea" placeholder="内容"></Input>
+        <option-block>
+            <FormItem>
+                <ButtonGroup>
+                    <Button type="primary" @click="handle('hex')">String -> Hex</Button>
+                    <Button type="primary" @click="handle('str')">Hex -> String</Button>
+                </ButtonGroup>
+            </FormItem>
+            <FormItem>
+                <Checkbox v-model="current.isUppercase">大写字母</Checkbox>
+            </FormItem>
+        </option-block>
+        <Input v-model="current.output" :rows="7" type="textarea" placeholder="结果"></Input>
+    </div>
+</template>
+<script>
+
+export default {
+    created() {
+        this.current = Object.assign(this.current, this.$getToolData("input"))
+    },
+    methods: {
+        handle(type) {
+            if (this.current.input) {
+                const convert = (from, to) => str => Buffer.from(str, from).toString(to)
+                switch (type) {
+                    case "hex":
+                        this.current.output = convert('utf8', 'hex')(this.current.input);
+                        break;
+                    case "str":
+                        this.current.output = convert('hex', 'utf8')(this.current.input);
+                        break;
+                    default:
+                        return;
+                }
+                if (this.current.isUppercase && type === "hex") {
+                    this.current.output = this.current.output.toUpperCase()
+                }
+                this.current.operation = type;
+                this.$clipboardCopy(this.current.output);
+                this.$saveToolData(this.current);
+            }
+        }
+    },
+    data() {
+        return {
+            current: {
+                input: "",
+                isUppercase: false,
+                output: "",
+                operation: ""
+            }
+        }
+    },
+}
+</script>
\ No newline at end of file
-- 
GitLab