Startseite Erkunden Hilfe
Registrieren Anmelden
Natural_p1
/
zjugis_OA
3
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

修改用户钉钉登录

chenjun vor 1 Jahr
Ursprung
f9bc677a37
Commit
28b19d6ab2
22 geänderte Dateien mit 339 neuen und 264 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 1 1
      client/.env
  2. 8 0
      client/index.html
  3. 1 1
      client/package.json
  4. 7 0
      client/src/api/bpm/task/index.ts
  5. 6 1
      client/src/api/login/index.ts
  6. 9 0
      client/src/api/login/types.ts
  7. 10 225
      client/src/router/modules/remaining.ts
  8. 0 6
      client/src/utils/constants.ts
  9. 4 1
      client/src/utils/routerHelper.ts
  10. 263 0
      client/src/views/Login/SocialLogin.vue
  11. 1 16
      client/src/views/Login/components/LoginForm.vue
  12. 1 1
      client/src/views/Profile/components/UserSocial.vue
  13. 3 0
      client/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
  14. 6 3
      client/src/views/bpm/processInstance/detail/index.vue
  15. 1 1
      client/src/views/member/user/detail/UserAccountInfo.vue
  16. 3 0
      client/src/views/member/user/detail/index.vue
  17. 2 0
      client/src/views/member/user/index.vue
  18. 5 0
      client/src/views/system/menu/index.vue
  19. 2 2
      zjugis-gateway/src/main/resources/bootstrap-local.yaml
  20. 2 2
      zjugis-module-infra/zjugis-module-infra-biz/src/main/resources/bootstrap-local.yaml
  21. 2 2
      zjugis-module-system/zjugis-module-system-biz/src/main/resources/application-local.yaml
  22. 2 2
      zjugis-module-system/zjugis-module-system-biz/src/main/resources/bootstrap-local.yaml

+ 1 - 1
client/.env
Datei anzeigen 

@@ -5,7 +5,7 @@ VITE_APP_TITLE=浙江万维OA管理系统
 
 VITE_PORT=80
 
 
 # open 运行 npm run dev 时自动打开浏览器
 
-VITE_OPEN=true
 
+VITE_OPEN=flase
 
 
 # 租户开关
 
 VITE_APP_TENANT_ENABLE=false

+ 8 - 0
client/index.html
Datei anzeigen 

@@ -5,6 +5,14 @@
 
     <link rel="icon" href="/favicon.ico" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <meta
 
+      name="keywords"
 
+      content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
 
+    />
 
+    <meta
 
+      name="description"
 
+      content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
 
+    />
 
     <title>%VITE_APP_TITLE%</title>
 
   </head>
 
   <body>

+ 1 - 1
client/package.json
Datei anzeigen 

@@ -1,5 +1,5 @@
 
 {
 
-  "name": "yudao-ui-admin-vue3",
 
+  "name": "zjugis-ui-admin-vue3",
 
   "version": "1.8.2-snapshot",
 
   "description": "基于vue3、vite4、element-plus、typesScript",
 
   "author": "xingyu",

+ 7 - 0
client/src/api/bpm/task/index.ts
Datei anzeigen 

@@ -51,3 +51,10 @@ export const getReturnList = async (params) => {
 
 export const returnTask = async (data) => {
 
   return await request.put({ url: '/bpm/task/return', data })
 
 }
 
+
 
+/**
 
+ * 委派
 
+ */
 
+export const delegateTask = async (data) => {
 
+  return await request.put({ url: '/bpm/task/delegate', data })
 
+}

+ 6 - 1
client/src/api/login/index.ts
Datei anzeigen 

@@ -1,6 +1,6 @@
 
 import request from '@/config/axios'
 
 import { getRefreshToken } from '@/utils/auth'
 
-import type { UserLoginVO } from './types'
 
+import type { UserLoginVO, UserSocialLoginVO } from './types'
 
 
 export interface SmsCodeVO {
 
   mobile: string
 
@@ -17,6 +17,11 @@ export const login = (data: UserLoginVO) => {
 
   return request.post({ url: '/system/auth/login', data })
 
 }
 
 
+// 社交登录
 
+export const socialLogin = (data: UserSocialLoginVO) => {
 
+  return request.post({ url: '/system/auth/social-login', data })
 
+}
 
+
 
 // 刷新访问令牌
 
 export const refreshToken = () => {
 
   return request.post({ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken() })

+ 9 - 0
client/src/api/login/types.ts
Datei anzeigen 

@@ -2,6 +2,15 @@ export type UserLoginVO = {
 
   username: string
 
   password: string
 
   captchaVerification: string
 
+  socialCode: string
 
+  socialState: string
 
+  socialType: number
 
+}
 
+
 
+export type UserSocialLoginVO = {
 
+  code: string
 
+  state: string
 
+  type: number
 
 }
 
 
 export type TokenType = {

+ 10 - 225
client/src/router/modules/remaining.ts
Datei anzeigen 

@@ -185,6 +185,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
 
       noTagsView: true
 
     }
 
   },
 
+  {
 
+    path: '/social-login',
 
+    component: () => import('@/views/Login/SocialLogin.vue'),
 
+    name: 'SocialLogin',
 
+    meta: {
 
+      hidden: true,
 
+      title: t('router.login'),
 
+      noTagsView: true
 
+    }
 
+  },
 
   {
 
     path: '/sso',
 
     component: () => import('@/views/Login/Login.vue'),
 
@@ -224,231 +234,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
 
       title: '500',
 
       noTagsView: true
 
     }
 
-  },
 
-  {
 
-    path: '/bpm',
 
-    component: Layout,
 
-    name: 'bpm',
 
-    meta: {
 
-      hidden: true
 
-    },
 
-    children: [
 
-      {
 
-        path: '/manager/form/edit',
 
-        component: () => import('@/views/bpm/form/editor/index.vue'),
 
-        name: 'BpmFormEditor',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '设计流程表单',
 
-          activeMenu: '/bpm/manager/form'
 
-        }
 
-      },
 
-      {
 
-        path: '/manager/model/edit',
 
-        component: () => import('@/views/bpm/model/editor/index.vue'),
 
-        name: 'BpmModelEditor',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '设计流程',
 
-          activeMenu: '/bpm/manager/model'
 
-        }
 
-      },
 
-      {
 
-        path: '/manager/definition',
 
-        component: () => import('@/views/bpm/definition/index.vue'),
 
-        name: 'BpmProcessDefinition',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '流程定义',
 
-          activeMenu: '/bpm/manager/model'
 
-        }
 
-      },
 
-      {
 
-        path: '/manager/task-assign-rule',
 
-        component: () => import('@/views/bpm/taskAssignRule/index.vue'),
 
-        name: 'BpmTaskAssignRuleList',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '任务分配规则'
 
-        }
 
-      },
 
-      {
 
-        path: '/process-instance/create',
 
-        component: () => import('@/views/bpm/processInstance/create/index.vue'),
 
-        name: 'BpmProcessInstanceCreate',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '发起流程',
 
-          activeMenu: 'bpm/processInstance/create'
 
-        }
 
-      },
 
-      {
 
-        path: '/process-instance/detail',
 
-        component: () => import('@/views/bpm/processInstance/detail/index.vue'),
 
-        name: 'BpmProcessInstanceDetail',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '流程详情',
 
-          activeMenu: 'bpm/processInstance/detail'
 
-        }
 
-      },
 
-      {
 
-        path: '/bpm/oa/leave/create',
 
-        component: () => import('@/views/bpm/oa/leave/create.vue'),
 
-        name: 'OALeaveCreate',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '发起 OA 请假',
 
-          activeMenu: '/bpm/oa/leave'
 
-        }
 
-      },
 
-      {
 
-        path: '/bpm/oa/leave/detail',
 
-        component: () => import('@/views/bpm/oa/leave/detail.vue'),
 
-        name: 'OALeaveDetail',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          title: '查看 OA 请假',
 
-          activeMenu: '/bpm/oa/leave'
 
-        }
 
-      }
 
-    ]
 
-  },
 
-  {
 
-    path: '/product',
 
-    component: Layout,
 
-    name: 'Product',
 
-    meta: {
 
-      hidden: true
 
-    },
 
-    children: [
 
-      {
 
-        path: 'spu/add',
 
-        component: () => import('@/views/mall/product/spu/form/index.vue'),
 
-        name: 'ProductSpuAdd',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          icon: 'ep:edit',
 
-          title: '添加商品',
 
-          activeMenu: '/product/product-spu'
 
-        }
 
-      },
 
-      {
 
-        path: 'spu/edit/:spuId(\\d+)',
 
-        component: () => import('@/views/mall/product/spu/form/index.vue'),
 
-        name: 'ProductSpuEdit',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          icon: 'ep:edit',
 
-          title: '编辑商品',
 
-          activeMenu: '/product/product-spu'
 
-        }
 
-      },
 
-      {
 
-        path: 'spu/detail/:spuId(\\d+)',
 
-        component: () => import('@/views/mall/product/spu/form/index.vue'),
 
-        name: 'ProductSpuDetail',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          icon: 'ep:view',
 
-          title: '商品详情',
 
-          activeMenu: '/product/product-spu'
 
-        }
 
-      },
 
-      {
 
-        path: 'property/value/:propertyId(\\d+)',
 
-        component: () => import('@/views/mall/product/property/value/index.vue'),
 
-        name: 'ProductPropertyValue',
 
-        meta: {
 
-          noCache: true,
 
-          hidden: true,
 
-          canTo: true,
 
-          icon: 'ep:view',
 
-          title: '商品属性值',
 
-          activeMenu: '/product/property'
 
-        }
 
-      }
 
-    ]
 
-  },
 
-  {
 
-    path: '/trade',
 
-    component: Layout,
 
-    name: 'Order',
 
-    meta: {
 
-      hidden: true
 
-    },
 
-    children: [
 
-      {
 
-        path: 'order/detail/:orderId(\\d+)',
 
-        component: () => import('@/views/mall/trade/order/detail/index.vue'),
 
-        name: 'TradeOrderDetail',
 
-        meta: { title: '订单详情', icon: '', activeMenu: '/trade/trade/order' }
 
-      },
 
-      {
 
-        path: 'after-sale/detail/:orderId(\\d+)',
 
-        component: () => import('@/views/mall/trade/afterSale/detail/index.vue'),
 
-        name: 'TradeAfterSaleDetail',
 
-        meta: { title: '退款详情', icon: '', activeMenu: '/trade/trade/after-sale' }
 
-      }
 
-    ]
 
-  },
 
-  {
 
-    path: '/member',
 
-    component: Layout,
 
-    name: 'member',
 
-    meta: { hidden: true },
 
-    children: [
 
-      {
 
-        path: 'user/detail/:id',
 
-        name: 'MemberUserDetail',
 
-        meta: {
 
-          title: '会员详情',
 
-          noCache: true,
 
-          hidden: true
 
-        },
 
-        component: () => import('@/views/member/user/detail/index.vue')
 
-      }
 
-    ]
 
-  },
 
-  {
 
-    path: '/pay',
 
-    component: Layout,
 
-    name: 'pay',
 
-    meta: { hidden: true },
 
-    children: [
 
-      {
 
-        path: 'cashier',
 
-        name: 'PayCashier',
 
-        meta: {
 
-          title: '收银台',
 
-          noCache: true,
 
-          hidden: true
 
-        },
 
-        component: () => import('@/views/pay/cashier/index.vue')
 
-      }
 
-    ]
 
   }
 
 ]

+ 0 - 6
client/src/utils/constants.ts
Datei anzeigen 

@@ -74,12 +74,6 @@ export const SystemUserSocialTypeEnum = {
 
     type: 20,
 
     source: 'dingtalk',
 
     img: 'https://s1.ax1x.com/2022/05/22/OzMDRs.png'
 
-  },
 
-  WECHAT_ENTERPRISE: {
 
-    title: '企业微信',
 
-    type: 30,
 
-    source: 'wechat_enterprise',
 
-    img: 'https://s1.ax1x.com/2022/05/22/OzMrzn.png'
 
   }
 
 }

+ 4 - 1
client/src/utils/routerHelper.ts
Datei anzeigen 

@@ -93,7 +93,10 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
 
       meta.alwaysShow = true
 
       const childrenData: AppRouteRecordRaw = {
 
         path: '',
 
-        name: toCamelCase(route.path, true),
 
+        name:
 
+          route.componentName && route.componentName.length > 0
 
+            ? route.componentName
 
+            : toCamelCase(route.path, true),
 
         redirect: route.redirect,
 
         meta: meta
 
       }

+ 263 - 0
client/src/views/Login/SocialLogin.vue
Datei anzeigen 

@@ -0,0 +1,263 @@
 
+<template>
 
+  <div class="container">
 
+    <div class="logo"></div>
 
+    <!-- 登录区域 -->
 
+    <div class="content">
 
+      <!-- 配图 -->
 
+      <div class="pic"></div>
 
+      <!-- 表单 -->
 
+      <div class="field">
 
+        <!-- [移动端]标题 -->
 
+        <h2 class="mobile-title">
 
+          <h3 class="title">浙江万维后台管理系统</h3>
 
+        </h2>
 
+
 
+        <!-- 表单 -->
 
+        <div class="form-cont">
 
+          <el-tabs class="form" v-model="loginData.isSocialLogin" style="float: none">
 
+            <el-tab-pane label="绑定账号" name="uname" />
 
+          </el-tabs>
 
+          <div>
 
+            <el-form
 
+              ref="formLogin"
 
+              :model="loginData.loginForm"
 
+              :rules="loginRules"
 
+              class="login-form"
 
+            >
 
+              <!-- 账号密码登录 -->
 
+              <el-form-item prop="username">
 
+                <el-input
 
+                  v-model="loginData.loginForm.username"
 
+                  :placeholder="t('login.usernamePlaceholder')"
 
+                  :prefix-icon="iconAvatar"
 
+                />
 
+              </el-form-item>
 
+              <el-form-item prop="password">
 
+                <el-input
 
+                  v-model="loginData.loginForm.password"
 
+                  :placeholder="t('login.passwordPlaceholder')"
 
+                  :prefix-icon="iconLock"
 
+                  show-password
 
+                  type="password"
 
+                  @keyup.enter="getCode()"
 
+                />
 
+              </el-form-item>
 
+              <!-- 下方的登录按钮 -->
 
+              <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
 
+                <el-form-item>
 
+                  <XButton
 
+                    :loading="loginLoading"
 
+                    :title="t('login.login')"
 
+                    class="w-[100%]"
 
+                    type="primary"
 
+                    @click="getCode()"
 
+                  />
 
+                </el-form-item>
 
+              </el-col>
 
+              <Verify
 
+                ref="verify"
 
+                :captchaType="captchaType"
 
+                :imgSize="{ width: '400px', height: '200px' }"
 
+                mode="pop"
 
+                @success="handleLogin"
 
+              />
 
+            </el-form>
 
+          </div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script lang="ts" setup>
 
+import { ElLoading } from 'element-plus'
 
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
 
+import { useRoute } from 'vue-router'
 
+
 
+import { useIcon } from '@/hooks/web/useIcon'
 
+
 
+import * as authUtil from '@/utils/auth'
 
+import { usePermissionStore } from '@/store/modules/permission'
 
+import * as LoginApi from '@/api/login'
 
+import { LoginStateEnum, useFormValid, useLoginState } from './components/useLogin'
 
+
 
+defineOptions({ name: 'SocialLogin' })
 
+
 
+const { t } = useI18n()
 
+const message = useMessage()
 
+const iconHouse = useIcon({ icon: 'ep:house' })
 
+const iconAvatar = useIcon({ icon: 'ep:avatar' })
 
+const iconLock = useIcon({ icon: 'ep:lock' })
 
+const formLogin = ref()
 
+const { validForm } = useFormValid(formLogin)
 
+const { setLoginState, getLoginState } = useLoginState()
 
+const { currentRoute, push } = useRouter()
 
+const permissionStore = usePermissionStore()
 
+const redirect = ref<string>('')
 
+const type = ref<number>('')
 
+const code = ref<string>('')
 
+const state = ref<string>('')
 
+const loginLoading = ref(false)
 
+const verify = ref()
 
+const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字
 
+
 
+const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
 
+
 
+const LoginRules = {
 
+  username: [required],
 
+  password: [required]
 
+}
 
+const loginData = reactive({
 
+  isShowPassword: false,
 
+  isSocialLogin: true,
 
+  captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
 
+  tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
 
+  loginForm: {
 
+    tenantName: '',
 
+    username: '',
 
+    password: '',
 
+    captchaVerification: ''
 
+  }
 
+})
 
+
 
+// 获取验证码
 
+const getCode = async () => {
 
+  // 情况一，未开启：则直接登录
 
+  if (loginData.captchaEnable === 'false') {
 
+    await handleLogin({})
 
+  } else {
 
+    // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
 
+    // 弹出验证码
 
+    verify.value.show()
 
+  }
 
+}
 
+// 记住我
 
+const getCookie = () => {
 
+  const loginForm = authUtil.getLoginForm()
 
+  if (loginForm) {
 
+    loginData.loginForm = {
 
+      ...loginData.loginForm,
 
+      username: loginForm.username ? loginForm.username : loginData.loginForm.username,
 
+      password: loginForm.password ? loginForm.password : loginData.loginForm.password,
 
+      rememberMe: loginForm.rememberMe ? true : false,
 
+      socialCode: code.value,
 
+      socialState: state.value,
 
+      socialType: type.value,
 
+      tenantName: loginForm.tenantName ? loginForm.tenantName : loginData.loginForm.tenantName
 
+    }
 
+  }
 
+}
 
+//获取租户ID
 
+const getTenantId = async () => {
 
+  if (loginData.tenantEnable === 'true') {
 
+    const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
 
+    authUtil.setTenantId(res)
 
+  }
 
+}
 
+const loading = ref() // ElLoading.service 返回的实例
 
+// 登录
 
+const handleLogin = async (params) => {
 
+  loginLoading.value = true
 
+  try {
 
+    debugger
 
+    await getTenantId()
 
+    const data = await validForm()
 
+    if (!data) {
 
+      return
 
+    }
 
+    loginData.loginForm.captchaVerification = params.captchaVerification
 
+    const res = await LoginApi.login(loginData.loginForm)
 
+    debugger
 
+    if (!res) {
 
+      return
 
+    }
 
+    loading.value = ElLoading.service({
 
+      lock: true,
 
+      text: '正在加载系统中...',
 
+      background: 'rgba(0, 0, 0, 0.7)'
 
+    })
 
+    if (loginData.loginForm.rememberMe) {
 
+      authUtil.setLoginForm(loginData.loginForm)
 
+    } else {
 
+      authUtil.removeLoginForm()
 
+    }
 
+    authUtil.setToken(res)
 
+    if (!redirect.value) {
 
+      redirect.value = '/'
 
+    }
 
+    // 判断是否为SSO登录
 
+    if (redirect.value.indexOf('sso') !== -1) {
 
+      window.location.href = window.location.href.replace('/login?redirect=', '')
 
+    } else {
 
+      push({ path: redirect.value || permissionStore.addRouters[0].path })
 
+    }
 
+  } finally {
 
+    debugger
 
+    loginLoading.value = false
 
+    loading.value.close()
 
+  }
 
+}
 
+const socialLoading = ref() // ElLoading.service 返回的实例
 
+// 社交登录
 
+const socialLogin = async () => {
 
+  const route = useRoute()
 
+  // 社交登录相关
 
+  type.value = route?.query?.type as number
 
+  code.value = route?.query?.code as string
 
+  state.value = route?.query?.state as string
 
+  if (!type.value) {
 
+    type.value = 20
 
+  }
 
+  // 尝试登录一下
 
+  loginLoading.value = true
 
+  try {
 
+    const res = await LoginApi.socialLogin({
 
+      type: type.value,
 
+      code: code.value,
 
+      state: state.value
 
+    })
 
+    if (!res) {
 
+      return
 
+    }
 
+    socialLoading.value = ElLoading.service({
 
+      lock: true,
 
+      text: '正在加载系统中...',
 
+      background: 'rgba(0, 0, 0, 0.7)'
 
+    })
 
+    authUtil.setToken(res)
 
+    if (!redirect.value) {
 
+      redirect.value = '/'
 
+    }
 
+    // 判断是否为SSO登录
 
+    if (redirect.value.indexOf('sso') !== -1) {
 
+      window.location.href = window.location.href.replace('/login?redirect=', '')
 
+    } else {
 
+      push({ path: redirect.value || permissionStore.addRouters[0].path })
 
+    }
 
+  } finally {
 
+    loginLoading.value = false
 
+    socialLoading.value.close()
 
+  }
 
+}
 
+watch(
 
+  () => currentRoute.value,
 
+  (route: RouteLocationNormalizedLoaded) => {
 
+    redirect.value = route?.query?.redirect as string
 
+  },
 
+  {
 
+    immediate: true
 
+  }
 
+)
 
+onMounted(() => {
 
+  getCookie()
 
+  socialLogin()
 
+})
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+:deep(.anticon) {
 
+  &:hover {
 
+    color: var(--el-color-primary) !important;
 
+  }
 
+}
 
+</style>

+ 1 - 16
client/src/views/Login/components/LoginForm.vue
Datei anzeigen 

@@ -125,21 +125,6 @@
 
           </div>
 
         </el-form-item>
 
       </el-col>
 
-      <el-divider content-position="center">萌新必读</el-divider>
 
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
 
-        <el-form-item>
 
-          <div class="w-[100%] flex justify-between">
 
-            <el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
 
-            <el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>
 
-            <el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">
 
-              ⚡面试手册
 
-            </el-link>
 
-            <el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank">
 
-              🤝外包咨询
 
-            </el-link>
 
-          </div>
 
-        </el-form-item>
 
-      </el-col>
 
     </el-row>
 
   </el-form>
 
 </template>
 
@@ -284,7 +269,7 @@ const doSocialLogin = async (type: number) => {
 
       })
 
     }
 
     // 计算 redirectUri
 
-    const redirectUri =
 
+    let redirectUri =
 
       location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
 
     // 进行跳转
 
     const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri))

+ 1 - 1
client/src/views/Profile/components/UserSocial.vue
Datei anzeigen 

@@ -51,7 +51,7 @@ const initSocial = async () => {
 
 const route = useRoute()
 
 const bindSocial = () => {
 
   // 社交绑定
 
-  const type = route.query.type
 
+  const type = 20
 
   const code = route.query.code
 
   const state = route.query.state
 
   if (!code) {

+ 3 - 0
client/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
Datei anzeigen 

@@ -92,6 +92,9 @@ const getTimelineItemType = (item) => {
 
   if (item.result === 5) {
 
     return 'warning'
 
   }
 
+  if (item.result === 6) {
 
+    return 'default'
 
+  }
 
   return ''
 
 }
 
 </script>

+ 6 - 3
client/src/views/bpm/processInstance/detail/index.vue
Datei anzeigen 

@@ -93,6 +93,8 @@
 
     <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
 
     <!-- 弹窗，回退节点 -->
 
     <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail" />
 
+    <!-- 委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
 
+    <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
 
   </ContentWrap>
 
 </template>
 
 <script lang="ts" setup>
 
@@ -106,6 +108,7 @@ import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
 
 import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
 
 import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
 
 import TaskReturnDialog from './TaskReturnDialogForm.vue'
 
+import TaskDelegateForm from './taskDelegateForm.vue'
 
 import { registerComponent } from '@/utils/routerHelper'
 
 
 defineOptions({ name: 'BpmProcessInstanceDetail' })
 
@@ -169,10 +172,10 @@ const openTaskUpdateAssigneeForm = (id: string) => {
 
   taskUpdateAssigneeFormRef.value.open(id)
 
 }
 
 
+const taskDelegateForm = ref()
 
 /** 处理审批退回的操作 */
 
 const handleDelegate = async (task) => {
 
-  message.error('暂不支持【委派】功能，可以使用【转派】替代！')
 
-  console.log(task)
 
+  taskDelegateForm.value.open(task.id)
 
 }
 
 
 //回退弹框组件
 
@@ -260,7 +263,7 @@ const getTaskList = async () => {
 
     auditForms.value = []
 
     tasks.value.forEach((task) => {
 
       // 2.1 只有待处理才需要
 
-      if (task.result !== 1) {
 
+      if (task.result !== 1 && task.result !== 6) {
 
         return
 
       }
 
       // 2.2 自己不是处理人

+ 1 - 1
client/src/views/member/user/detail/UserAccountInfo.vue
Datei anzeigen 

@@ -24,7 +24,7 @@
 
       </template>
 
       {{ user.totalPoint || 0 }}
 
     </el-descriptions-item>
 
-    <!-- TODO 芋艿：后续接入余额、支付金额 -->
 
+    <!-- TODO @疯狂：从 wallet 读取下对应字段 -->
 
     <el-descriptions-item>
 
       <template #label>
 
         <descriptions-item-label label=" 当前余额 " icon="svg-icon:member_balance" />

+ 3 - 0
client/src/views/member/user/detail/index.vue
Datei anzeigen 

@@ -39,6 +39,7 @@
 
           <el-tab-pane label="成长值" name="experience" lazy>
 
             <UserExperienceRecordList :user-id="id"
 
           /></el-tab-pane>
 
+          <!-- TODO @jason：增加一个余额变化； -->
 
           <el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
 
           <el-tab-pane label="收货地址" name="address" lazy>
 
             <UserAddressList :user-id="id" />
 
@@ -48,7 +49,9 @@
 
           </el-tab-pane>
 
           <el-tab-pane label="售后管理" name="fourth">售后管理(WIP)</el-tab-pane>
 
           <el-tab-pane label="收藏记录" name="fourth">收藏记录(WIP)</el-tab-pane>
 
+          <!-- TODO @疯狂：优惠劵的读取 -->
 
           <el-tab-pane label="优惠劵" name="fourth">优惠劵(WIP)</el-tab-pane>
 
+          <!-- TODO @疯狂：增加获得分校用户；直接查询出所有；需要体现出是一级还是二级；用户编号、昵称、级别、绑定时间 -->
 
         </el-tabs>
 
       </el-card>
 
     </el-row>

+ 2 - 0
client/src/views/member/user/index.vue
Datei anzeigen 

@@ -128,6 +128,8 @@
 
           >
 
             编辑
 
           </el-button>
 
+          <!-- todo @jason：增加一个【修改余额】 -->
 
+          <!-- todo @疯狂：增加一个【修改积分】，表单是：radio 增加/减少；input 具体的变化积分 -->
 
           <!-- todo 放到更多菜单中 -->
 
           <el-button
 
             link

+ 5 - 0
client/src/views/system/menu/index.vue
Datei anzeigen 

@@ -151,6 +151,11 @@ const getList = async () => {
 
   loading.value = true
 
   try {
 
     const data = await MenuApi.getMenuList(queryParams)
 
+    data.forEach((menu) => {
 
+      if (!menu.icon) {
 
+        menu.icon = ''
 
+      }
 
+    })
 
     list.value = handleTree(data)
 
   } finally {
 
     loading.value = false

+ 2 - 2
zjugis-gateway/src/main/resources/bootstrap-local.yaml
Datei anzeigen 

@@ -5,7 +5,7 @@ spring:
 
     nacos:
 
       server-addr: 127.0.0.1:8848
 
       discovery:
 
-        namespace: dev # 命名空间。这里使用 dev 开发环境
 
+        namespace: c357abdf-1ef1-4c4c-960c-5f7baaa2c1b9 # 命名空间。这里使用 dev 开发环境
 
 
 --- #################### 配置中心相关配置 ####################
 
 
@@ -15,7 +15,7 @@ spring:
 
       # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类
 
       config:
 
         server-addr: 127.0.0.1:8848 # Nacos 服务器地址
 
-        namespace: dev # 命名空间。这里使用 dev 开发环境
 
+        namespace: c357abdf-1ef1-4c4c-960c-5f7baaa2c1b9 # 命名空间。这里使用 dev 开发环境
 
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
         name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name
 
         file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties

+ 2 - 2
zjugis-module-infra/zjugis-module-infra-biz/src/main/resources/bootstrap-local.yaml
Datei anzeigen 

@@ -5,7 +5,7 @@ spring:
 
     nacos:
 
       server-addr: 127.0.0.1:8848
 
       discovery:
 
-        namespace: dev # 命名空间。这里使用 dev 开发环境
 
+        namespace: c357abdf-1ef1-4c4c-960c-5f7baaa2c1b9 # 命名空间。这里使用 dev 开发环境
 
         metadata:
 
           version: 1.0.0 # 服务实例的版本号，可用于灰度发布
 
 
@@ -17,7 +17,7 @@ spring:
 
       # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类
 
       config:
 
         server-addr: 127.0.0.1:8848 # Nacos 服务器地址
 
-        namespace: dev # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境
 
+        namespace: c357abdf-1ef1-4c4c-960c-5f7baaa2c1b9 # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境
 
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
         name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name
 
         file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties

+ 2 - 2
zjugis-module-system/zjugis-module-system-biz/src/main/resources/application-local.yaml
Datei anzeigen 

@@ -162,8 +162,8 @@ justauth:
 
   enabled: true
 
   type:
 
     DINGTALK: # 钉钉
 
-      client-id: dingvrnreaje3yqvzhxg
 
-      client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI
 
+      client-id: dingk0ggukejc4xacgku
 
+      client-secret: 1Irqm3obWLCWTokhrCgbrcMIX7klSI3s_ljiBZrAzMfnpttJTUJHIBCi8C-2rD2O
 
       ignore-check-redirect-uri: true
 
     WECHAT_ENTERPRISE: # 企业微信
 
       client-id: wwd411c69a39ad2e54

+ 2 - 2
zjugis-module-system/zjugis-module-system-biz/src/main/resources/bootstrap-local.yaml
Datei anzeigen 

@@ -5,7 +5,7 @@ spring:
 
     nacos:
 
       server-addr: 127.0.0.1:8848
 
       discovery:
 
-        namespace: dev # 命名空间。这里使用 dev 开发环境
 
+        namespace: c357abdf-1ef1-4c4c-960c-5f7baaa2c1b9 # 命名空间。这里使用 dev 开发环境
 
         metadata:
 
           version: 1.0.0 # 服务实例的版本号，可用于灰度发布
 
 
@@ -17,7 +17,7 @@ spring:
 
       # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类
 
       config:
 
         server-addr: 127.0.0.1:8848 # Nacos 服务器地址
 
-        namespace: dev # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境
 
+        namespace: c357abdf-1ef1-4c4c-960c-5f7baaa2c1b9 # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境
 
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
         name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name
 
         file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties