zen-gitsync 1.3.7 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",

package/src/gitCommit.js

@@ -92,21 +92,6 @@ const getCwd = () => {
   return process.cwd()
 }
 
-// 有时候有乱码呢123神奇
-
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-})
-
-function rlPromisify(fn) {
-  return async (...args) => {
-    return new Promise((resolve, reject) => fn(...args, resolve, reject))
-  }
-}
-
-const question = rlPromisify(rl.question.bind(rl))
-
 class GitCommit {
   constructor(options) {
     this.statusOutput = null
@@ -169,6 +154,18 @@ class GitCommit {
 
     if (!autoCommit && !commitMessageArg) {
       // 如果没有 -y 参数，则等待用户输入提交信息
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      })
+
+      function rlPromisify(fn) {
+        return async (...args) => {
+          return new Promise((resolve, reject) => fn(...args, resolve, reject))
+        }
+      }
+
+      const question = rlPromisify(rl.question.bind(rl))
       this.commitMessage = await question('请输入提交信息：');
     }
 
@@ -346,7 +343,7 @@ class GitCommit {
     let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
     try {
       let cwd = getCwd()
-      const output = execSync(command, {encoding, maxBuffer, cwd})
+      const output = execSync(command, {env: { ...process.env, LANG: 'C.UTF-8' },encoding, maxBuffer, cwd})
       if (options.spinner) {
         options.spinner.stop();
       }
@@ -364,7 +361,7 @@ class GitCommit {
     return new Promise((resolve, reject) => {
       let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
       let cwd = getCwd()
-      exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
+      exec(command, {env: { ...process.env, LANG: 'C.UTF-8' },encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
         if (options.spinner) {
           options.spinner.stop();
         }