From 64b8251919bf49d8d64d0b259b2baaec12b7da36 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 22:07:19 +0800 Subject: [PATCH 1/9] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/aurora/service/impl/TalkServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java index b5c36a2..b21310f 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java @@ -83,8 +83,8 @@ public class TalkServiceImpl extends ServiceImpl implements Ta } @Override - public void deleteTalks(List talkIdList) { - talkMapper.deleteBatchIds(talkIdList); + public void deleteTalks(List talkIds) { + talkMapper.deleteBatchIds(talkIds); } @Override @@ -111,5 +111,6 @@ public class TalkServiceImpl extends ServiceImpl implements Ta } return talkBackDTO; } + } From 4a5640dcf874e0fe3d2793950ea1721813772d1b Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 22:15:34 +0800 Subject: [PATCH 2/9] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/Title/src/SubTitle.vue | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/aurora-vue/aurora-blog/src/components/Title/src/SubTitle.vue b/aurora-vue/aurora-blog/src/components/Title/src/SubTitle.vue index fdb91b3..251bc35 100644 --- a/aurora-vue/aurora-blog/src/components/Title/src/SubTitle.vue +++ b/aurora-vue/aurora-blog/src/components/Title/src/SubTitle.vue @@ -1,26 +1,8 @@ @@ -31,7 +13,7 @@ import { computed, defineComponent, toRefs } from 'vue' import { useI18n } from 'vue-i18n' export default defineComponent({ - name: 'ObSubTitle', + name: 'SubTitle', props: { title: { type: String, From 3025391a0ed51c544cd909c590a08b83852ed872 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 22:18:35 +0800 Subject: [PATCH 3/9] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-admin/src/router/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/aurora-vue/aurora-admin/src/router/index.js b/aurora-vue/aurora-admin/src/router/index.js index 6d9c1dd..bad5808 100644 --- a/aurora-vue/aurora-admin/src/router/index.js +++ b/aurora-vue/aurora-admin/src/router/index.js @@ -11,13 +11,11 @@ const routes = [ component: () => import('../views/login/Login.vue') } ] - const createRouter = () => new VueRouter({ mode: 'history', routes: routes }) - const router = createRouter() export function resetRouter() { From 15b24449f33e06012f2148260621d372c8205ce2 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 22:25:22 +0800 Subject: [PATCH 4/9] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-admin/src/assets/js/china.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aurora-vue/aurora-admin/src/assets/js/china.js b/aurora-vue/aurora-admin/src/assets/js/china.js index feadf61..979ea66 100644 --- a/aurora-vue/aurora-admin/src/assets/js/china.js +++ b/aurora-vue/aurora-admin/src/assets/js/china.js @@ -1,13 +1,9 @@ -/* eslint-disable no-undef */ ;(function (root, factory) { if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. define(['exports', 'echarts'], factory) } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') { - // CommonJS factory(exports, require('echarts')) } else { - // Browser globals factory({}, root.echarts) } })(this, function (exports, echarts) { From 9bb5a88598dfbd971053bdc91ef59228bf5f257b Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 22:26:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-admin/src/assets/js/menu.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aurora-vue/aurora-admin/src/assets/js/menu.js b/aurora-vue/aurora-admin/src/assets/js/menu.js index 2c1a6a4..a3e423d 100644 --- a/aurora-vue/aurora-admin/src/assets/js/menu.js +++ b/aurora-vue/aurora-admin/src/assets/js/menu.js @@ -5,7 +5,6 @@ import axios from 'axios' import Vue from 'vue' export function generaMenu() { - // 查询用户菜单 axios.get('/api/admin/user/menus').then(({ data }) => { if (data.flag) { let userMenus = data.data @@ -23,9 +22,7 @@ export function generaMenu() { }) } }) - // 添加侧边栏菜单 store.commit('saveUserMenus', userMenus) - // 添加菜单到路由 userMenus.forEach((item) => { router.addRoute(item) }) @@ -37,6 +34,5 @@ export function generaMenu() { } export const loadView = (view) => { - // 路由懒加载 return (resolve) => require([`@/views${view}`], resolve) } From 00ec02114c89177f10acc0924a26e5ea5211e915 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Fri, 4 Nov 2022 22:33:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-admin/src/App.vue | 2 +- aurora-vue/aurora-admin/src/assets/js/menu.js | 4 ++-- aurora-vue/aurora-admin/src/views/home/Home.vue | 2 +- aurora-vue/aurora-admin/src/views/log/ExceptionLog.vue | 2 -- aurora-vue/aurora-admin/src/views/login/Login.vue | 3 +-- aurora-vue/aurora-admin/src/views/talk/Talk.vue | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/aurora-vue/aurora-admin/src/App.vue b/aurora-vue/aurora-admin/src/App.vue index 0f930e0..9646f3e 100644 --- a/aurora-vue/aurora-admin/src/App.vue +++ b/aurora-vue/aurora-admin/src/App.vue @@ -5,7 +5,7 @@