From c55c214c0e324e47f3b448e683fb56c820bf9277 Mon Sep 17 00:00:00 2001 From: zhuqunfeng Date: Thu, 30 Jan 2025 16:04:26 +0800 Subject: [PATCH] 1 --- tansci-boot-ui-editor/gh-pages/config.js | 2 +- tansci-boot-ui-editor/package-lock.json | 4 +- tansci-boot-ui-editor/public/config.js | 4 +- tansci-boot-ui/.env.development | 2 +- tansci-boot-ui/.gitignore | 1 - tansci-boot-ui/package.json | 2 +- tansci-boot-ui/public/gh-pages/config.js | 2 +- tansci-boot-ui/src/api/auth.ts | 1 + tansci-boot-ui/src/router/index.ts | 46 +++++++++++++++++-- tansci-boot-ui/src/utils/request.ts | 4 +- tansci-boot-ui/vite.config.ts | 2 +- .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application.yml | 2 +- 13 files changed, 56 insertions(+), 20 deletions(-) diff --git a/tansci-boot-ui-editor/gh-pages/config.js b/tansci-boot-ui-editor/gh-pages/config.js index bdc775d..3edd5be 100644 --- a/tansci-boot-ui-editor/gh-pages/config.js +++ b/tansci-boot-ui-editor/gh-pages/config.js @@ -1 +1 @@ -window.common={API_QUERY_URL:"http://localhost:7000/tansci/lcPages/get/",API_SAVE_URL:"http://localhost:7000/tansci/lcPages/update",TOKEN_KEY:"token"}; \ No newline at end of file +window.common={API_QUERY_URL:"http://localhost:7001/tansci/lcPages/get/",API_SAVE_URL:"http://localhost:7001/tansci/lcPages/update",TOKEN_KEY:"token"}; \ No newline at end of file diff --git a/tansci-boot-ui-editor/package-lock.json b/tansci-boot-ui-editor/package-lock.json index 7469dfa..0a9c12e 100644 --- a/tansci-boot-ui-editor/package-lock.json +++ b/tansci-boot-ui-editor/package-lock.json @@ -1,12 +1,12 @@ { "name": "tansci-boot-ui-editor", - "version": "2.0.0", + "version": "1.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tansci-boot-ui-editor", - "version": "2.0.0", + "version": "1.2.0", "license": "ISC", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.3", diff --git a/tansci-boot-ui-editor/public/config.js b/tansci-boot-ui-editor/public/config.js index 66ef6ed..2cccf5b 100644 --- a/tansci-boot-ui-editor/public/config.js +++ b/tansci-boot-ui-editor/public/config.js @@ -1,5 +1,5 @@ window.common = { - API_QUERY_URL: 'http://localhost:7000/tansci/lowcode/lcPages/get/', - API_SAVE_URL: 'http://localhost:7000/tansci/lowcode/lcPages/update', + API_QUERY_URL: 'http://localhost:7001/tansci/lowcode/lcPages/get/', + API_SAVE_URL: 'http://localhost:7001/tansci/lowcode/lcPages/update', TOKEN_KEY: 'token' } \ No newline at end of file diff --git a/tansci-boot-ui/.env.development b/tansci-boot-ui/.env.development index 8e86c1b..800b4c9 100644 --- a/tansci-boot-ui/.env.development +++ b/tansci-boot-ui/.env.development @@ -1,2 +1,2 @@ -VITE_BASE_API = 'http://localhost:7000/tansci' +VITE_BASE_API = 'http://localhost:7001/tansci' VITE_EDITOR_URL = 'http://localhost:5173' \ No newline at end of file diff --git a/tansci-boot-ui/.gitignore b/tansci-boot-ui/.gitignore index e6178df..a44e806 100644 --- a/tansci-boot-ui/.gitignore +++ b/tansci-boot-ui/.gitignore @@ -1,5 +1,4 @@ .vite-ssg-temp - node_modules .DS_Store dist diff --git a/tansci-boot-ui/package.json b/tansci-boot-ui/package.json index 2f9efdf..495a167 100644 --- a/tansci-boot-ui/package.json +++ b/tansci-boot-ui/package.json @@ -10,7 +10,7 @@ "typecheck": "vue-tsc --noEmit" }, "dependencies": { - "amis": "^6.0.0", + "amis": "^6.10.0", "axios": "^1.3.4", "copy-to-clipboard": "^3.3.3", "element-plus": "^2.6.3", diff --git a/tansci-boot-ui/public/gh-pages/config.js b/tansci-boot-ui/public/gh-pages/config.js index 279683d..b227b54 100644 --- a/tansci-boot-ui/public/gh-pages/config.js +++ b/tansci-boot-ui/public/gh-pages/config.js @@ -1 +1 @@ -window.common={API_QUERY_URL:"http://localhost:7000/tansci/lowcode/lcPages/get/",API_SAVE_URL:"http://localhost:7000/tansci/lowcode/lcPages/update",TOKEN_KEY:"token"}; \ No newline at end of file +window.common={API_QUERY_URL:"http://localhost:7001/tansci/lowcode/lcPages/get/",API_SAVE_URL:"http://localhost:7001/tansci/lowcode/lcPages/update",TOKEN_KEY:"token"}; \ No newline at end of file diff --git a/tansci-boot-ui/src/api/auth.ts b/tansci-boot-ui/src/api/auth.ts index 7df6ebf..892cf3a 100644 --- a/tansci-boot-ui/src/api/auth.ts +++ b/tansci-boot-ui/src/api/auth.ts @@ -22,6 +22,7 @@ export function removeToken() { // 菜单信息 export function getMenus() { let menu = sessionStorage.getItem(menuKey); + console.info(menu); return menu ? JSON.parse(menu) : null; } diff --git a/tansci-boot-ui/src/router/index.ts b/tansci-boot-ui/src/router/index.ts index 9e33d06..87acc2a 100644 --- a/tansci-boot-ui/src/router/index.ts +++ b/tansci-boot-ui/src/router/index.ts @@ -1,15 +1,51 @@ -import { createRouter, createWebHistory } from "vue-router" +import { createRouter, createWebHistory,RouteRecordRaw } from "vue-router" import { ElMessage } from 'element-plus' import { getToken, removeToken, setMenus, getUserInfo } from "@/api/auth" import common from '@/utils/common' import { generateRoutes } from "./permission" -import staticRouter from './staticRouter' +const staticRouter: RouteRecordRaw[] = [ + { + path: '/', + redirect: 'login', + }, + { + path: '/login', + name: 'login', + meta: {title: "登录"}, + component: () => import("@/views/common/Login.vue"), + }, + { + path: '/404', + name: '404', + meta: {title: "404"}, + component: () => import('@/views/common/404.vue') + }, + { + path: '/500', + name: '500', + meta: {title: "500"}, + component: () => import('@/views/common/500.vue') + }, + { + path: '/index', + name: 'index', + meta: { title: "首页" }, + redirect: '/index/index', + component: () => import("@/components/layout/Index.vue"), + children: [ + { + path: 'index', + name: 'index', + meta: { title: "首页" }, + component: () => import('@/views/Index.vue') + } + ] + } +]; const router = createRouter({ history: createWebHistory(), - routes: [ - ...staticRouter - ] + routes: staticRouter }) const whiteList = ['/login'] diff --git a/tansci-boot-ui/src/utils/request.ts b/tansci-boot-ui/src/utils/request.ts index 68b57aa..7a943f3 100644 --- a/tansci-boot-ui/src/utils/request.ts +++ b/tansci-boot-ui/src/utils/request.ts @@ -1,4 +1,4 @@ -import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios' +import axios, { AxiosInstance, InternalAxiosRequestConfig, AxiosResponse } from 'axios' import { ElMessage } from 'element-plus' import { logout, getToken } from '@/api/auth' import router from '../router' @@ -14,7 +14,7 @@ const axiosInstance: AxiosInstance = axios.create({ }) // axios实例拦截请求 -axiosInstance.interceptors.request.use((config: AxiosRequestConfig) => { +axiosInstance.interceptors.request.use((config: InternalAxiosRequestConfig) => { // 设置token if (getToken()) { config.headers.token = getToken() diff --git a/tansci-boot-ui/vite.config.ts b/tansci-boot-ui/vite.config.ts index 634fad0..30c9314 100644 --- a/tansci-boot-ui/vite.config.ts +++ b/tansci-boot-ui/vite.config.ts @@ -21,7 +21,7 @@ export default defineConfig({ server: { proxy: { '/tansci': { - target: 'http://127.0.0.1:7000', + target: 'http://localhost:7001', changeOrigin: true, pathRewrite: {'^/tansci':'/tansci'} } diff --git a/tansci-boot/src/main/resources/application-dev.yml b/tansci-boot/src/main/resources/application-dev.yml index 885ee43..5e1572d 100644 --- a/tansci-boot/src/main/resources/application-dev.yml +++ b/tansci-boot/src/main/resources/application-dev.yml @@ -3,8 +3,8 @@ spring: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/tansci_boot?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&autoReconnect=true - username: root - password: root + username: tansci + password: tansci initialSize: 10 minIdle: 10 maxActive: 100 diff --git a/tansci-boot/src/main/resources/application.yml b/tansci-boot/src/main/resources/application.yml index b654edd..b953215 100644 --- a/tansci-boot/src/main/resources/application.yml +++ b/tansci-boot/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 7000 + port: 7001 servlet: context-path: /tansci