Merge pull request #52 from linhaojun857/dev

merge dev

aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java

@@ -83,8 +83,8 @@ public class TalkServiceImpl extends ServiceImpl<TalkMapper, Talk> implements Ta
     }
 
     @Override
-    public void deleteTalks(List<Integer> talkIdList) {
-        talkMapper.deleteBatchIds(talkIdList);
+    public void deleteTalks(List<Integer> talkIds) {
+        talkMapper.deleteBatchIds(talkIds);
     }
 
     @Override
@@ -111,5 +111,6 @@ public class TalkServiceImpl extends ServiceImpl<TalkMapper, Talk> implements Ta
         }
         return talkBackDTO;
     }
+
 }
 

aurora-vue/aurora-admin/src/App.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { generaMenu } from './assets/js/menu'
+import { generaMenu } from '@/assets/js/menu'
 export default {
   created() {
     if (this.$store.state.userInfo != null) {

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) {

aurora-vue/aurora-admin/src/assets/js/menu.js

@@ -1,11 +1,10 @@
 import Layout from '@/layout/index.vue'
-import router from '../../router'
-import store from '../../store'
+import router from '@/router'
+import store from '@/store'
 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)
 }

aurora-vue/aurora-admin/src/components/Crontab/day.vue

@@ -62,7 +62,6 @@ export default {
       if (this.radioValue !== 2 && this.cron.week !== '?') {
         this.$emit('update', 'week', '?', 'day')
       }
-
       switch (this.radioValue) {
         case 1:
           this.$emit('update', 'day', '*')

aurora-vue/aurora-admin/src/layout/components/NavBar.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { resetRouter } from '../../router'
+import { resetRouter } from '@/router'
 export default {
   created() {
     let matched = this.$route.matched.filter((item) => item.name)

aurora-vue/aurora-admin/src/layout/index.vue

@@ -19,8 +19,8 @@
 </template>
 
 <script>
-import NavBar from './components/NavBar'
-import SideBar from './components/SideBar'
+import NavBar from '@/layout/components/NavBar.vue'
+import SideBar from '@/layout/components/SideBar.vue'
 export default {
   components: {
     NavBar,

aurora-vue/aurora-admin/src/main.js

@@ -44,11 +44,11 @@ Vue.filter('dateTime', function (value, formatStr = 'YYYY-MM-DD HH:mm:ss') {
 })
 
 NProgress.configure({
-  easing: 'ease', // 动画方式
-  speed: 500, // 递增进度条的速度
-  showSpinner: false, // 是否显示加载ico
-  trickleSpeed: 200, // 自动递增间隔
-  minimum: 0.3 // 初始化时的最小百分比
+  easing: 'ease',
+  speed: 500,
+  showSpinner: false,
+  trickleSpeed: 200,
+  minimum: 0.3
 })
 
 router.beforeEach((to, from, next) => {

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() {

aurora-vue/aurora-admin/src/views/home/Home.vue

@@ -104,7 +104,7 @@
 </template>
 
 <script>
-import '../../assets/js/china'
+import '@/assets/js/china'
 export default {
   created() {
     this.listUserArea()

aurora-vue/aurora-admin/src/views/log/ExceptionLog.vue

@@ -63,7 +63,6 @@
       :total="count"
       :page-sizes="[10, 20]"
       layout="total, sizes, prev, pager, next, jumper" />
-    <!-- 查看模态框 -->
     <el-dialog :visible.sync="isCheck" append-to-body top="20px" width="80%" destroy-on-close>
       <div class="dialog-title-container" slot="title"><i class="el-icon-more" />详细信息</div>
       <el-form ref="form" :model="exceptionLog" label-width="100px" size="mini">
@@ -88,7 +87,6 @@
         </div>
       </el-form>
     </el-dialog>
-    <!-- 批量删除对话框 -->
     <el-dialog :visible.sync="isDelete" width="30%">
       <div class="dialog-title-container" slot="title"><i class="el-icon-warning" style="color: #ff9900" />提示</div>
       <div style="font-size: 1rem">是否删除选中项？</div>

aurora-vue/aurora-admin/src/views/login/Login.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { generaMenu } from '../../assets/js/menu'
+import { generaMenu } from '@/assets/js/menu'
 export default {
   data: function () {
     return {
@@ -61,7 +61,6 @@ export default {
               })
             }
           })
-          // 显示验证码
           captcha.show()
         } else {
           return false

aurora-vue/aurora-admin/src/views/talk/Talk.vue

@@ -54,7 +54,7 @@
 
 <script>
 import * as imageConversion from 'image-conversion'
-import Editor from '../../components/Editor.vue'
+import Editor from '@/components/Editor.vue'
 export default {
   components: {
     Editor

aurora-vue/aurora-blog/src/components/Title/src/SubTitle.vue

@@ -1,26 +1,8 @@
 <template>
-  <p
-    class="
-      relative
-      flex
-      items-center
-      pb-2
-      mb-4
-      text-xl text-ob-bright
-      uppercase
-    "
-  >
-    <svg-icon
-      v-if="icon && side === 'left'"
-      :icon-class="icon"
-      class="inline-block mr-2"
-    />
+  <p class="relative flex items-center pb-2 mb-4 text-xl text-ob-bright uppercase">
+    <svg-icon v-if="icon && side === 'left'" :icon-class="icon" class="inline-block mr-2" />
     <span :class="titleClass">{{ t(titleStr) }}</span>
-    <svg-icon
-      v-if="icon && side === 'right'"
-      :icon-class="icon"
-      class="inline-block ml-2"
-    />
+    <svg-icon v-if="icon && side === 'right'" :icon-class="icon" class="inline-block ml-2" />
     <span :class="lineClass" :style="gradientBackground" />
   </p>
 </template>
@@ -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,