This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new a651e69 fix shaUtils (#2979)
a651e69 is described below
commit a651e69251d5ecd8c1da258f1e5a28276b4494cc
Author: erdengk <[email protected]>
AuthorDate: Fri Mar 4 18:47:02 2022 +0800
fix shaUtils (#2979)
---
script/2.4.2-upgrade-2.4.3-mysql.sql | 2 +-
script/2.4.2-upgrade-2.4.3-pg.sql | 2 +-
shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java | 3 +++
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 2 +-
shenyu-admin/src/main/resources/sql-script/mysql/schema.sql | 2 +-
shenyu-admin/src/main/resources/sql-script/pg/schema.sql | 2 +-
.../src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java | 2 +-
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/script/2.4.2-upgrade-2.4.3-mysql.sql
b/script/2.4.2-upgrade-2.4.3-mysql.sql
index fa48aec..9f70c46 100644
--- a/script/2.4.2-upgrade-2.4.3-mysql.sql
+++ b/script/2.4.2-upgrade-2.4.3-mysql.sql
@@ -17,7 +17,7 @@
-- this file works for MySQL.
-- update admin password
-UPDATE dashboard_user SET
password='ba3253876aed6bc22d4a6ff53d846c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413'
WHERE user_name = 'admin';
+UPDATE dashboard_user SET
password='ba3253876aed6bc22d4a6ff53d8406c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413'
WHERE user_name = 'admin';
-- Note: it doesn't matter if you don't execute this SQL, the default
configuration will be compatible with the old version
-- Note: because most users have changed ZK configuration, this SQL is
annotated to prevent erroneous execution
diff --git a/script/2.4.2-upgrade-2.4.3-pg.sql
b/script/2.4.2-upgrade-2.4.3-pg.sql
index d5acc1a..5fa88cf 100644
--- a/script/2.4.2-upgrade-2.4.3-pg.sql
+++ b/script/2.4.2-upgrade-2.4.3-pg.sql
@@ -17,7 +17,7 @@
-- this file works for PostgreSQL, can not use "`" syntax.
-- update admin password
-UPDATE dashboard_user SET
password='ba3253876aed6bc22d4a6ff53d846c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413'
WHERE user_name = 'admin';
+UPDATE dashboard_user SET
password='ba3253876aed6bc22d4a6ff53d8406c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413'
WHERE user_name = 'admin';
-- Note: it doesn't matter if you don't execute this SQL, the default
configuration will be compatible with the old version
-- Note: because most users have changed ZK configuration, this SQL is
annotated to prevent erroneous execution
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
index f460da2..a10eacf 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
@@ -47,6 +47,9 @@ public class ShaUtils {
StringBuffer strHexString = new StringBuffer();
for (byte b:byteBuffer) {
String hex = Integer.toHexString(0xff & b);
+ if (hex.length() == 1) {
+ strHexString.append('0');
+ }
strHexString.append(hex);
}
return strHexString.toString();
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index 6b022b8..07ec38f 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -253,7 +253,7 @@ CREATE TABLE IF NOT EXISTS `data_permission` (
);;
/**default admin user**/
-INSERT IGNORE INTO `dashboard_user` (`id`, `user_name`, `password`, `role`,
`enabled`, `date_created`, `date_updated`) VALUES
('1','admin','ba3253876aed6bc22d4a6ff53d846c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413',
'1', '1', '2018-06-23 15:12:22', '2018-06-23 15:12:23');;
+INSERT IGNORE INTO `dashboard_user` (`id`, `user_name`, `password`, `role`,
`enabled`, `date_created`, `date_updated`) VALUES
('1','admin','ba3253876aed6bc22d4a6ff53d8406c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413',
'1', '1', '2018-06-23 15:12:22', '2018-06-23 15:12:23');;
/** insert admin role */
INSERT IGNORE INTO `user_role` (`id`, `user_id`, `role_id`, `date_created`,
`date_updated`) VALUES ('1351007709096976384', '1', '1346358560427216896',
'2021-01-18 11:25:13', '2021-01-18 11:25:13');;
diff --git a/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
b/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
index b6a34e1..713c972 100644
--- a/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
@@ -267,7 +267,7 @@ CREATE TABLE IF NOT EXISTS `data_permission` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
ROW_FORMAT=DYNAMIC COMMENT='data permission table';;
/**default admin user**/
-INSERT IGNORE INTO `dashboard_user` (`id`, `user_name`, `password`, `role`,
`enabled`, `date_created`, `date_updated`) VALUES
('1','admin','ba3253876aed6bc22d4a6ff53d846c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413',
'1', '1', '2018-06-23 15:12:22', '2018-06-23 15:12:23');;
+INSERT IGNORE INTO `dashboard_user` (`id`, `user_name`, `password`, `role`,
`enabled`, `date_created`, `date_updated`) VALUES
('1','admin','ba3253876aed6bc22d4a6ff53d8406c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413',
'1', '1', '2018-06-23 15:12:22', '2018-06-23 15:12:23');;
/** insert admin role */
INSERT IGNORE INTO `user_role` (`id`, `user_id`, `role_id`, `date_created`,
`date_updated`) VALUES ('1351007709096976384', '1', '1346358560427216896',
'2021-01-18 11:25:13', '2021-01-18 11:25:13');;
diff --git a/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
b/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
index ba58c81..79d8e52 100644
--- a/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
@@ -201,7 +201,7 @@ ELSE
PERFORM public.dblink_exec('init_conn', ' COMMENT ON COLUMN
"dashboard_user"."enabled" IS ''' || 'delete or not' || '''');
PERFORM public.dblink_exec('init_conn', ' COMMENT ON COLUMN
"dashboard_user"."date_created" IS ''' || 'create time' || '''');
PERFORM public.dblink_exec('init_conn', ' COMMENT ON COLUMN
"dashboard_user"."date_updated" IS ''' || 'update time' || '''');
- PERFORM public.dblink_exec('init_conn', 'INSERT INTO "dashboard_user"
VALUES (''' || '1' || ''', ''' || 'admin' || ''', ''' ||
'ba3253876aed6bc22d4a6ff53d846c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413'
|| ''', 1, 1, ''' || '2018-06-23 15:12:22' || ''', ''' || '2018-06-23
15:12:23' || ''');');
+ PERFORM public.dblink_exec('init_conn', 'INSERT INTO "dashboard_user"
VALUES (''' || '1' || ''', ''' || 'admin' || ''', ''' ||
'ba3253876aed6bc22d4a6ff53d8406c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413'
|| ''', 1, 1, ''' || '2018-06-23 15:12:22' || ''', ''' || '2018-06-23
15:12:23' || ''');');
-- ----------------------------
-- Indexes structure for table dashboard_user
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
index ed49c65..11f3826 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
@@ -30,7 +30,7 @@ public final class ShaUtilsTest {
@Test
public void testShaEncryption() {
- assertThat(ShaUtils.shaEncryption("123456"),
is("ba3253876aed6bc22d4a6ff53d846c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413"));
+ assertThat(ShaUtils.shaEncryption("123456"),
is("ba3253876aed6bc22d4a6ff53d8406c6ad864195ed144ab5c87621b6c233b548baeae6956df346ec8c17f5ea10f35ee3cbc514797ed7ddd3145464e2a0bab413"));
}
@Test
