Merge branch 'dev'

Author: chengyu2333

api/jeecg-boot-base-common/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>2.2.0</version>
+		<version>2.3.0</version>
 	</parent>
 
 	<repositories>

web/src/store/mutation-types.js

@@ -17,7 +17,7 @@ export const SYS_BUTTON_AUTH = 'SYS_BUTTON_AUTH'
 export const ENCRYPTED_STRING = 'ENCRYPTED_STRING'
 export const ENHANCE_PRE = 'enhance_'
 export const UI_CACHE_DB_DICT_DATA = 'UI_CACHE_DB_DICT_DATA'
-export const INDEX_MAIN_PAGE_PATH =  "/dashboard/index"
+export const INDEX_MAIN_PAGE_PATH =  "/account/center"
 
 export const CONTENT_WIDTH_TYPE = {
   Fluid: 'Fluid',

web/src/utils/util.js

@@ -1,6 +1,7 @@
 import * as api from '@/api/api'
 import { isURL } from '@/utils/validate'
 import onlineCommons from '@jeecg/antd-online-beta220'
+import { INDEX_MAIN_PAGE_PATH} from "@/store/mutation-types"
 
 export function timeFix() {
   const time = new Date()
@@ -83,11 +84,11 @@ export function formatDate(value, fmt) {
 export function generateIndexRouter(data) {
 let indexRouter = [{
           path: '/',
-          name: 'dashboard',
+          name: 'index',
           //component: () => import('@/components/layouts/BasicLayout'),
           component: resolve => require(['@/components/layouts/TabLayout'], resolve),
           meta: { title: '首页' },
-          redirect: '/dashboard/index',
+          redirect: INDEX_MAIN_PAGE_PATH,
           children: [
             ...generateChildRouters(data)
           ]

web/src/views/user/Login.vue

@@ -168,7 +168,7 @@
   import { mapActions } from "vuex"
   import { timeFix } from "@/utils/util"
   import Vue from 'vue'
-  import { ACCESS_TOKEN ,ENCRYPTED_STRING} from "@/store/mutation-types"
+  import { ACCESS_TOKEN ,ENCRYPTED_STRING, INDEX_MAIN_PAGE_PATH} from "@/store/mutation-types"
   import { putAction,postAction,getAction } from '@/api/manage'
   import { encryption , getEncryptedString } from '@/utils/encryption/aesEncrypt'
   import store from '@/store/'
@@ -376,7 +376,7 @@
         // update-begin- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
         // this.loginBtn = false
         // update-end- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
-        this.$router.push({ path: "/dashboard/index" })
+        this.$router.push({ path: INDEX_MAIN_PAGE_PATH })
         this.$notification.success({
           message: '欢迎',
           description: `${timeFix()}，欢迎回来`,