From 5436219bcdaf9c6b48ae46d6b0b5f6b2831026e5 Mon Sep 17 00:00:00 2001
From: wangxingyuan <2944009893@qq.com>
Date: Thu, 6 Feb 2025 17:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production     |  5 ++++-
 package.json        |  1 +
 src/api/login.js    | 29 ++++++++++++++++-------------
 src/views/login.vue | 12 ++++++++----
 vite.config.js      |  3 ++-
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/.env.production b/.env.production
index cbabf89..413d17d 100644
--- a/.env.production
+++ b/.env.production
@@ -8,4 +8,7 @@ VITE_APP_ENV = 'production'
 VITE_APP_BASE_API = '/prod-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
\ No newline at end of file
+VITE_BUILD_COMPRESS = gzip
+
+# dliip/开发环境
+VUE_APP_BASE_API = '/api'
\ No newline at end of file
diff --git a/package.json b/package.json
index 93902b1..c8e326b 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "js-cookie": "3.0.1",
+    "js-md5": "^0.8.3",
     "jsencrypt": "3.3.1",
     "nprogress": "0.2.0",
     "pinia": "2.0.22",
diff --git a/src/api/login.js b/src/api/login.js
index 649f59c..3bc6456 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,26 +2,21 @@ import request from '@/utils/request'
 
 // 登录方法
 export function login(username, password, code, uuid) {
-  const data = {
-    username,
-    password,
-    code,
-    uuid
-  }
+  console.log('login', username, password, code, uuid)
   return request({
-    url: '/login',
+    url: '/auth/login',
     headers: {
       isToken: false
     },
     method: 'post',
-    data: data
+    data: { username, password, code, uuid }
   })
 }
 
 // 注册方法
 export function register(data) {
   return request({
-    url: '/register',
+    url: '/auth/register',
     headers: {
       isToken: false
     },
@@ -30,10 +25,18 @@ export function register(data) {
   })
 }
 
+// 刷新方法
+export function refreshToken() {
+  return request({
+    url: '/auth/refresh',
+    method: 'post'
+  })
+}
+
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: '/getInfo',
+    url: '/system/user/getInfo',
     method: 'get'
   })
 }
@@ -41,7 +44,7 @@ export function getInfo() {
 // 退出方法
 export function logout() {
   return request({
-    url: '/logout',
+    url: '/auth/logout',
     method: 'post'
   })
 }
@@ -49,11 +52,11 @@ export function logout() {
 // 获取验证码
 export function getCodeImg() {
   return request({
-    url: '/captchaImage',
+    url: '/code',
     headers: {
       isToken: false
     },
     method: 'get',
     timeout: 20000
   })
-}
\ No newline at end of file
+}
diff --git a/src/views/login.vue b/src/views/login.vue
index 8ee853b..a8184b8 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -25,7 +25,7 @@
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
+      <!-- <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           size="large"
@@ -39,7 +39,7 @@
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
@@ -69,6 +69,7 @@ import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user'
+// import md5 from 'js-md5';
 
 const userStore = useUserStore()
 const router = useRouter();
@@ -76,7 +77,7 @@ const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
   username: "admin",
-  password: "admin123",
+  password: "admin@123",
   rememberMe: false,
   code: "",
   uuid: ""
@@ -85,7 +86,7 @@ const loginForm = ref({
 const loginRules = {
   username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
   password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
-  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+  // code: [{ required: true, trigger: "change", message: "请输入验证码" }]
 };
 
 const codeUrl = ref("");
@@ -111,6 +112,9 @@ function handleLogin() {
         Cookies.remove("password");
         Cookies.remove("rememberMe");
       }
+      // loginForm.value.password = md5(loginForm.value.password);
+      console.log(loginForm.value,1111);
+      // return
       // 调用action的登录方法
       userStore.login(loginForm.value).then(() => {
         router.push({ path: redirect.value || "/" });
diff --git a/vite.config.js b/vite.config.js
index 2b6f847..9f4192c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -31,7 +31,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://localhost:8080',
+          // target: 'http://localhost:8080',
+          target: `http://192.168.1.116:18888`,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }