diff --git a/.env.production b/.env.production index 1cb955c..7e6c8db 100644 --- a/.env.production +++ b/.env.production @@ -3,9 +3,9 @@ NODE_ENV = "production" # 线上环境接口地址(easymock) # VITE_API_URL = "http://139.9.66.234:6688" -VITE_API_URL = "http://182.90.224.147:6688" +# VITE_API_URL = "http://182.90.224.147:6688" # VITE_API_URL = "http://182.90.224.147:9012" -# VITE_API_URL = "http://47.104.132.250:9000" +VITE_API_URL = "http://47.104.132.250:9000" VITE_WPAPI_URL = "http://182.90.224.147:8081" # VITE_API_URL = "http://101.43.164.214:6688" # VITE_API_URL = "https://wx.antjg.com:6081/" diff --git a/package-lock.json b/package-lock.json index 1cae425..b93f2df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "amfe-flexible": "^2.2.1", "axios": "^1.2.1", "base-64": "^1.0.0", + "crypto-js": "^4.1.1", "date-fns": "^2.29.3", "driver.js": "^0.9.8", "echarts": "^5.3.0", @@ -5211,6 +5212,11 @@ "node": ">= 8" } }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + }, "node_modules/css-functions-list": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/css-functions-list/-/css-functions-list-3.1.0.tgz", @@ -19970,6 +19976,11 @@ "which": "^2.0.1" } }, + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + }, "css-functions-list": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/css-functions-list/-/css-functions-list-3.1.0.tgz", diff --git a/package.json b/package.json index 8559170..96a16c1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "amfe-flexible": "^2.2.1", "axios": "^1.2.1", "base-64": "^1.0.0", + "crypto-js": "^4.1.1", "date-fns": "^2.29.3", "driver.js": "^0.9.8", "echarts": "^5.3.0", diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts new file mode 100644 index 0000000..4d532df --- /dev/null +++ b/src/utils/crypto.ts @@ -0,0 +1,24 @@ +import CryptoJS from "crypto-js"; +export default { + // 加密 + encrypt(word: any, keyStr: any) { + keyStr = keyStr ? keyStr : ""; + let key = CryptoJS.enc.Utf8.parse(keyStr); + let srcs = CryptoJS.enc.Utf8.parse(word); + let encrypted = CryptoJS.AES.encrypt(srcs, key, { + mode: CryptoJS.mode.ECB, + padding: CryptoJS.pad.Pkcs7 + }); + return encrypted.toString(); + }, + // 解密 + decrypt(word: any, keyStr: any) { + keyStr = keyStr ? keyStr : ""; + var key = CryptoJS.enc.Utf8.parse(keyStr); + var decrypt = CryptoJS.AES.decrypt(word, key, { + mode: CryptoJS.mode.ECB, + padding: CryptoJS.pad.Pkcs7 + }); + return CryptoJS.enc.Utf8.stringify(decrypt).toString(); + } +}; diff --git a/src/views/enterprise/userManagement/userManage/index.vue b/src/views/enterprise/userManagement/userManage/index.vue index 66235b9..9907a87 100644 --- a/src/views/enterprise/userManagement/userManage/index.vue +++ b/src/views/enterprise/userManagement/userManage/index.vue @@ -235,7 +235,8 @@ const formConfig = reactive({ userTel: [ { required: true, - message: "请输入手机号码", + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, + message: "请输入正确的手机号", trigger: "blur" } ], @@ -259,6 +260,13 @@ const formConfig = reactive({ message: "请选择角色", trigger: "blur" } + ], + email: [ + { + type: "email", + message: "请输入正确的邮箱", + trigger: "blur" + } ] } }); diff --git a/src/views/goverment/userManagement/userManage/index.vue b/src/views/goverment/userManagement/userManage/index.vue index 067dcaf..45c2b13 100644 --- a/src/views/goverment/userManagement/userManage/index.vue +++ b/src/views/goverment/userManagement/userManage/index.vue @@ -264,7 +264,8 @@ const formConfig = reactive({ userTel: [ { required: true, - message: "请输入手机号码", + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, + message: "请输入正确的手机号", trigger: "blur" } ], @@ -288,6 +289,13 @@ const formConfig = reactive({ message: "请选择角色", trigger: "blur" } + ], + email: [ + { + type: "email", + message: "请输入正确的邮箱", + trigger: "blur" + } ] } }); diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 68304e8..0176b9d 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -50,7 +50,7 @@ import { HOME_URL } from "@/enums/Home"; import { initDynamicRouter } from "@/routers/modules/dynamicRouter"; // import { CircleClose, UserFilled } from "@element-plus/icons-vue"; import type { ElForm } from "element-plus"; - +import Crypto from "@/utils/crypto"; const router = useRouter(); const tabsStore = TabsStore(); const keepAlive = KeepAliveStore(); @@ -73,8 +73,13 @@ const login = (formEl: FormInstance | undefined) => { loading.value = true; try { const arr = ref(["/government", "/home", "/home", "/home"]); + + let keyStr = "ZHGDzhdgJXJADMIN"; + let account = Crypto.encrypt(loginForm.account, keyStr); // 账号加密 + let password = Crypto.encrypt(loginForm.showPassword, keyStr); // 密码加密 // 1.执行登录接口 - const { result } = await loginApi({ ...loginForm, showPassword: loginForm.showPassword }); + const { result } = await loginApi({ account, showPassword: password }); + console.log(result); globalStore.setUserInfo(result); globalStore.setToken(result.token); diff --git a/src/views/project/userManagement/userManage/index.vue b/src/views/project/userManagement/userManage/index.vue index a3c06e8..2ac2092 100644 --- a/src/views/project/userManagement/userManage/index.vue +++ b/src/views/project/userManagement/userManage/index.vue @@ -235,7 +235,8 @@ const formConfig = reactive({ userTel: [ { required: true, - message: "请输入手机号码", + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, + message: "请输入正确的手机号", trigger: "blur" } ], @@ -259,6 +260,13 @@ const formConfig = reactive({ message: "请选择角色", trigger: "blur" } + ], + email: [ + { + type: "email", + message: "请输入正确的邮箱", + trigger: "blur" + } ] } });