askbot-dragon 1.7.26-beta → 1.7.29-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.26-beta",
+  "version": "1.7.29-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -28,10 +28,12 @@
     "babel-eslint": "^10.1.0",
     "element-ui": "^2.15.10",
     "eslint": "^6.7.2",
+    "vue-markdown": "^2.2.4",
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.12.2",
     "less-loader": "^7.0.2",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "^2.6.11",
+    "vue-i18n": "^8.26.4"
   },
   "eslintConfig": {
     "root": true,

package/src/assets/js/AliyunlssUtil.js

@@ -4,7 +4,27 @@
 
 const OSS = window.OSS
 
-const ossConfig={
+const getPrivateOssConfig = () =>{
+    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
+    switch (mainSource) {
+        case "askbot":
+            return {
+                region: "oss-cn-zhangjiakou",
+                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+                bucket: "guoranopen-zjk",
+            }
+        case "lishi":
+            return {
+                region: "oss-ap-southeast-1",
+                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+                bucket: "askbotopen-ls",
+            };
+    }
+}
+
+const ossConfig = {
     region: "oss-cn-zhangjiakou",
         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
         accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
@@ -13,6 +33,8 @@ const ossConfig={
         bucket: "guoranopen-zjk",
 };
 
+
+
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;
 while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
 let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
@@ -48,8 +70,8 @@ function pathGenerate(filename) {
 }
 
 
-async function upload(ossConfig, data) {
-    let ossClient = new OSS(ossConfig);
+async function upload(data) {
+    let ossClient = new OSS(getPrivateOssConfig());
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(data.name);
     let result = await ossClient.put(objectKey, data);
@@ -57,8 +79,8 @@ async function upload(ossConfig, data) {
     return result;
 }
 
-async function multipartUpload(ossConfig, data, callback,extCallback) {
-    let ossClient = new OSS(ossConfig);
+async function multipartUpload(data, callback,extCallback) {
+    let ossClient = new OSS(getPrivateOssConfig());
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(data.name);
     let res = await ossClient.multipartUpload(objectKey, data, {
@@ -73,7 +95,8 @@ async function multipartUpload(ossConfig, data, callback,extCallback) {
     return res;
 }
 
-function ossFileUrl(ossConfig, path, cname) {
+function ossFileUrl(path, cname) {
+    let ossConfig = getPrivateOssConfig()
     if (cname == null) {
         return '//' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
     } else {
@@ -81,8 +104,8 @@ function ossFileUrl(ossConfig, path, cname) {
     }
 }
 
-function uploadImageByBase64(ossConfig,blob) {
-    let ossClient = new OSS(ossConfig);
+function uploadImageByBase64(blob) {
+    let ossClient = new OSS(getPrivateOssConfig());
 
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形 式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(new Date().getTime());
@@ -91,4 +114,4 @@ function uploadImageByBase64(ossConfig,blob) {
     return result;
 }
 
-export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig}
+export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig, getPrivateOssConfig}

package/src/components/AiGuide.vue

@@ -191,7 +191,7 @@
             >
                 <span @click="changeIntellectGuide" class="ig-change-list-btn">
                     <svg t="1720148246364" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="136175" width="16" height="16"><path d="M225.6 540.8C240 686.4 363.2 800 512 800c76.8 0 150.4-30.4 203.2-84.8 12.8-12.8 32-12.8 44.8 0s12.8 32 0 44.8c-64 65.6-153.6 104-248 104-184 0-336-142.4-350.4-323.2l-43.2 41.6c-12.8 12.8-33.6 11.2-44.8 0s-11.2-33.6 0-44.8l99.2-96c12.8-12.8 33.6-11.2 44.8 0l92.8 96c12.8 12.8 11.2 33.6-1.6 44.8-12.8 12.8-33.6 11.2-44.8-1.6l-38.4-40zM800 497.6C792 345.6 665.6 224 512 224c-76.8 0-148.8 30.4-203.2 83.2-12.8 12.8-33.6 12.8-44.8 0-12.8-12.8-12.8-33.6 0-44.8 65.6-64 153.6-102.4 248-102.4 192 0 347.2 153.6 352 342.4l41.6-40c12.8-12.8 33.6-11.2 44.8 1.6 12.8 12.8 11.2 33.6-1.6 44.8l-94.4 89.6c-12.8 11.2-32 11.2-44.8 0l-97.6-96c-12.8-12.8-12.8-32 0-44.8 12.8-12.8 32-12.8 44.8 0l43.2 40z" p-id="136176" fill="#366aff"></path></svg>
-                    换一批</span
+                    {{$t('dragonCommon.refresh')}}</span
                 >
             </div>
         </div>