ztxkutils 2.10.66-21 → 2.10.66-23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.66-21",
+  "version": "2.10.66-23",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -70,7 +70,6 @@
     "@babel/types": "^7.18.10",
     "@prettier/plugin-pug": "^1.8.1",
     "@typescript-eslint/typescript-estree": "^3.8.0",
-    "@vitalets/google-translate-api": "^8.0.0",
     "babel-template": "^6.26.0",
     "chalk": "^3.0.0",
     "commander": "^2.18.0",

package/zti18n-cli/src/command/collect.js

@@ -24,7 +24,7 @@ async function syncOneNonChineseLocalesConf(
   confService
 ) {
   const confName = key;
-  const { disableAutoTranslate, translator } = option;
+  const { disableAutoTranslate, translator, appid, privatekey } = option;
 
   const translate = translator
     ? require(path.join(process.cwd(), translator))
@@ -58,7 +58,7 @@ async function syncOneNonChineseLocalesConf(
     const text = mergedLocales[k];
     let targetLang = key.split(/_|-/)[0];
     if (isChinese(text)) {
-      if (disableAutoTranslate) {
+      if (disableAutoTranslate || !appid || !privatekey) {
         mergedLocales[k] = text;
       } else {
         translateTasks.push([k, targetLang]);
@@ -78,9 +78,11 @@ async function syncOneNonChineseLocalesConf(
       tasks.map(([k, targetLang]) => {
         const text = mergedLocales[k];
 
-        return translate(text, targetLang)
+        return translate(text, targetLang, appid, privatekey)
           .then((res) => {
-            mergedLocales[k] = res.text;
+            mergedLocales[k] = res.transResult
+              .replaceAll('{ { ', '{{')
+              .replaceAll(' } }', '}}');
           })
           .catch((err) => {
             log.warning(`[AutoTranslate]: ${err.message}`);

package/zti18n-cli/src/translate/google.js

@@ -1,6 +1,87 @@
-// https://github.com/matheuss/google-translate-api/issues/79#issuecomment-427841889
-const googleTranslate = require('@vitalets/google-translate-api');
+const crypto = require('crypto');
+const https = require('https');
+const querystring = require('querystring');
 
-module.exports = function translateByGoogle(text, targetLang) {
-  return googleTranslate(text, { client: 'gtx', to: targetLang });
-};
+function MD5(string) {
+  return crypto.createHash('md5').update(string).digest('hex');
+}
+
+function generateRandomString(length) {
+  // 定义包含所有可能字符的字符串
+  const characters =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  let result = '';
+  const charactersLength = characters.length;
+  for (let i = 0; i < length; i++) {
+    // 生成一个0到字符集长度之间的随机索引
+    const randomIndex = Math.floor(Math.random() * charactersLength);
+    // 从字符集中取出对应索引的字符添加到结果字符串中
+    result += characters.charAt(randomIndex);
+  }
+  return result;
+}
+
+function translateByGoogle(text, targetLang, privatekey, appid) {
+  const data = {
+    appid,
+    nonce_str: generateRandomString(10),
+    from: 'zh',
+    to: targetLang,
+    text: text,
+  };
+  const translateData = {
+    ...data,
+    privatekey,
+  };
+  const stringA = Object.keys(translateData)
+    .sort()
+    .map((key) => `${key}=${translateData[key]}`)
+    .join('&');
+  const token = MD5(stringA).toUpperCase();
+
+  const agent = new https.Agent({
+    rejectUnauthorized: false,
+  });
+  const postData = querystring.stringify({
+    ...data,
+    token,
+  });
+  return new Promise((resolve, reject) => {
+    const req = https.request(
+      {
+        hostname: 'aify.zmd.com.cn',
+        path: '/TranslateApi/api/transText',
+        method: 'POST',
+        agent,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Length': Buffer.byteLength(postData),
+        },
+      },
+      (res) => {
+        let data = [];
+
+        res.on('data', (chunk) => {
+          data.push(chunk);
+        });
+
+        res.on('end', () => {
+          const buffer = Buffer.concat(data);
+          const json = JSON.parse(buffer.toString());
+          resolve(json.data);
+        });
+      }
+    );
+
+    req.on('error', (error) => {
+      console.error(error);
+      reject(error);
+    });
+    // 写入请求数据
+    req.write(postData);
+    req.end();
+  });
+}
+// translateByGoogle('你好', 'en');
+
+module.exports = translateByGoogle;

package/zti18n-core/src/transform/transformJs.js

@@ -18,18 +18,18 @@ function getIgnoreLines(ast) {
     const { type, value, loc } = comment;
     const last = ignoreBlocks.length - 1;
 
-    if (type === 'CommentLine' && value.trim() === 'di18n-disable-line') {
+    if (type === 'CommentLine' && value.trim() === 'zti18n-disable-line') {
       ignoreBlocks.push({
         start: loc.start.line,
         end: loc.start.line,
       });
-    } else if (type === 'CommentBlock' && value.trim() === 'di18n-disable') {
+    } else if (type === 'CommentBlock' && value.trim() === 'zti18n-disable') {
       if (last < 0 || ignoreBlocks[last].end) {
         ignoreBlocks.push({
           start: loc.start.line,
         });
       }
-    } else if (type === 'CommentBlock' && value.trim() === 'di18n-enable') {
+    } else if (type === 'CommentBlock' && value.trim() === 'zti18n-enable') {
       if (last >= 0 && !ignoreBlocks[last].end) {
         ignoreBlocks[last].end = loc.start.line;
       }

package/zti18n-core/src/utils/getIgnoreLines.js

@@ -5,8 +5,8 @@ module.exports = function getIgnoreLines(tpl) {
 
   const lines = tpl.split(/\n|\r\n/g);
   for (let i = 0; i < lines.length; i++) {
-    if (lines[i].includes('di18n-disable')) ignoring = true;
-    if (lines[i].includes('di18n-enable')) ignoring = false;
+    if (lines[i].includes('zti18n-disable')) ignoring = true;
+    if (lines[i].includes('zti18n-enable')) ignoring = false;
     if (ignoring) ignores.push(i + 1);
   }
 

package/dist/reqUrl-22b880a4.js

@@ -1,82 +0,0 @@
-/**
- * @file 项目基本配置，包括各个环境的请求地址
- */
-// 环境变量
-function getReqUrl(processObj) {
-    var ENV = processObj.REACT_APP_ENV;
-    // api服务器各个环境地址
-    var ZT_API_DEV = processObj.REACT_APP_ZT_API_DEV || window.location.origin; // 开发环境
-    var ZT_API_TEST = processObj.REACT_APP_ZT_API_TEST || window.location.origin; // 测试环境 https://192.168.0.135:8000
-    var ZT_API_STAGE = processObj.REACT_APP_ZT_API_STAGE || window.location.origin; // 阶段性环境 http://192.168.0.134:8000
-    var ZT_API_SIM = processObj.REACT_APP_ZT_API_SIM || window.location.origin; // 阶段性环境 http://192.168.0.134:8000
-    var ZT_API_PRODUCT = processObj.REACT_APP_ZT_API_PRODUCT || window.location.origin; // 生产环境 http://dz.zmd.com.cn
-    var ZT_API_PUBLIC_PRODUCT = processObj.REACT_APP_ZT_API_PUBLIC_PRODUCT ||
-        'https://nportal.zmd.com.cn:18998'; // 生产环境外网api地址 https://m-portal.zmd.com.cn:18998 http://dz.zmd.com.cn:48000
-    // 文件服务器
-    var ZT_FILE_PREVIEW_DEV = processObj.REACT_APP_ZT_FILE_PREVIEW_DEV || 'http://192.168.0.83:88'; // 开发环境
-    var ZT_FILE_PREVIEW_TEST = processObj.REACT_APP_ZT_FILE_PREVIEW_TEST || 'http://172.55.5.101:33013'; // 测试环境 https://192.168.0.135:18012
-    var ZT_FILE_PREVIEW_STAGE = processObj.REACT_APP_ZT_FILE_PREVIEW_STAGE ||
-        'https://dzfile-prod.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
-    var ZT_FILE_PREVIEW_SIM = processObj.REACT_APP_ZT_FILE_PREVIEW_SIM ||
-        'https://dzfile-data.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
-    var ZT_FILE_PREVIEW_PRODUCT = processObj.REACT_APP_ZT_FILE_PREVIEW_PRODUCT ||
-        'https://dzfile.zmd.com.cn:8012'; // 生产环境
-    // 字体文件附件id
-    var ZT_FONTFAMILY_DEV = '1551733945007517697';
-    var ZT_FONTFAMILY_TEST = '1551836774183047169';
-    var ZT_FONTFAMILY_STAGE = '1551837561144905730';
-    var ZT_FONTFAMILY_SIM = '1562010976138207234';
-    var ZT_FONTFAMILY_PRODUCT = '1552851055372992513';
-    // 实际api请求地址
-    var ZT_API_BASEURL = ZT_API_DEV;
-    var ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
-    var ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
-    var ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_DEV;
-    if (ENV) {
-        switch (ENV.toLowerCase()) {
-            case 'zt-dev':
-                ZT_API_BASEURL = ZT_API_DEV;
-                ZT_API_PUBLICURL = ZT_API_DEV;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_DEV;
-                break;
-            case 'zt-test':
-                ZT_API_BASEURL = ZT_API_TEST;
-                ZT_API_PUBLICURL = ZT_API_TEST;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_TEST;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_TEST;
-                break;
-            case 'zt-stage':
-                ZT_API_BASEURL = ZT_API_STAGE;
-                ZT_API_PUBLICURL = ZT_API_STAGE;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_STAGE;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_STAGE;
-                break;
-            case 'zt-sim':
-                ZT_API_BASEURL = ZT_API_SIM;
-                ZT_API_PUBLICURL = ZT_API_SIM;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_SIM;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_SIM;
-                break;
-            case 'zt-product':
-                ZT_API_BASEURL = ZT_API_PRODUCT;
-                ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_PRODUCT;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_PRODUCT;
-                break;
-        }
-    }
-    return {
-        ZT_API_BASEURL: ZT_API_BASEURL,
-        ZT_FILE_BASEURL: ZT_FILE_BASEURL,
-        ZT_API_PUBLICURL: ZT_API_PUBLICURL,
-        ZT_FONTFAMILY_BASEURL: ZT_FONTFAMILY_BASEURL,
-    };
-}
-
-var reqUrl = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  getReqUrl: getReqUrl
-});
-
-export { getReqUrl as g, reqUrl as r };