From 0878449b3e7160d1a585b1c2f787b09332e5865d Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 10 一月 2024 16:08:26 +0800
Subject: [PATCH] 还原、
---
vite.config.ts | 4 +-
src/views/login.vue | 20 ---------
src/api/system/config/index.ts | 4 -
src/plugins/download.ts | 9 +---
index.html | 13 ------
package.json | 1
src/api/login.ts | 12 +----
.env.production | 4 +-
src/api/menu.ts | 4 -
src/api/system/oss/index.ts | 8 +---
src/App.vue | 15 -------
11 files changed, 14 insertions(+), 80 deletions(-)
diff --git a/.env.production b/.env.production
index 06aed2c..7ad05fa 100644
--- a/.env.production
+++ b/.env.production
@@ -14,10 +14,10 @@
VITE_APP_POWERJOB_ADMIN = '/powerjob'
# 鐢熶骇鐜
-# VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = '/prod-api'
# app
-VITE_APP_BASE_API = '/service/api'
+# VITE_APP_BASE_API = '/service/api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
VITE_BUILD_COMPRESS = gzip
diff --git a/index.html b/index.html
index b90124e..a105c48 100644
--- a/index.html
+++ b/index.html
@@ -213,18 +213,5 @@
</div>
</div>
<script type="module" src="/src/main.ts"></script>
- <script type="module" src="./vconsole.js"> </script>
- <script>
- import VConsole from 'vconsole'
-
- Window.VConsole
- // var vc = new VConsole({
- // disableLogScrolling: false,
- // defaultPlugins: ["system", "network"],
- // log: { maxLogNumber: 200 },
- // });
- window.JavaScriptMe.getAppCenterToken();
-
- </script>
</body>
</html>
diff --git a/package.json b/package.json
index f1dd00a..eae5521 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
"path-to-regexp": "6.2.0",
"pinia": "2.0.22",
"screenfull": "6.0.0",
- "vconsole": "^3.15.1",
"vform3-builds": "3.0.8",
"vue": "3.2.45",
"vue-cropper": "1.0.3",
diff --git a/src/App.vue b/src/App.vue
index a320e34..a124b45 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,6 @@
</template>
<script setup lang="ts">
-
import axios from 'axios';
import useSettingsStore from '@/store/modules/settings'
import { handleThemeStyle } from '@/utils/theme'
@@ -14,18 +13,6 @@
import { setToken } from "@/utils/auth";
import usePermissionStore from "@/store/modules/permission";
import { isHttp } from "@/utils/validate";
-import VConsole from 'vconsole'
-let vc: any = null;
-const initVconsole = () => {
- console.log('vcvcvvcvc')
- // if (env.currentEnv !== env.ENV_ENUM.PRODUCT) {
- vc = new VConsole({
- disableLogScrolling: false,
- defaultPlugins: ["system", "network"],
- log: { maxLogNumber: 200 },
- });
- // }
-};
const appStore = useAppStore();
const size = computed(() => appStore.size as any);
@@ -40,7 +27,5 @@
// 鍒濆鍖栦富棰樻牱寮�
handleThemeStyle(useSettingsStore().theme)
})
-// initVconsole()
-
})
</script>
diff --git a/src/api/login.ts b/src/api/login.ts
index d2b355c..7419fb3 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -45,9 +45,7 @@
*/
export function logout() {
return request({
- // url: '/auth/logout',
- // url: '/3d4af489bc4f4c11bfd3d0dbdf88309b/' + window.JavaScriptMe.getAppCenterToken(),
- url: '/3d4af489bc4f4c11bfd3d0dbdf88309b',
+ url: '/auth/logout',
method: 'post'
});
}
@@ -85,9 +83,7 @@
// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
export function getInfo(): AxiosPromise<UserInfo> {
return request({
- // url: '/system/user/getInfo',
- // url: '/d9dddbc6667d49ddbaa6371dfd612e96/' + window.JavaScriptMe.getAppCenterToken(),
- url: '/d9dddbc6667d49ddbaa6371dfd612e96',
+ url: '/system/user/getInfo',
method: 'get'
});
}
@@ -95,9 +91,7 @@
// 鑾峰彇绉熸埛鍒楄〃
export function getTenantList(): AxiosPromise<TenantInfo> {
return request({
- // url: '/auth/tenant/list',
- // url: '/77b4670b1ecb40bf939469932b11c41e/' + window.JavaScriptMe.getAppCenterToken(),
- url: '/77b4670b1ecb40bf939469932b11c41e',
+ url: '/auth/tenant/list',
headers: {
isToken: false
},
diff --git a/src/api/menu.ts b/src/api/menu.ts
index 766c3ff..a3ae80e 100644
--- a/src/api/menu.ts
+++ b/src/api/menu.ts
@@ -5,9 +5,7 @@
// 鑾峰彇璺敱
export function getRouters(): AxiosPromise<RouteRecordRaw[]> {
return request({
- // url: '/system/menu/getRouters',
- // url: '/1aac492a29424d95875e8bd69166679a/' + window.JavaScriptMe.getAppCenterToken(),
- url: '/1aac492a29424d95875e8bd69166679a',
+ url: '/system/menu/getRouters',
method: 'get'
});
}
diff --git a/src/api/system/config/index.ts b/src/api/system/config/index.ts
index 181d75d..e52a256 100644
--- a/src/api/system/config/index.ts
+++ b/src/api/system/config/index.ts
@@ -22,9 +22,7 @@
// 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
export function getConfigKey(configKey: string): AxiosPromise<String> {
return request({
- // url: '/system/config/configKey/' + configKey,
- // url: '/99ddd33a79184380847225751799f213/' + window.JavaScriptMe.getAppCenterToken() + '/' + configKey,
- url: '/99ddd33a79184380847225751799f213/' + configKey,
+ url: '/system/config/configKey/' + configKey,
method: 'get'
});
}
diff --git a/src/api/system/oss/index.ts b/src/api/system/oss/index.ts
index 8cb5fd3..f9fcfc8 100644
--- a/src/api/system/oss/index.ts
+++ b/src/api/system/oss/index.ts
@@ -5,9 +5,7 @@
// 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
return request({
- // url: '/resource/oss/list',
- // url: '/905d4cedbbe442f6adb5729b32d277fc/' + window.JavaScriptMe.getAppCenterToken(),
- url: '/905d4cedbbe442f6adb5729b32d277fc',
+ url: '/resource/oss/list',
method: 'get',
params: query
});
@@ -30,9 +28,7 @@
}
export function createUser(winIp: string | number | Array<string | number>) {
return request({
- // url: '/auth/auto' ,
- // url: '/7a7d5106ba8b4859b3e9f550b03f6179/' + window.JavaScriptMe.getAppCenterToken() ,
- url: '/7a7d5106ba8b4859b3e9f550b03f6179',
+ url: '/auth/auto' ,
method: 'get',
params: winIp
});
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 347c18b..2cdfa50 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -9,9 +9,7 @@
let downloadLoadingInstance: LoadingInstance;
export default {
async oss(ossId: string | number) {
- // const url = baseURL + '/resource/oss/download/' + ossId;
- // const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + window.JavaScriptMe.getAppCenterToken() + '/' + ossId;
- const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + ossId;
+ const url = baseURL + '/resource/oss/download/' + ossId;
downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
try {
const res = await axios({
@@ -65,10 +63,7 @@
ElMessage.error(errMsg);
},
async ossDown(ossId: string | number,pawd:string) {
- // const url = baseURL + '/resource/oss/download/' + ossId +'/' + pawd;
- // const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + window.JavaScriptMe.getAppCenterToken() +'/' + ossId +'/' + pawd;
- const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + ossId +'/' + pawd;
-
+ const url = baseURL + '/resource/oss/download/' + ossId +'/' + pawd;
downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
try {
const res = await axios({
diff --git a/src/views/login.vue b/src/views/login.vue
index ae3595b..cb67925 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -222,27 +222,9 @@
}
const randomSixDigitNumber = getRandomSixDigitNumber();
-import VConsole from 'vconsole'
-let vc: any = null;
-const initVconsole = () => {
- console.log('vcvcvvcvc')
- // if (env.currentEnv !== env.ENV_ENUM.PRODUCT) {
- vc = new VConsole({
- disableLogScrolling: false,
- defaultPlugins: ["system", "network"],
- log: { maxLogNumber: 200 },
- });
- // }
-};
+
onMounted(async () => {
-// initVconsole()
- // myMethod();
- // callNativeMethod();
- // alert(window);
- // console.log("window.JavaScriptMe.getAppCenterToken()",window.JavaScriptMe.getAppCenterToken())
- window.JavaScriptMe.getAppCenterToken();
- // alert("window.JavaScriptMe.getAppCenterToken();")
let obj = {
username: randomSixDigitNumber
}
diff --git a/vite.config.ts b/vite.config.ts
index c558a96..26e2578 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -26,11 +26,11 @@
open: true,
proxy: {
[env.VITE_APP_BASE_API]: {
- // target: 'http://80.36.32.176:8080',
+ target: 'http://80.36.32.176:8080',
// target: 'http://127.0.0.1:8080',
// target: 'http://80.36.32.176:8080',
// target: 'http://162.14.79.111:2023',
- target: 'http://esb.ydjw.sc',
+ // target: 'http://esb.ydjw.sc',
changeOrigin: true,
rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
}
--
Gitblit v1.8.0