gc_i18n 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gc_i18n",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "gc_i18n": {
     "appCode": "TEST"
   },
@@ -10,7 +10,8 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "cnpm": "cnpm sync gc_i18n"
   },
   "dependencies": {
     "axios": "^1.7.9",

package/packages/components/config.vue

@@ -47,7 +47,12 @@ export default {
       return arr;
     }
   },
-  props: { appCode: String, name: String, setLanguage: Function },
+  props: {
+    appCode: String,
+    name: String,
+    setLanguage: Function,
+    token: String
+  },
   methods: {
     closeModal() {
       this.searchText = "";
@@ -92,11 +97,14 @@ export default {
         const diff = this.findShallowStringDiff(value, original);
         arr = _.concat(arr, diff);
       }
-      const res = await saveTranslate({
-        appCode: this.appCode,
-        language: this.language,
-        data: arr
-      });
+      const res = await saveTranslate(
+        {
+          appCode: this.appCode,
+          language: this.language,
+          data: arr
+        },
+        this.token
+      );
       if (res && res.result === 0) {
         Message.success(msg ? msg : res.msg);
         // 更新到本地缓存
@@ -123,14 +131,14 @@ export default {
         pageSize: 10,
         ...data
       };
-      const res = await getAllTranslate(options);
+      const res = await getAllTranslate(options, this.token);
       if (res) {
         this.initialData = _.cloneDeep(res.retVal);
         this.data = res.retVal;
       }
     },
     async init() {
-      const res = await getLanguages();
+      const res = await getLanguages(this.token);
       if (res && res.result == 0) {
         this.languages = res.retVal;
         this.search();

package/packages/index.js

@@ -9,14 +9,16 @@ import { getTranslate } from "./libs/service";
 import { convertArrayToObject } from "./libs/utils";
 import "./libs/http";
 import _ from "lodash-es";
+import store2 from "store2";
 export default class I18n {
   constructor(options = {}) {
-    const { router } = options;
-    this.appCode = options.appCode;
+    const { router, appCode, messages, token } = options;
+    this.token = token || store2.get("token");
+    this.appCode = appCode;
     this.router = router;
     this.locale = navigator.language || "zh-CN";
     this.modalLoad = false;
-    this.messages = options.messages || {};
+    this.messages = messages || {};
     this.i18n = createI18n({
       locale: "zh-CN",
       allowComposition: true,
@@ -60,7 +62,8 @@ export default class I18n {
     };
 
     router.afterEach((to, from) => {
-      const { language } = to.query;
+      const { language, token } = to.query;
+      token && this.setToken(token);
       this.setLanguage(language);
 
       nextTick(() => {
@@ -72,11 +75,15 @@ export default class I18n {
       });
     });
   }
+  setToken(token) {
+    this.token = token;
+  }
   async setLanguage(language = "zh-CN") {
     this.locale = language;
     const res = await getTranslate({
       appCode: this.appCode,
-      language
+      language,
+      token: this.token
     });
 
     if (res) {
@@ -93,6 +100,7 @@ export default class I18n {
     // 创建 config 组件的实例
     this.configInstance = createApp(configVue, {
       appCode: this.appCode,
+      token: this.token,
       setLanguage: this.setLanguage.bind(this),
       name
     })

package/packages/libs/http.js

@@ -11,11 +11,6 @@ axios.defaults.timeout = 60000;
 
 axios.interceptors.request.use(
   (config) => {
-    //这边可根据自己的需求设置headers，我司采用basic基本认证
-    const authToken = localStorage.getItem("token");
-    if (!_.isEmpty(authToken)) {
-      config.headers["Authorization"] = authToken;
-    }
     config.headers["Content-Type"] = "application/json";
     return config;
   },

package/packages/libs/service.js

@@ -4,12 +4,10 @@ import _ from "lodash-es";
 import { mergeArraysByKey } from "./utils";
 export const service = "https://test.ihotel.cn";
 
-const Authorization =
-  "eyJhbGciOiJIUzUxMiJ9.eyJkZXZpY2VUeXBlIjoiQ09NUFVURVIiLCJtYWluQXBwQ29kZSI6IlNTTyIsIm9yZ0NvZGUiOiJHQ0JaRyIsInVjU2VydmVyVXJsIjoiaHR0cHM6Ly90ZXN0Lmlob3RlbC5jbi91Yy13ZWIvIiwiYXBwQ29kZSI6IlNTTyIsInVzZXJUeXBlIjoiTk9STUFMIiwibG9naW5BdCI6MTczODczNTczOTAwMCwicHJpbmNpcGFsVXNlckNvZGUiOiJHQ0JaR19BRE1JTiIsImV4cCI6MzI1MDM2NTEyMDAsInVzZXJDb2RlIjoiR0NCWkdfQURNSU4iLCJzc28iOiJTU09fU0VSVkVSIn0.KQt1YbUdJ7DfqrfXEVYT0Ux-7Zlo2GQBiIoq0rxK0cv1LHqOOMtBkv8kmChM6VavtdnlyXM2GkW6YMvIIHvu0Q";
-export const getLanguages = async () => {
+export const getLanguages = async (token) => {
   return axios.get(service + "/i18n-web/sysoption/getsupportedlangs", {
     headers: {
-      Authorization
+      Authorization: token
     }
   });
 };
@@ -17,7 +15,8 @@ export const fetchTranslate = async ({
   appCode,
   language = "zh-CN",
   page,
-  lastPullDate
+  lastPullDate,
+  token
 }) => {
   return new Promise(async (resolve, reject) => {
     const serverURI = service + "/i18n-web/kv_translate/kv_translates";
@@ -30,7 +29,8 @@ export const fetchTranslate = async ({
       headers: {
         appCode,
         page,
-        language
+        language,
+        Authorization: token
       }
     });
     if (res && res.result == 0) {
@@ -41,29 +41,30 @@ export const fetchTranslate = async ({
   });
 };
 
-export const getAllTranslate = async (data) => {
+export const getAllTranslate = async (data, token) => {
   return axios({
     url: service + "/i18n-web/kv_translate/kv_translates",
     method: "POST",
     data,
-    headers: { token: Authorization }
+    headers: { token }
   });
 };
-export const saveTranslate = async (data) => {
+export const saveTranslate = async (data, token) => {
   return axios({
     url: service + "/i18n-web/kv_translate/batch",
     method: "POST",
     data,
-    headers: { token: Authorization }
+    headers: { token }
   });
 };
-export const getTranslate = async ({ appCode, language = "zh-CN" }) => {
+export const getTranslate = async ({ appCode, language = "zh-CN", token }) => {
   return new Promise(async (resolve, reject) => {
     // const appCodeStore = i18nStore.get(appCode);
     const languageStore = store2.namespace(`i18n_${appCode}`);
     const options = {
       appCode,
-      language
+      language,
+      token
     };
     const lastData = languageStore.get(language);