Commit 7dd9e72df7ff17fc0a112bed36d694a9c2d06b04

Authored by 谭毅彬
1 parent 82cacf54

logo与官网同步

ant-design-vue-jeecg/src/assets/huaheng.png

19.2 KB | W: 250px | H: 50px

14.8 KB | W: 220px | H: 28px

  • 2-up
  • Swipe
  • Onion skin
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
@@ -86,7 +86,7 @@ export default { @@ -86,7 +86,7 @@ export default {
86 } 86 }
87 87
88 .logo { 88 .logo {
89 - height: 44px; 89 + height: 24px;
90 vertical-align: top; 90 vertical-align: top;
91 border-style: none; 91 border-style: none;
92 } 92 }
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
@@ -403,8 +403,8 @@ body { @@ -403,8 +403,8 @@ body {
403 403
404 .logo.top-nav-header { 404 .logo.top-nav-header {
405 text-align: center; 405 text-align: center;
406 - width: 58px;  
407 - line-height: 58px; 406 + width: 59px;
  407 + line-height: 59px;
408 } 408 }
409 } 409 }
410 } 410 }
@@ -471,16 +471,16 @@ body { @@ -471,16 +471,16 @@ body {
471 471
472 .logo.top-nav-header { 472 .logo.top-nav-header {
473 width: 160px; 473 width: 160px;
474 - height: 58px; 474 + height: 59px;
475 position: relative; 475 position: relative;
476 - line-height: 58px; 476 + line-height: 54px;
477 transition: all .3s; 477 transition: all .3s;
478 overflow: hidden; 478 overflow: hidden;
479 479
480 img { 480 img {
481 display: inline-block; 481 display: inline-block;
482 vertical-align: middle; 482 vertical-align: middle;
483 - height: 32px; 483 + height: 20px;
484 } 484 }
485 485
486 h1 { 486 h1 {
@@ -595,11 +595,11 @@ body { @@ -595,11 +595,11 @@ body {
595 height: 64px; 595 height: 64px;
596 position: relative; 596 position: relative;
597 line-height: 64px; 597 line-height: 64px;
598 - padding-left: 24px;  
599 -webkit-transition: all .3s; 598 -webkit-transition: all .3s;
600 transition: all .3s; 599 transition: all .3s;
601 background: #002140; 600 background: #002140;
602 overflow: hidden; 601 overflow: hidden;
  602 + text-align: center;
603 603
604 img, h1 { 604 img, h1 {
605 display: inline-block; 605 display: inline-block;
@@ -607,7 +607,7 @@ body { @@ -607,7 +607,7 @@ body {
607 } 607 }
608 608
609 img { 609 img {
610 - height: 32px; 610 + height: 20px;
611 } 611 }
612 612
613 h1 { 613 h1 {
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
@@ -81,6 +81,7 @@ public class ApiAuthenticationAspect { @@ -81,6 +81,7 @@ public class ApiAuthenticationAspect {
81 } 81 }
82 try { 82 try {
83 if (token.equals("MTY3OTU1MTE0MCwib3BlcmF0b3IiOiJIVUFIRU5HLVdNUzQiLCJqdGkiOiI3ZGExMDQyYS1iMDBhLTQzZmMtOTliO")) { 83 if (token.equals("MTY3OTU1MTE0MCwib3BlcmF0b3IiOiJIVUFIRU5HLVdNUzQiLCJqdGkiOiI3ZGExMDQyYS1iMDBhLTQzZmMtOTliO")) {
  84 + log.error("API Authentication token 非法使用");
84 return; 85 return;
85 } 86 }
86 Algorithm algorithm = Algorithm.RSA256(rsa256Key.getPublicKey(), rsa256Key.getPrivateKey()); 87 Algorithm algorithm = Algorithm.RSA256(rsa256Key.getPublicKey(), rsa256Key.getPrivateKey());