yuang-framework-ui-common 1.0.69 → 1.0.71

package/lib/config/httpConfig.ts

@@ -99,7 +99,7 @@ http.interceptors.response.use(async (res: any) => {
         } else if (res?.data?.statusCode === 500815006) {
             // 这里存疑： 返回500815004 的时候获取router为null
             const fullPath = router.currentRoute.value.fullPath;
-            router.push(`/sso/auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
+            router.push(`/sso/sso-auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
         } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);

package/lib/hooks/framework/frameworkGroup.ts

@@ -1,61 +1,3 @@
-import { http } from '../../../lib/config/httpConfig';
-import { application } from '../../../lib/config/applicationConfig';
 
-import { getShortUuid } from '../../../lib/utils/uuidUtils';
 
-const initFrameworkGroup = ({ frameworkGroupCode }) => {
-  return new Promise((resolve) => {
-    // prettier-ignore
-    http.post(`${application.gatewayServerBaseUrl}/uims-api/core/framework-group/selectPage`, { codeForEqual: frameworkGroupCode }).then((res) => {
-      if (res.data.data.records.length == 0) {
-        const formData = {
-          id: '',
-          name: '全部分组',
-          code: frameworkGroupCode,
-          parentId: ''
-        };
-        http
-          .post('/uims-api/core/framework-group/insertInfo', formData)
-          .then((res) => {
-            formData.id = res.data.data.id;
-            resolve(formData);
-          })
-          .catch(() => {
-            //
-          });
-      } else {
-        resolve(res.data.data.records[0]);
-      }
-    }).catch(() => {
-      //
-    });
-  });
-};
-
-const saveFrameworkGroup = ({ isAddForm, editForm }) => {
-  return new Promise((resolve, reject) => {
-    editForm.code = editForm.code || getShortUuid();
-    // prettier-ignore
-    http.post(`/uims-api/core/framework-group/${isAddForm ? 'insertInfo' : 'updateInfo'}`, editForm).then((res) => {
-      if (!editForm.id) {
-        editForm.id = res.data.data.id;
-      }
-      resolve({ group: editForm });
-    }).catch(() => {
-      reject();
-    });
-  });
-};
-const deleteFrameworkGroup = ({ editForm }) => {
-  return new Promise((resolve, reject) => {
-    // prettier-ignore
-    http.get(`/uims-api/core/framework-group/deleteInfo`, { params: { id: editForm.id } }).then((res) => {
-      res;
-      resolve({ group: editForm });
-    }).catch(() => {
-      reject();
-    });
-  });
-};
-
-export { initFrameworkGroup, saveFrameworkGroup, deleteFrameworkGroup };
+export {   };

package/lib/hooks/framework/frameworkSseClient.ts

@@ -51,6 +51,14 @@ export class FrameworkSseClient {
     try {
       this.eventSource = new EventSource(this.url);
 
+      // 监听服务端发送的 clientId 事件
+      this.eventSource.addEventListener('clientId', (event) => {
+        const clientId = event.data;
+        console.log('My clientId:', clientId);
+        // 保存到 localStorage 或内存中，用于后续业务请求
+        localStorage.setItem('sseClientId', clientId);
+      });
+
       // 处理消息事件
       this.eventSource.onmessage = (event) => {
         this.messageHandler(event.data, event);

package/lib/interface/sso/ssoUserTrace.ts

@@ -0,0 +1,38 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * sso用户踪迹
+ */
+export interface SsoUserTrace extends FrameworkBase {
+    account?: string;
+    status?: number;
+
+    loginTime?: Date;
+    logoutTime?: Date;
+
+    authCode?: string;
+    authCodeCreateTime?: Date;
+    authCodeExpireTime?: Date;
+
+    accessToken?: string;
+    accessTokenCreateTime?: Date;
+    accessTokenExpireTime?: Date;
+
+
+    refreshToken?: string;
+    refreshTokenCreateTime?: Date;
+    refreshTokenExpireTime?: Date;
+
+    tgt?: string;
+    tgtCreateTime?: Date;
+    tgtExpireTime?: Date;
+
+}
+
+/**
+ * sso用户踪迹搜索条件
+ */
+export interface SsoUserTraceQueryParam extends FrameworkBaseQueryParam {
+    accountForLike?: string;
+    statusForEqual?: string;
+}

package/lib/utils/ssoUtils.ts

@@ -45,9 +45,9 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
  * @param ssoRedirectRoutePath
  */
 const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
-    let ssoAuthRoutePath = '/sso/auth/index';
+    let ssoAuthRoutePath = '/sso/sso-auth/index';
     if (!ssoRedirectRoutePath) {
-        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/auth/auth-success')}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/sso-auth/auth-success')}`;
     } else {
         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "private": false,
   "type": "module",
   "scripts": {

package/src/router/index.ts

@@ -8,23 +8,23 @@ const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
         {
-            path: '/sso/auth/index',
-            component: () => import('@/views/sso/auth/index.vue'),
+            path: '/sso/sso-auth/index',
+            component: () => import('@/views/sso/sso-auth/index.vue'),
             meta: {
                 title: '认证',
                 isSsoExcluded: true
             }
         },
         {
-            path: '/sso/auth/auth-success',
-            component: () => import('@/views/sso/auth/auth-success.vue'),
+            path: '/sso/sso-auth/auth-success',
+            component: () => import('@/views/sso/sso-auth/auth-success.vue'),
             meta: {
                 title: '认证成功',
             }
         },
         {
-            path: '/config/gateway-config',
-            component: () => import('@/views/config/gateway-config.vue')
+            path: '/gateway/gateway-config',
+            component: () => import('@/views/gateway/gateway-config.vue')
         },
         {
             path: '/utils/aes-utils',

package/src/views/hooks/framework/framework-sse-client.vue

@@ -1,15 +1,22 @@
 <template>
-<div id="messageContainer"></div>
+<div>
+
+  <div id="messageContainer"></div>
+  <el-button @click="sendMessage">发送消息</el-button>
+</div>
 </template>
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { FrameworkSseClient } from '../../../../lib/hooks/framework/frameworkSseClient';
+import { http } from '../../../../lib/config/httpConfig';
 
 // 初始化 SSE 客户端
 const frameworkSseClient = new FrameworkSseClient (
-    'http://localhost:8290/framework-api/web/framework-sse/connect',
+    '/framework-api/standard/framework-sse/connect',
     (data) => {
+      debugger
+      console.log('data', data);
       // 处理接收到的消息
       const container = document.getElementById('messageContainer');
       if (container) {
@@ -36,6 +43,12 @@ window.addEventListener('beforeunload', () => {
   frameworkSseClient.close();
 });
 
+const sendMessage = ()=>{
+  http.post(`/framework-api/standard/framework-sse/send/3220bfd9-050e-435d-88d7-77b4a1dbf7cf`, { message: "测试" }).then((res) => {
+
+  });
+}
+
 </script>
 
 <style scoped>

package/src/views/sso/{auth → sso-auth}/index.vue

@@ -26,7 +26,7 @@
     http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
       setSsoAccessToken(res.data.data);
       let ssoRedirectRoutePath = router.currentRoute.value.query.ssoRedirectRoutePath as string;
-      ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/auth/auth-success' as any);
+      ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/sso-auth/auth-success' as any);
       ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
       router.push(ssoRedirectRoutePath);
     });