Veronique 8 mesi fa
parent
commit
02146d676c

+ 1 - 1
.env.development

@@ -5,4 +5,4 @@ NODE_ENV='development'
 VITE_APP_PORT = 9992
 
 # 代理前缀
-VITE_APP_BASE_API = '/apis10'
+VITE_APP_BASE_API = '/apis100'

+ 1 - 1
.env.production

@@ -2,5 +2,5 @@
 NODE_ENV='production'
 
 # 代理前缀
-VITE_APP_BASE_API = '/apis10'
+VITE_APP_BASE_API = '/apis100'
 

+ 2 - 2
README.md

@@ -2,9 +2,9 @@
 
 - 功能简述:印刷商城的后台管理网站,产品管理、产品上下架、注册用户管理,订单简单管理,ERP系统可以从此项目中对接订单到ERP项目中。
 
-- 代理前缀: /apis10
+- 代理前缀: /apis100
 
-- 所有请求需要添加的header:X-ERP-User-From=10
+- 所有请求需要添加的header:X-ERP-User-From=100
 
 ### 1. 需要跑的npm
 

+ 2 - 2
src/permission.ts

@@ -16,7 +16,7 @@ document.title = ''
 const whiteList = ["/login","/test"];
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
-  const hasToken = getToken('Access-Token')
+  const hasToken = getToken('Access-100-Token')
   const userStore = useUserStoreHook();
   if(!settingsStore.webSite.init){
     //没有获取网站配置信息
@@ -57,7 +57,7 @@ router.beforeEach(async (to, from, next) => {
           next({ ...to, replace: true });
         } catch (error) {
           // 移除 token 并跳转登录页
-          await removeToken("Access-Token")//清除token
+          await removeToken("Access-100-Token")//清除token
           next(`/login?redirect=${to.path}`);
           NProgress.done();
         }

+ 18 - 16
src/store/modules/settings.ts

@@ -1,12 +1,12 @@
 import { defineStore } from "pinia";
 import defaultSettings from "@/settings";
 import { callSite } from "@/api/system";
-import {getToken} from "@/utils/js-cookie";
+import { getToken } from "@/utils/js-cookie";
 
 export const useSettingsStore = defineStore("setting", () => {
   const webSite = {
-    init: false,//判断是否获取过网站信息
-    webInfo: null // 网站信息
+    init: false, //判断是否获取过网站信息
+    webInfo: null, // 网站信息
   };
   const title = defaultSettings.title;
   const version = defaultSettings.version;
@@ -44,20 +44,22 @@ export const useSettingsStore = defineStore("setting", () => {
   function getSiteInfo() {
     return new Promise((resolve, reject) => {
       const params = {
-        "businessMethod": "SiteConfig_Read",
-        "params": {}
+        businessMethod: "SiteConfig_Read",
+        params: {},
       };
-      callSite(params).then((response) => {
-        const data = JSON.parse(response.data);
-        this.title = data.shortName;
-        this.webSite.webInfo = data;
-        this.webSite.init = true;
-        resolve(data);
-      }).catch(error => {
-        console.log(error);
-        this.webSite.init = false;
-        reject(error);
-      });
+      callSite(params)
+        .then((response) => {
+          const data = JSON.parse(response.data);
+          this.title = data.shortName;
+          this.webSite.webInfo = data;
+          this.webSite.init = true;
+          resolve(data);
+        })
+        .catch((error) => {
+          console.log(error);
+          this.webSite.init = false;
+          reject(error);
+        });
     });
   }
 

+ 5 - 5
src/store/modules/user.ts

@@ -12,14 +12,14 @@ import {getToken, setToken, removeToken} from '@/utils/js-cookie'
 
 export const useUserStore = defineStore("user", () => {
   const user = {
-    token: getToken("Access-Token"), // 登录token
+    token: getToken("Access-100-Token"), // 登录token
     init: false,//判断是否获取过路由
     roles: [],
     perms: [],
     userInfo: null // 用户信息
   };
 
-  // removeToken("Access-Token")//清除token
+  // removeToken("Access-100-Token")//清除token
 
   /**
    * 登录
@@ -42,7 +42,7 @@ export const useUserStore = defineStore("user", () => {
         .then((response) => {
           const {data} = response
           this.token = data.accessToken;
-          setToken("Access-Token", data.accessToken)
+          setToken("Access-100-Token", data.accessToken)
           resolve();
         })
         .catch((error) => {
@@ -69,7 +69,7 @@ export const useUserStore = defineStore("user", () => {
   // user logout
   function logout() {
     return new Promise<void>((resolve, reject) => {
-      removeToken("Access-Token")//清除token
+      removeToken("Access-100-Token")//清除token
       removeToken("dataBaseAlias")//清除dataBaseAlias
       removeToken("shardingKey")//清除shardingKey
       removeToken("supplierId")//清除supplierId
@@ -84,7 +84,7 @@ export const useUserStore = defineStore("user", () => {
   function resetToken() {
     return new Promise<void>((resolve) => {
       this.user.token = ""
-      removeToken("Access-Token")//清除token
+      removeToken("Access-100-Token")//清除token
       removeToken("dataBaseAlias")//清除dataBaseAlias
       removeToken("shardingKey")//清除shardingKey
       resetRouter();

+ 1 - 1
src/utils/js-cookie.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import Cookies from 'js-cookie'
 
-// const TokenKey = 'Access-Token'//后端存登陆信息的
+// const TokenKey = 'Access-100-Token'//后端存登陆信息的
 
 export function getToken(TokenKey:string) {
   return Cookies.get(TokenKey)

+ 2 - 2
src/utils/request.ts

@@ -12,9 +12,9 @@ const service = axios.create({
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
     const userStore = useUserStoreHook();
-    config.headers['X-ERP-User-From'] = 10;
+    config.headers['X-ERP-User-From'] = 100;
     if (userStore.user.token) {
-      config.headers['X-Token'] = getToken('Access-Token');
+      config.headers['X-Token'] = getToken('Access-100-Token');
     }
     if (getToken('dataBaseAlias')) {
       config.headers['X-ERP-DataSource-Id'] = getToken('dataBaseAlias');

+ 3 - 3
src/views/design/designFont/compt/childDialog.vue

@@ -23,7 +23,7 @@
                   ref="uploadThumb"
                   :multiple="false"
                   class="avatar-uploader"
-                  action="apis10/upload/bucketFile"
+                  action="apis100/upload/bucketFile"
                   :headers="headers"
                   :show-file-list="false"
                   accept=".jpg,.png"
@@ -60,7 +60,7 @@
                   ref="uploadFont"
                   :multiple="false"
                   class="upload-demo"
-                  action="apis10/upload/bucketFile"
+                  action="apis100/upload/bucketFile"
                   :headers="headers"
                   :show-file-list="false"
                   accept=".ttf"
@@ -118,7 +118,7 @@ const uploadThumb = ref<UploadInstance>();
 const uploadFont = ref<UploadInstance>();
 
 const headers = ref({
-  "X-ERP-User-From": 10,
+  "X-ERP-User-From": 100,
   "X-ERP-DataSource-Id": getToken("dataBaseAlias"),
   "X-ERP-Supplier-Code": getToken("shardingKey"),
   "X-Token": getToken("shardingKey"),

+ 2 - 2
src/views/design/designTemplate/compt/childDialog.vue

@@ -23,7 +23,7 @@
                   ref="uploadThumb"
                   :multiple="false"
                   class="avatar-uploader"
-                  action="apis10/upload/bucketFile"
+                  action="apis100/upload/bucketFile"
                   :headers="headers"
                   :show-file-list="false"
                   accept=".jpg,.png"
@@ -84,7 +84,7 @@ import {addDesignFont, getDesignTemplateImposition, updateDesignTemplateThumb} f
 const uploadThumb = ref<UploadInstance>();
 
 const headers = ref({
-  "X-ERP-User-From": 10,
+  "X-ERP-User-From": 100,
   "X-ERP-DataSource-Id": getToken("dataBaseAlias"),
   "X-ERP-Supplier-Code": getToken("shardingKey"),
   "X-Token": getToken("shardingKey"),

+ 1 - 1
src/views/login/index.vue

@@ -244,7 +244,7 @@ function getERPCode(){
 }
 onMounted(() => {
   //进入登录页面清除cookie
-  removeToken("Access-Token")//清除token
+  removeToken("Access-100-Token")//清除token
   removeToken("dataBaseAlias")//清除dataBaseAlias
   removeToken("shardingKey")//清除shardingKey
   removeToken("supplierId")//清除supplierId

+ 2 - 2
src/views/system/adimg/compt/imgDialog.vue

@@ -41,7 +41,7 @@
                     ref="upload"
                     :multiple="true"
                     class="avatar-uploader"
-                    action="apis10/upload/bucketFile"
+                    action="apis100/upload/bucketFile"
                     :headers="headers"
                     :show-file-list="false"
                     accept=".jpg,.png"
@@ -107,7 +107,7 @@ import type {UploadInstance, UploadProps, UploadRawFile} from 'element-plus'
 
 const upload = ref<UploadInstance>()
 const headers = ref({
-  "X-ERP-User-From": 10,
+  "X-ERP-User-From": 100,
   "X-ERP-DataSource-Id": getToken('dataBaseAlias'),
   "X-ERP-Supplier-Code": getToken('shardingKey'),
   "X-Token": getToken('shardingKey')

+ 1 - 1
src/views/system/changePassword/index.vue

@@ -60,7 +60,7 @@ function handleSubmit() {
             changeMyPassword(data).then(response => {
                 if (response.httpCode == 200) {
                   ElMessage.success("修改成功,去登录")
-                  removeToken("Access-Token")//清除token
+                  removeToken("Access-100-Token")//清除token
                   removeToken("dataBaseAlias")//清除dataBaseAlias
                   removeToken("shardingKey")//清除shardingKey
                   location.reload(); // 清空路由

+ 2 - 2
src/views/system/webInfo/compt/imgDialog.vue

@@ -18,7 +18,7 @@
                     ref="upload"
                     :multiple="true"
                     class="avatar-uploader"
-                    action="apis10/upload/bucketFile"
+                    action="apis100/upload/bucketFile"
                     :headers="headers"
                     :show-file-list="false"
                     accept=".jpg,.png,.ico"
@@ -52,7 +52,7 @@ import type {UploadInstance, UploadProps, UploadRawFile} from 'element-plus'
 
 const upload = ref<UploadInstance>()
 const headers = ref({
-  "X-ERP-User-From": 10,
+  "X-ERP-User-From": 100,
   "X-ERP-DataSource-Id": getToken('dataBaseAlias'),
   "X-ERP-Supplier-Code": getToken('shardingKey'),
   "X-Token": getToken('shardingKey')

+ 7 - 4
src/views/upgrade/compt/childDialog.vue

@@ -84,7 +84,7 @@
                   ref="upload"
                   :multiple="false"
                   class="avatar-uploader"
-                  action="/apis10/upload/bucketFile"
+                  action="/apis100/upload/bucketFile"
                   :headers="headers"
                   :show-file-list="false"
                   accept=".*"
@@ -169,15 +169,18 @@ const rules = reactive({
     { required: true, message: "请输入物流名称", trigger: "blur" },
   ],
 });
-const projectOptions = [{ label: "ERP-APP", code: "ERP-APP" }];
+const projectOptions = [
+  { label: "ERP-APP", code: "ERP-APP" },
+  { label: "ERP-PRINTCONFIG", code: "ERP-PRINTCONFIG" },
+];
 
 const upload = ref<UploadInstance>();
 
 const headers = {
-  "X-ERP-User-From": 10,
+  "X-ERP-User-From": 100,
   "X-ERP-DataSource-Id": getToken("dataBaseAlias"),
   "X-ERP-Supplier-Code": getToken("shardingKey"),
-  "X-Token": getToken("Access-Token"),
+  "X-Token": getToken("Access-100-Token"),
 };
 const uploadParams = reactive({
   srcfilename: "",

+ 4 - 3
src/views/upgrade/compt/revokeDialog.vue

@@ -60,7 +60,10 @@ const formData = reactive({
   projectCode: "ERP-APP",
 });
 
-const projectOptions = [{ label: "ERP-APP", code: "ERP-APP" }];
+const projectOptions = [
+  { label: "ERP-APP", code: "ERP-APP" },
+  { label: "ERP-PRINTCONFIG", code: "ERP-PRINTCONFIG" },
+];
 
 function handleSubmit() {
   formRef.value.validate((valid: any) => {
@@ -83,14 +86,12 @@ function handleSubmit() {
 /**  重置表单 */
 function resetForm() {
   formRef.value.resetFields();
-  formData.id = 0;
 }
 
 /**关闭弹窗 */
 function closeDialog() {
   dialogVisible.value = false;
   formRef.value.resetFields();
-  formData.id = 0;
 }
 
 function getItemData(item) {}