更新登录

src/api/user.ts

@@ -5,7 +5,7 @@ import request from '@/utils/request';
  * @param prams 登录参数
  */
 export const userLogin = (params: any) => {
-  return request.post('/api-oauth/userlogin', {
+  return request.post('/edu-oauth/userlogin', {
     requestType: 'form',
     data: params
   });
@@ -16,7 +16,5 @@ export const userLogin = (params: any) => {
  * returns user
  */
 export const getUserInfo = () => {
-  return request.get('/api-oauth/user/getUserInfo', {
-    requestType: 'form'
-  });
+  return request.get('/edu-app/user/getUserInfo');
 };

src/store/modules/users.ts

@@ -47,6 +47,9 @@ export const useUserStore = defineStore('user-store', {
     setAvatar(avatar: string) {
       this.avatar = avatar;
     },
+    setUsername(username: string) {
+      this.username = username;
+    },
     setUserInfo(info: any) {
       this.info = info;
     },
@@ -55,10 +58,7 @@ export const useUserStore = defineStore('user-store', {
       try {
         const { data } = await userLogin(userInfo);
         console.log(data, 'data');
-        const userToken =
-          data.authentication.token_type +
-          ' ' +
-          data.authentication.access_token;
+        const userToken = data.token_type + ' ' + data.access_token;
         const ex = 7 * 24 * 60 * 60 * 1000;
         storage.set(ACCESS_TOKEN, userToken, ex);
         // storage.get(IM_TOKEN, data.imToken);
@@ -73,25 +73,18 @@ export const useUserStore = defineStore('user-store', {
 
     // 获取用户信息
     async getInfo() {
-      // const that = this;
       return new Promise((resolve, reject) => {
-        //   .then(res => {
-        //     const result = res.data;
-        //     this..setUserInfo(result);
-        //     that.setAvatar(result.account.avatar);
-        //     resolve(res);
-        //   })
-        //   .catch(error => {
-        //     reject(error);
-        //   });
-        try {
-          // getUserInfo().then((res: any) => {
-          //   console.log(res, 'res');
-          // });
-          resolve(true);
-        } catch {
-          reject();
-        }
+        getUserInfo()
+          .then((res: any) => {
+            const result = res.data;
+            this.setUserInfo(result);
+            this.setAvatar(result.account.avatar);
+            this.setUsername(result.nickname);
+            resolve(true);
+          })
+          .catch((error: any) => {
+            reject(error);
+          });
       });
     },
 

src/views/login/components/pwdLogin.tsx

@@ -42,7 +42,7 @@ export default defineComponent({
     const userStore = useUserStore();
     const formInline = reactive({
       username: '15907121013',
-      password: 'ktyq123456',
+      password: 'ktyq1013',
       isCaptcha: true
     });
 
@@ -55,17 +55,16 @@ export default defineComponent({
           const params: FormState = {
             username,
             password,
-            loginType: 'password',
-            grant_type: 'password',
-            client_id: 'colexiu-teacher',
-            client_secret: 'colexiu-teacher'
+            loginType: 'PASSWORD',
+            grant_type: 'PASSWORD',
+            client_id: 'cooleshow-teacher',
+            client_secret: 'cooleshow-teacher'
           };
 
           try {
             await userStore.login(params);
             // return;
             message.destroyAll();
-            // if (some.code == ResultEnum.SUCCESS) {
             //  判断是否勾选自动登录
             if (autoLogin.value) {
               storage.set('userInfo', JSON.stringify(formInline));
@@ -80,9 +79,6 @@ export default defineComponent({
             if (route.name === LOGIN_NAME) {
               router.replace('/');
             } else router.replace(toPath);
-            // } else {
-            //   // message.info(some.msg || "登录失败");
-            // }
           } catch (e: any) {
             console.log(e, 'e');
           } finally {

vite.config.ts

@@ -41,7 +41,11 @@ export default defineConfig({
     cors: true,
     https: false,
     proxy: {
-      '/api-oauth': {
+      '/edu-oauth': {
+        target: proxyUrl,
+        changeOrigin: true
+      },
+      '/edu-app': {
         target: proxyUrl,
         changeOrigin: true
       }