You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by zh...@apache.org on 2021/07/30 11:44:38 UTC

[incubator-shenyu] branch 2.4.0-release updated: fix release issues

This is an automated email from the ASF dual-hosted git repository.

zhangyonglun pushed a commit to branch 2.4.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git


The following commit(s) were added to refs/heads/2.4.0-release by this push:
     new 04fab08  fix release issues
04fab08 is described below

commit 04fab08c9767f70cbfce1f7891003cb979e227e8
Author: Zhang Yonglun <zh...@apache.org>
AuthorDate: Fri Jul 30 19:44:14 2021 +0800

    fix release issues
---
 .../admin/controller/DashboardUserController.java  |  2 +-
 .../shenyu/admin/utils/ThreadLocalUtilTest.java    | 53 ----------------------
 .../shenyu-src-dist/src/main/assembly/source.xml   |  2 +
 3 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
index 435a892..41c09d3 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
@@ -107,7 +107,7 @@ public class DashboardUserController {
     @PostMapping("")
     public ShenyuAdminResult createDashboardUser(@Valid @RequestBody final DashboardUserDTO dashboardUserDTO) {
         String key = secretProperties.getKey();
-        String iv = secretProperties.getKey();
+        String iv = secretProperties.getIv();
         return Optional.ofNullable(dashboardUserDTO).map(item -> {
             item.setPassword(AesUtils.aesEncryption(item.getPassword(), key, iv));
             Integer createCount = dashboardUserService.createOrUpdate(item);
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ThreadLocalUtilTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ThreadLocalUtilTest.java
deleted file mode 100644
index fb3929a..0000000
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ThreadLocalUtilTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.admin.utils;
-
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class ThreadLocalUtilTest {
-
-    @Test
-    public void testPutValue() {
-        ThreadLocalUtil.put("threadKey", "threadValue");
-        assertThat("threadValue", is(ThreadLocalUtil.get("threadKey")));
-    }
-
-    @Test
-    public void testGetValue() {
-        ThreadLocalUtil.put("threadKey", "threadValue");
-        assertThat("threadValue", is(ThreadLocalUtil.get("threadKey")));
-    }
-
-    @Test
-    public void testRemove() {
-        ThreadLocalUtil.put("threadKey", "threadValue");
-        assertThat("threadValue", is(ThreadLocalUtil.get("threadKey")));
-        ThreadLocalUtil.remove("threadKey");
-        assertThat(ThreadLocalUtil.get("threadKey"), nullValue());
-    }
-
-    @Test
-    public void testClear() {
-        ThreadLocalUtil.put("threadValue", "threadValue");
-        ThreadLocalUtil.clear();
-        assertThat(ThreadLocalUtil.get("threadLocalKey"), nullValue());
-    }
-}
diff --git a/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml b/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml
index df02b58..1abf11f 100644
--- a/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml
+++ b/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml
@@ -79,6 +79,8 @@
                 <!-- modules ignore -->
                 <exclude>shenyu-integrated-test/**</exclude>
                 <exclude>shenyu-examples/**</exclude>
+                <exclude>shenyu-admin/src/main/resources/static/*.css</exclude>
+                <exclude>shenyu-admin/src/main/resources/static/*.js</exclude>
             </excludes>
         </fileSet>
     </fileSets>