diff --git a/src/api/modular/main/DjyBookingManage.js b/src/api/modular/main/DjyBookingManage.js
index cdc3985..8c46eaf 100644
--- a/src/api/modular/main/DjyBookingManage.js
+++ b/src/api/modular/main/DjyBookingManage.js
@@ -3,7 +3,7 @@
 /**
  * 查询订舱
  *
- * @author Magic
+ * @author Myshipping
  */
 export function DjyBookingPage (parameter) {
   return axios({
@@ -16,7 +16,7 @@ export function DjyBookingPage (parameter) {
 /**
  * 订舱列表
  *
- * @author Magic
+ * @author Myshipping
  */
 export function DjyBookingList (parameter) {
   return axios({
@@ -29,7 +29,7 @@ export function DjyBookingList (parameter) {
 /**
  * 添加订舱
  *
- * @author Magic
+ * @author Myshipping
  */
 export function DjyBookingAdd (parameter) {
   return axios({
@@ -42,7 +42,7 @@ export function DjyBookingAdd (parameter) {
 /**
  * 编辑订舱
  *
- * @author Magic
+ * @author Myshipping
  */
 export function DjyBookingEdit (parameter) {
   return axios({
@@ -55,7 +55,7 @@ export function DjyBookingEdit (parameter) {
 /**
  * 删除订舱
  *
- * @author Magic
+ * @author Myshipping
  */
 export function DjyBookingDelete (parameter) {
   return axios({
diff --git a/src/api/modular/main/TestManage.js b/src/api/modular/main/TestManage.js
index ce25d49..8e894fc 100644
--- a/src/api/modular/main/TestManage.js
+++ b/src/api/modular/main/TestManage.js
@@ -3,7 +3,7 @@
 /**
  * 查询测试
  *
- * @author Magic
+ * @author Myshipping
  */
 export function TestPage (parameter) {
   return axios({
@@ -16,7 +16,7 @@ export function TestPage (parameter) {
 /**
  * 测试列表
  *
- * @author Magic
+ * @author Myshipping
  */
 export function TestList (parameter) {
   return axios({
@@ -29,7 +29,7 @@ export function TestList (parameter) {
 /**
  * 添加测试
  *
- * @author Magic
+ * @author Myshipping
  */
 export function TestAdd (parameter) {
   return axios({
@@ -42,7 +42,7 @@ export function TestAdd (parameter) {
 /**
  * 编辑测试
  *
- * @author Magic
+ * @author Myshipping
  */
 export function TestEdit (parameter) {
   return axios({
@@ -55,7 +55,7 @@ export function TestEdit (parameter) {
 /**
  * 删除测试
  *
- * @author Magic
+ * @author Myshipping
  */
 export function TestDelete (parameter) {
   return axios({
diff --git a/src/components/GlobalFooter/GlobalFooter.vue b/src/components/GlobalFooter/GlobalFooter.vue
index f54d6e2..82ed35c 100644
--- a/src/components/GlobalFooter/GlobalFooter.vue
+++ b/src/components/GlobalFooter/GlobalFooter.vue
@@ -3,7 +3,7 @@
     <div class="links">
     </div>
     <div class="copyright">
-      <!-- Copyright © 2021 <a target="_blank" href="https://gitee.com/zuohuaijun/Magic.NET">Magic.NET</a> All rights reserved. v1.3.2 -->
+      <!-- Copyright © 2021 <a target="_blank" href="https://gitee.com/zuohuaijun/Myshipping.NET">Myshipping.NET</a> All rights reserved. v1.3.2 -->
     </div>
   </div>
 </template>
diff --git a/src/components/Table/README.md b/src/components/Table/README.md
index 7fa410e..6a52805 100644
--- a/src/components/Table/README.md
+++ b/src/components/Table/README.md
@@ -299,7 +299,7 @@ result.then(r => {
       {
         id: 4,
         cover: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png',
-        title: 'Magic.NET',
+        title: 'Myshipping.NET',
         description: '那时候我只会想自己想要什么，从不想自己拥有什么',
         status: 1,
         updatedAt: '2018-07-26 00:00:00'
diff --git a/src/mock/services/article.js b/src/mock/services/article.js
index 761293c..46110ca 100644
--- a/src/mock/services/article.js
+++ b/src/mock/services/article.js
@@ -5,7 +5,7 @@ const titles = [
   'Alipay',
   'Angular',
   'Ant Design',
-  'Magic.NET',
+  'Myshipping.NET',
   'Bootstrap',
   'React',
   'Vue',
diff --git a/src/mock/services/manage.js b/src/mock/services/manage.js
index 0fff742..4ff95fd 100644
--- a/src/mock/services/manage.js
+++ b/src/mock/services/manage.js
@@ -65,7 +65,7 @@ const projects = () => {
     {
       id: 4,
       cover: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png',
-      title: 'Magic.NET',
+      title: 'Myshipping.NET',
       description: '那时候我只会想自己想要什么，从不想自己拥有什么',
       status: 1,
       updatedAt: '2018-07-26 00:00:00'
diff --git a/src/permission.js b/src/permission.js
index 40c432c..72588b6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,8 +23,12 @@ router.beforeEach((to, from, next) => {
       //next({ path: defaultRoutePath })
       NProgress.done()
     } else {
+      console.log('=== 非跳转登录页面 ===', store.getters.roles.length)
       if (store.getters.roles.length === 0) {
         store.dispatch('GetInfo').then(res => {
+          console.log('=== 测试跳转页面，获取个人信息 ===', res)
+          // console.log(JSON.stringify(res))
+          // console.log('=== 测试跳转页面，获取个人信息 -- end ===')
             if (res.menus.length < 1) {
               Modal.error({
                 title: '提示：',
@@ -40,6 +44,7 @@ router.beforeEach((to, from, next) => {
             }
             // eslint-disable-next-line camelcase
             const all_app_menu = Vue.ls.get(ALL_APPS_MENU)
+            console.log('=== 测试跳转页面，获取all_app_menu ===', all_app_menu)
             let antDesignmenus
             // eslint-disable-next-line camelcase
             if (all_app_menu == null) {
@@ -60,6 +65,7 @@ router.beforeEach((to, from, next) => {
                 }
                 applocation.push(apps)
               })
+              console.log('applocation == ', applocation)
               Vue.ls.set(ALL_APPS_MENU, applocation, 7 * 24 * 60 * 60 * 1000)
               // 延迟 1 秒显示欢迎信息
               setTimeout(() => {
@@ -71,8 +77,11 @@ router.beforeEach((to, from, next) => {
             } else {
               antDesignmenus = Vue.ls.get(ALL_APPS_MENU)[0].menu
             }
-            console.log('后端返回的路由', antDesignmenus)
+            console.log('后端返回的路由', antDesignmenus);
+            // console.log(JSON.stringify(antDesignmenus));
+
             store.dispatch('GenerateRoutes', { antDesignmenus }).then(() => {
+              debugger
               // 动态添加可访问路由表
               router.addRoutes(store.getters.addRouters)
               // 请求带有 redirect 重定向时，登录自动重定向到该地址
@@ -88,12 +97,14 @@ router.beforeEach((to, from, next) => {
             })
           })
           .catch(() => {
+            console.log('=== 测试跳转页面，获取个人信息失败 ===')
             store.dispatch('Logout').then(() => {
               next({ path: '/user/login', query: { redirect: to.fullPath } })
             })
           })
         store.dispatch("getNoticReceiveList").then((res)=>{});
       } else {
+        console.log('=== 测试跳转页面 3 ===')
         next()
       }
     }
diff --git a/src/views/gen/codeGenerate/addForm.vue b/src/views/gen/codeGenerate/addForm.vue
index 399158b..bf3d19d 100644
--- a/src/views/gen/codeGenerate/addForm.vue
+++ b/src/views/gen/codeGenerate/addForm.vue
@@ -188,7 +188,7 @@
        */
       selectedByDefault() {
         this.form.getFieldDecorator('nameSpace', {
-          initialValue: 'Magic.Application'
+          initialValue: 'Myshipping.Application'
         })
         // this.form.getFieldDecorator('tablePrefix', { valuePropName: 'checked', initialValue: 'N' })
         this.form.getFieldDecorator('generateType', {
@@ -196,7 +196,7 @@
           initialValue: '2'
         })
         this.form.getFieldDecorator('authorName', {
-          initialValue: 'Magic'
+          initialValue: 'Myshipping'
         })
 
         // 初始化菜单默认选择
diff --git a/src/views/gen/database/index.vue b/src/views/gen/database/index.vue
index 8cb77a4..8b4df03 100644
--- a/src/views/gen/database/index.vue
+++ b/src/views/gen/database/index.vue
@@ -130,8 +130,8 @@
           'DBEntityTenant'
         ],
         positionOption: [
-          'Magic.Application',
-          'Magic.Core'
+          'Myshipping.Application',
+          'Myshipping.Core'
         ],
         createEntityVisible: false,
         tableLoading: false,
diff --git a/src/views/system/dashboard/Workplace.vue b/src/views/system/dashboard/Workplace.vue
index 8f9f68a..2fca83c 100644
--- a/src/views/system/dashboard/Workplace.vue
+++ b/src/views/system/dashboard/Workplace.vue
@@ -223,7 +223,7 @@
           {
             id: 4,
             cover: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png',
-            title: 'Magic.NET',
+            title: 'Myshipping.NET',
             description: '那时候我只会想自己想要什么，从不想自己拥有什么',
             status: 1,
             updatedAt: '2018-07-26 00:00:00'