Explorar el Código

新增环境变量配置,优化API地址获取方式;新增fetchAppInfo函数并调整相关组件以支持新功能

张涛 hace 1 año
padre
commit
c07eb7a080
Se han modificado 7 ficheros con 27 adiciones y 91 borrados
  1. 1 0
      .env
  2. 1 3
      public/config.js
  3. 6 0
      src/apis/home.js
  4. 1 58
      src/apis/login.js
  5. 2 22
      src/base/store/use-current-user.js
  6. 11 6
      src/modules/home/agent_card.vue
  7. 5 2
      vite.config.mjs

+ 1 - 0
.env

@@ -0,0 +1 @@
+VITE_API_BASE_URL=http://smartai.com:8163

+ 1 - 3
public/config.js

@@ -4,9 +4,7 @@ window.DMX_VERSION = '1.0.1';
  * API请求地址
  * 配置项最后一个字符 无需是 / 即,无需以 / 结束
  */
-window.API_BASE_URL = 'http://192.168.20.119:13002';
-// window.API_BASE_URL = 'http://smartai.com:8163';
-export const API_BASE_URL = window.API_BASE_URL; // 新增导出
+window.API_BASE_URL = window.VITE_API_BASE_URL;
 
 window.featureConfigs = [
   {

+ 6 - 0
src/apis/home.js

@@ -6,3 +6,9 @@ export const fetchApps = () => {
     method: 'get'
   });
 };
+export const fetchAppInfo = (id) => {
+  return request({
+    url: `/console/api/apps/${id}`,
+    method: 'get'
+  });
+};

+ 1 - 58
src/apis/login.js

@@ -15,67 +15,10 @@ export function logout() {
     method: 'get'
   });
 }
-
+// 获取用户信息
 export function QueryAccountProfile() {
   return request({
     url: '/console/api/account/profile',
     method: 'get'
   });
 }
-
-// 注册
-export function register(data) {
-  return request({
-    url: '/api/auth/v2/register',
-    method: 'post',
-    data
-  });
-}
-// 注册完成同步数据
-
-export function asycData(userFlag) {
-  return request({
-    url: `/api/auth/v2/sync?userFlag=${userFlag}`,
-    method: 'get'
-  });
-}
-// 获取用户信息
-export function QueyrUserInfo() {
-  return request({
-    url: '/api/user/user_info',
-    method: 'get'
-  });
-}
-
-// 获取用户路由
-export function QueyrRoutesList() {
-  return request({
-    url: '/api/user/user_routers',
-    method: 'get'
-  });
-}
-// token转化
-export function tokenExchange() {
-  return request({
-    url: `/api/auth/token`,
-    method: 'get'
-  });
-}
-
-/**
- * 修改用户密码
- * @see https://app.apifox.com/link/project/5404857/apis/api-244151743
- * @param {String} pre - 旧密码(需要加密)
- * @param {String} cur - 新密码(需要加密)
- * @returns
- */
-export function changeUserPassword(pre, cur) {
-  return request({
-    url: '/api/user/change_password',
-    method: 'put',
-    data: JSON.stringify({
-      oldPassword: pre,
-      newPassword: cur
-    })
-  });
-}

+ 2 - 22
src/base/store/use-current-user.js

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
-import { login, logout, QueyrUserInfo, QueyrRoutesList } from '../../apis/login';
-import { kuky_Authorization, access_token, localST_RoutesList, localST_UserInfo } from '../storage';
+import { login, logout } from '../../apis/login';
+import { kuky_Authorization, access_token, localST_UserInfo } from '../storage';
 
 /**
  * 当前登录的用户信息
@@ -84,26 +84,6 @@ export const useCurrentUserStore = defineStore('current_user', {
       });
     },
 
-    // 获取并且存储用户路由列表
-    async getRoutesList() {
-      const {
-        code,
-        data: { routers }
-      } = await QueyrRoutesList();
-      if (code === 200) {
-        // 将 setItem 包装在一个 Promise 中并等待完成
-        return new Promise((resolve, reject) => {
-          try {
-            localST_RoutesList.removeItem();
-            localST_RoutesList.setItem(JSON.stringify(routers));
-            resolve();
-          } catch (error) {
-            reject(error);
-          }
-        });
-      }
-    },
-
     setUserProfile(profile) {
       this.userInfo.name = profile.name;
       this.userInfo.email = profile.email;

+ 11 - 6
src/modules/home/agent_card.vue

@@ -37,7 +37,7 @@
 
 <script setup>
 import { ref, onMounted, nextTick, onUnmounted } from 'vue';
-import { fetchApps } from '../../apis/home';
+import { fetchApps, fetchAppInfo } from '../../apis/home';
 import { Message } from '../../3rd-libs/arco-vue-libs';
 import Icon from '../../components/Icon/Icon.vue';
 import { getConfigField } from '../../config'; // 假设 getConfigField 是从某处导入的
@@ -115,11 +115,16 @@ const selectCategory = (category) => {
   filterApps(); // 选择分类后进行筛选
 };
 
-const handleAgentClick = (app) => {
-  const iframe_id = app.id;
-  const dify_token = access_token.get();
-  const workflowUrl = `${baseurl}/app/${iframe_id}/workflow?token=${dify_token}`;
-  window.open(workflowUrl, '_blank');
+const handleAgentClick = async (app) => {
+  const appId = app.id;
+  try {
+    const { site } = await fetchAppInfo(appId);
+    const dify_token = access_token.get();
+    const chatUrl = `${baseurl}/chat/${site.code}?token=${dify_token}`;
+    window.open(chatUrl, '_blank');
+  } catch (error) {
+    Message.error('加载数据失败');
+  }
 };
 </script>
 

+ 5 - 2
vite.config.mjs

@@ -14,11 +14,11 @@ import Components from 'unplugin-vue-components/vite';
 import { ArcoResolver } from 'unplugin-vue-components/resolvers';
 
 import { config_compression, config_imagemin } from './scripts/vite-conf';
-import { API_BASE_URL } from './public/config';
-const targetUrl = API_BASE_URL || 'http://smartai.com:8163'; // 从环境变量或默认值中获取
+const targetUrl = process.env.API_BASE_URL || 'http://smartai.com:8163'; // 从环境变量或默认值中获取
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
   return {
     /**
      * 项目根目录
@@ -76,6 +76,9 @@ export default defineConfig(({ mode }) => {
         }
       }
     },
+    define: {
+      'window.VITE_API_BASE_URL': JSON.stringify(env.VITE_API_BASE_URL)
+    },
     plugins: [
       vue(),
       // /**