From 7dd9e72df7ff17fc0a112bed36d694a9c2d06b04 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Wed, 19 Jul 2023 14:57:44 +0800
Subject: [PATCH] logo与官网同步
---
ant-design-vue-jeecg/src/assets/huaheng.png | Bin 19613 -> 0 bytes
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue | 2 +-
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue | 14 +++++++-------
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java | 1 +
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ant-design-vue-jeecg/src/assets/huaheng.png b/ant-design-vue-jeecg/src/assets/huaheng.png
index 463550d..176e33f 100644
Binary files a/ant-design-vue-jeecg/src/assets/huaheng.png and b/ant-design-vue-jeecg/src/assets/huaheng.png differ
diff --git a/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue b/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
index 83cd5d2..6ec5ea7 100644
--- a/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
+++ b/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
@@ -86,7 +86,7 @@ export default {
}
.logo {
- height: 44px;
+ height: 24px;
vertical-align: top;
border-style: none;
}
diff --git a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
index de2bf08..5ab207c 100644
--- a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
@@ -403,8 +403,8 @@ body {
.logo.top-nav-header {
text-align: center;
- width: 58px;
- line-height: 58px;
+ width: 59px;
+ line-height: 59px;
}
}
}
@@ -471,16 +471,16 @@ body {
.logo.top-nav-header {
width: 160px;
- height: 58px;
+ height: 59px;
position: relative;
- line-height: 58px;
+ line-height: 54px;
transition: all .3s;
overflow: hidden;
img {
display: inline-block;
vertical-align: middle;
- height: 32px;
+ height: 20px;
}
h1 {
@@ -595,11 +595,11 @@ body {
height: 64px;
position: relative;
line-height: 64px;
- padding-left: 24px;
-webkit-transition: all .3s;
transition: all .3s;
background: #002140;
overflow: hidden;
+ text-align: center;
img, h1 {
display: inline-block;
@@ -607,7 +607,7 @@ body {
}
img {
- height: 32px;
+ height: 20px;
}
h1 {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
index 83957eb..117c3fc 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
@@ -81,6 +81,7 @@ public class ApiAuthenticationAspect {
}
try {
if (token.equals("MTY3OTU1MTE0MCwib3BlcmF0b3IiOiJIVUFIRU5HLVdNUzQiLCJqdGkiOiI3ZGExMDQyYS1iMDBhLTQzZmMtOTliO")) {
+ log.error("API Authentication token 非法使用");
return;
}
Algorithm algorithm = Algorithm.RSA256(rsa256Key.getPublicKey(), rsa256Key.getPrivateKey());
--
libgit2 0.22.2