zhanghua
2 天以前 fc0646f5a7d8ff66470fc3228ac7cff24497d54c
添加蓉政通登陆接口
8个文件已修改
143 ■■■■■ 已修改文件
src/api/system/user/index.ts 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/permission.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.ts 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/auth.ts 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.ts 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dingdingLogin copy.vue 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dingdingLogin.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/oss/index.vue 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/user/index.ts
@@ -202,6 +202,14 @@
    params: data
  })
}
export const rztLogin=(data: any ): AxiosPromise<String> => {
  return request({
    url: '/auth/rztLogin',
    method: 'get',
    params: data
  })
}
export default {
  listUser,
  getUser,
src/permission.ts
@@ -12,7 +12,7 @@
import { fa } from 'element-plus/es/locale';
NProgress.configure({ showSpinner: false });
const whiteList = ['/login', '/register', '/social-callback'];
const whiteList = ['/login', '/register', '/social-callback', '/rzt_login'];
router.beforeEach(async (to, from, next) => {
  NProgress.start();
@@ -22,7 +22,7 @@
    to.meta.title && useSettingsStore().setTitle(to.meta.title as string);
    /* has token*/
    if (to.path === '/login') {
    if (to.path === '/login' || to.path === '/rzt_login') {
      next({ path: '/' });
      NProgress.done();
    } else {
src/router/index.ts
@@ -44,10 +44,16 @@
  },
  {
    path: '/login',
    // component: () => import('@/views/rztLogin.vue'),
    component: () => import('@/views/dingdingLogin.vue'),
    hidden: true
  },
  {
    path: '/rzt_login',
    component: () => import('@/views/rztLogin.vue'),
    hidden: true
  },
  {
    path: '/dingdingLogin',
    component: () => import('@/views/dingdingLogin.vue'),
    hidden: true
src/utils/auth.ts
@@ -1,9 +1,18 @@
const TokenKey = 'Admin-Token';
const PlatKey = 'Admin-Plat';
const tokenStorage = useStorage<null | string>(TokenKey, null);
const platStorage = useStorage<null | string>(PlatKey, null);
export const getToken = () => tokenStorage.value;
export const setToken = (access_token: string) => (tokenStorage.value = access_token);
export const removeToken = () => (tokenStorage.value = null);
export const getPlat = () => platStorage.value;
export const setPlat = (access_plat: string) => (platStorage.value = access_plat);
export const removePlat = () => (platStorage.value = null);
src/utils/request.ts
@@ -1,6 +1,6 @@
import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
import { useUserStore } from '@/store/modules/user';
import { getToken } from '@/utils/auth';
import { getToken, getPlat } from '@/utils/auth';
import { tansParams, blobValidate } from '@/utils/ruoyi';
import cache from '@/plugins/cache';
import { HttpStatus } from '@/enums/RespEnum';
@@ -12,6 +12,7 @@
import { encrypt } from '@/utils/jsencrypt';
import router from "@/router";
import { ElLoading, ElMessage, ElNotification } from "element-plus";
import { el } from 'element-plus/es/locale';
let downloadLoadingInstance: LoadingInstance;
// 是否显示重新登录
@@ -115,7 +116,10 @@
      await userStore.logout()
      console.log(code, 'code==============');
      if (getPlat() === 'dingding')
      await router.push({ path: '/login' });
      else
        await router.push({ path: '/rzt_login' });
      return
    } else if (code === HttpStatus.SERVER_ERROR) {
      console.log(msg);
src/views/dingdingLogin copy.vue
@@ -19,40 +19,40 @@
};
onMounted(() => {
  const route = useRoute();
  let code = route.query.code;
  let code = route.query.code as string;
  if (code) {
    getUserDate(code);
  } else {
    // STEP3:在需要的时候,调用 window.DTFrameLogin 方法构造登录二维码,并处理登录成功或失败的回调。
    window.DTFrameLogin(
      {
        id: 'self_defined_element',
        width: 300,
        height: 300
      },
      {
        redirect_uri: encodeURIComponent('https://f060-183-223-248-101.ngrok-free.app/auth/dingdingLogin'),
        client_id: 'dingl5dxahaj3uzfug66',
        scope: 'openid',
        response_type: 'code',
        state: 'STATE',
        prompt: 'consent'
      },
      (loginResult: any) => {
        console.log('loginResult:' + loginResult);
    // window.DTFrameLogin(
    //   {
    //     id: 'self_defined_element',
    //     width: 300,
    //     height: 300
    //   },
    //   {
    //     redirect_uri: encodeURIComponent('https://f060-183-223-248-101.ngrok-free.app/auth/dingdingLogin'),
    //     client_id: 'dingl5dxahaj3uzfug66',
    //     scope: 'openid',
    //     response_type: 'code',
    //     state: 'STATE',
    //     prompt: 'consent'
    //   },
    //   (loginResult: any) => {
    //     console.log('loginResult:' + loginResult);
        debugger;
        const { redirectUrl, authCode, state } = loginResult;
        // 这里可以直接进行重定向
        window.location.href = redirectUrl;
        // 也可以在不跳转页面的情况下,使用code进行授权
        console.log(authCode);
      },
      (errorMsg: any) => {
        // 这里一般需要展示登录失败的具体原因,可以使用toast等轻提示
        console.error(`errorMsg of errorCbk: ${errorMsg}`);
      }
    );
    //     debugger;
    //     const { redirectUrl, authCode, state } = loginResult;
    //     // 这里可以直接进行重定向
    //     window.location.href = redirectUrl;
    //     // 也可以在不跳转页面的情况下,使用code进行授权
    //     console.log(authCode);
    //   },
    //   (errorMsg: any) => {
    //     // 这里一般需要展示登录失败的具体原因,可以使用toast等轻提示
    //     console.error(`errorMsg of errorCbk: ${errorMsg}`);
    //   }
    // );
  }
});
</script>
src/views/dingdingLogin.vue
@@ -9,7 +9,7 @@
<script setup name="Oss" lang="ts">
import { useRoute } from 'vue-router';
import { dingdingLogin } from '@/api/system/user';
import { setToken } from '@/utils/auth';
import { setToken,setPlat } from '@/utils/auth';
import { ElMessage } from 'element-plus';
import { any } from 'vue-types';
@@ -39,6 +39,7 @@
    });
};
onMounted(() => {
  setPlat('dingding');
  const router = useRoute();
  let code = router.query.code;
  let authCode = router.query.authCode;
src/views/system/oss/index.vue
@@ -1,12 +1,14 @@
<template>
  <div class="p-2">
    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
      :leave-active-class="proxy?.animate.searchAnimate.leave">
      <div class="mb-[10px]" v-show="showSearch">
        <el-card shadow="hover">
          <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
            <el-form-item label="原名" prop="originalName">
              <el-input v-model="queryParams.originalName" placeholder="请输入原名" clearable style="width: 200px" @keyup.enter="handleQuery" />
              <el-input v-model="queryParams.originalName" placeholder="请输入原名" clearable style="width: 200px"
                @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item>
@@ -33,14 +35,8 @@
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
      </template>
      <el-table
        v-loading="loading"
        :data="ossList"
        @selection-change="handleSelectionChange"
        :header-cell-class-name="handleHeaderClass"
        @header-click="handleHeaderCLick"
        v-if="showTable"
      >
      <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange"
        :header-cell-class-name="handleHeaderClass" @header-click="handleHeaderCLick" v-if="showTable">
        <el-table-column type="index"  />
        <!--        <el-table-column type="selection" width="55" align="center" />-->
        <el-table-column label="原名" align="center" prop="originalName" />
@@ -48,25 +44,30 @@
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <el-tooltip content="查看提取码" placement="top">
              <el-button link type="primary" icon="Search" @click="handleCode(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:view')"></el-button>
              <el-button link type="primary" icon="Search" @click="handleCode(scope.row)"
                v-if="isContains(useUserStore().permissions, 'system:oss:view')"></el-button>
            </el-tooltip>
            <el-tooltip content="下载" placement="top">
              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:download')"></el-button>
              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)"
                v-if="isContains(useUserStore().permissions, 'system:oss:download')"></el-button>
            </el-tooltip>
            <el-tooltip content="删除" placement="top">
              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:remove')"></el-button>
              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
                v-if="isContains(useUserStore().permissions, 'system:oss:remove')"></el-button>
            </el-tooltip>
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
        v-model:limit="queryParams.pageSize" @pagination="getList" />
    </el-card>
    <!-- 添加或修改OSS对象存储对话框 -->
    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
      <el-form ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="文件名">
          <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" @openPopup="lookPawsd($event)"  v-model="form.file"  v-if="type === 0" />
          <fileUpload ref="childFile" @closePopup="getList(); lookPawsd($event)" @openPopup="lookPawsd($event)"
            v-model="form.file" v-if="type === 0" />
          <imageUpload v-model="form.file" v-if="type === 1" />
          <video-upload v-model="form.file" v-if="type === 2" />
        </el-form-item>
@@ -83,14 +84,18 @@
        <p style="color: red; font-size: 20px">提取码将会在24小时后失效请尽快下载!</p>
        <span v-show="titleDownload=='查看提取码'" style="font-size: 80px;">{{testtxt}}</span>
      </div>
      <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload=='输入提取码'"  v-model="pasTxt" v-if="isContains(useUserStore().permissions, 'system:oss:download')" placeholder="请输入文件提取码"></el-input>
      <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload=='请输入提取码'"  v-model="pasTxt"  placeholder="请输入文件提取码"></el-input>
      <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload == '输入提取码'" v-model="pasTxt"
        v-if="isContains(useUserStore().permissions, 'system:oss:download')" placeholder="请输入文件提取码"></el-input>
      <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload == '请输入提取码'"
        v-model="pasTxt" placeholder="请输入文件提取码"></el-input>
      <!--      <el-button link type="primary"   v-show="titleDownload=='输入提取码'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">下载</el-button>-->
      <!--      <el-button link type="primary"   v-show="titleDownload=='请输入提取码'"  icon="Delete" @click="delFile()" >删除</el-button>-->
      <template #footer>
        <div class="dialog-footer">
          <el-button link type="primary"   v-show="titleDownload=='输入提取码'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">下载</el-button>
          <el-button link type="primary"   v-show="titleDownload=='请输入提取码'"  icon="Delete" @click="delFile()" >删除</el-button>
          <el-button link type="primary" v-show="titleDownload == '输入提取码'" icon="Download" @click="handleDownloadFile()"
            v-if="isContains(useUserStore().permissions, 'system:oss:download')">下载</el-button>
          <el-button link type="primary" v-show="titleDownload == '请输入提取码'" icon="Delete"
            @click="delFile()">删除</el-button>
          <!--          <el-button  type="primary" @click="visibleCode = false">确 定</el-button>-->
          <el-button @click="visibleCode = false">取 消</el-button>
        </div>
@@ -104,7 +109,7 @@
import { OssForm, OssQuery, OssVO } from "@/api/system/oss/types";
import { to as tos } from "await-to-js";
import useUserStore from "@/store/modules/user";
import { getToken, setToken } from "@/utils/auth";
import { getToken, setToken, getPlat } from "@/utils/auth";
import usePermissionStore from "@/store/modules/permission";
import { isHttp } from "@/utils/validate";
import router from '@/router';
@@ -441,8 +446,10 @@
    await getList();
  }else {
    console.log('无token');
    if (getPlat() == 'dingding')
    router.push('/login')
    else
      router.push('/rzt_login')
  }
  // 调用 getList() 方法