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/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 07127d374 fix (admin) h2-sql bug and update front-end (#4778)
07127d374 is described below
commit 07127d374d4492d5ad72a076466b5e0778fd345f
Author: lulu <[email protected]>
AuthorDate: Thu Jun 29 10:59:16 2023 +0800
fix (admin) h2-sql bug and update front-end (#4778)
Co-authored-by: dragon-zhang <[email protected]>
---
.../src/main/resources/sql-script/h2/schema.sql | 23 ----------------------
.../src/main/resources/static/index.082a3f8f.js | 1 +
.../src/main/resources/static/index.53599afd.js | 1 -
.../{index.4ff1f7da.css => index.e415c252.css} | 6 +++---
shenyu-admin/src/main/resources/static/index.html | 4 ++--
5 files changed, 6 insertions(+), 29 deletions(-)
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 5421fa49d..a3971a9ce 100755
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -1056,39 +1056,16 @@ CREATE TABLE `proxy_selector`
PRIMARY KEY (`id`)
);
--- ----------------------------
--- Table structure for discovery_handler
--- ----------------------------
-CREATE TABLE `discovery_handler`
-(
- `id` varchar(128) NOT NULL COMMENT 'primary key id',
- `discovery_id` varchar(128) NOT NULL COMMENT 'the discovery id',
- `handler` varchar(255) NOT NULL COMMENT 'the handler',
- `listener_node` varchar(255) COMMENT 'register server listener to node',
- `props` text COMMENT 'the discovery pops (json) ',
- `date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
- `date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON
UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
- PRIMARY KEY (`id`)
-) ;
-
-- ----------------------------
-- Table structure for discovery_rel
-- ----------------------------
CREATE TABLE `discovery_rel`
(
-<<<<<<< HEAD
`id` varchar(128) NOT NULL COMMENT 'primary key id',
`plugin_name` varchar(255) NOT NULL COMMENT 'the plugin name',
`discovery_handler_id` varchar(128) NOT NULL COMMENT 'the discovery
handler id',
`selector_id` varchar(128) COMMENT 'the selector id ',
`proxy_selector_id` varchar(128) COMMENT 'the proxy selector id',
-=======
- `id` varchar(128) NOT NULL COMMENT 'primary key id',
- `level` varchar(64) NOT NULL COMMENT 'plugin or selector',
- `discovery_handler_id` varchar(128) NOT NULL COMMENT 'the discovery
handler id',
- `selector_id` varchar(128) COMMENT 'the selector id ',
- `proxy_selector_id` varchar(128) COMMENT 'the proxy selector id',
->>>>>>> 9ec3317b754dfd78d21e332073eac76f7347a2ed
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON
UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
PRIMARY KEY (`id`)
diff --git a/shenyu-admin/src/main/resources/static/index.082a3f8f.js
b/shenyu-admin/src/main/resources/static/index.082a3f8f.js
new file mode 100644
index 000000000..d7344f178
--- /dev/null
+++ b/shenyu-admin/src/main/resources/static/index.082a3f8f.js
@@ -0,0 +1 @@
+!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/",t(t.s="lVK7")}({"+0it":function(e,t,n){"u
[...]
\ No newline at end of file
diff --git a/shenyu-admin/src/main/resources/static/index.53599afd.js
b/shenyu-admin/src/main/resources/static/index.53599afd.js
deleted file mode 100644
index cbe59c324..000000000
--- a/shenyu-admin/src/main/resources/static/index.53599afd.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
o=n[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var
n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/",t(t.s="lVK7")}({"+0it":function(e,t,n){"u
[...]
\ No newline at end of file
diff --git a/shenyu-admin/src/main/resources/static/index.4ff1f7da.css
b/shenyu-admin/src/main/resources/static/index.e415c252.css
similarity index 82%
rename from shenyu-admin/src/main/resources/static/index.4ff1f7da.css
rename to shenyu-admin/src/main/resources/static/index.e415c252.css
index 14b77d70f..7bf1c8796 100644
--- a/shenyu-admin/src/main/resources/static/index.4ff1f7da.css
+++ b/shenyu-admin/src/main/resources/static/index.e415c252.css
@@ -1,5 +1,5 @@
-#root,body,html{height:100%}.plug-content-wrap{padding:24px}.open{color:#14c974}.close{color:#ff586d}.ant-layout{min-height:100%}ol,ul{list-style:none}.ant-table{background:#fff}.table-selected{background:#98cdff}.edit{cursor:pointer}.edit,.edit:hover{color:#1890ff}.searchblock{display:-ms-flexbox!important;display:flex!important}.searchblock
button{margin-left:30px}.ant-table
table{padding:0!important}.ant-table-small>.ant-table-content>.ant-table-body{margin:0!important}.table-header{d
[...]
- /*! autoprefixer: ignore next
*/-webkit-box-orient:vertical;overflow:hidden}.layout___1o3Ic{display:-ms-flexbox;display:flex;padding-left:5px}.headerSearch___2Y3tE{display:-ms-flexbox;display:flex;-ms-flex-pack:justify;justify-content:space-between;margin-left:10px}.headerSearch___2Y3tE
.search___3wHRQ{margin-right:10px}.headerSearch___2Y3tE .search___3wHRQ
.ant-input{margin-top:4px}.condition___2uVb3{margin-top:8px}.condition___2uVb3
.addButton___2zrK1{width:100%}.ruleConditions___26i [...]
+#root,body,html{height:100%}.plug-content-wrap{padding:24px}.open{color:#14c974}.close{color:#ff586d}.ant-layout{min-height:100%}ol,ul{list-style:none}.ant-table{background:#fff}.table-selected{background:#98cdff}.edit{cursor:pointer}.edit,.edit:hover{color:#1890ff}.searchblock{display:-ms-flexbox!important;display:flex!important}.searchblock
button{margin-left:30px}.ant-table
table{padding:0!important}.ant-table-small>.ant-table-content>.ant-table-body{margin:0!important}.table-header{d
[...]
+ /*! autoprefixer: ignore next
*/-webkit-box-orient:vertical;overflow:hidden}.cardTag___1KkR7{min-width:200px;height:32px;border:1px
solid
hsla(0,1%,43%,.4);border-radius:5px;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;-ms-flex-align:center;align-items:center;margin-right:30px}.cardInput___2-LWG{max-width:50%}.main___u9oOO{width:100%;height:100%;padding:24px}.header___KyTfh,.main___u9oOO{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-dir
[...]
*
* antd v3.26.20
*
@@ -7,4 +7,4 @@
* All rights reserved.
*
*/body,html{width:100%;height:100%}input::-ms-clear,input::-ms-reveal{display:none}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:rgba(0,0,0,0)}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;color:rgba(0,0,0,.65);font-si
[...]
- /*! autoprefixer: ignore next
*/-webkit-box-orient:vertical;overflow:hidden}.ant-upload{-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;color:rgba(0,0,0,.65);font-size:14px;font-variant:tabular-nums;line-height:1.5;list-style:none;-webkit-font-feature-settings:"tnum";font-feature-settings:"tnum";outline:0}.ant-upload
p{margin:0}.ant-upload-btn{display:block;width:100%;outline:none}.ant-upload
input[type=file]{cursor:pointer}.ant-upload.ant-upload-select{display:i [...]
\ No newline at end of file
+ /*! autoprefixer: ignore next
*/-webkit-box-orient:vertical;overflow:hidden}.ant-upload{-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;color:rgba(0,0,0,.65);font-size:14px;font-variant:tabular-nums;line-height:1.5;list-style:none;-webkit-font-feature-settings:"tnum";font-feature-settings:"tnum";outline:0}.ant-upload
p{margin:0}.ant-upload-btn{display:block;width:100%;outline:none}.ant-upload
input[type=file]{cursor:pointer}.ant-upload.ant-upload-select{display:i [...]
\ No newline at end of file
diff --git a/shenyu-admin/src/main/resources/static/index.html
b/shenyu-admin/src/main/resources/static/index.html
index 1fab957ae..615d32543 100644
--- a/shenyu-admin/src/main/resources/static/index.html
+++ b/shenyu-admin/src/main/resources/static/index.html
@@ -24,11 +24,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Apache ShenYu Gateway</title>
<link rel="icon" href="/favicon.ico" type="image/x-icon">
-<link href="/index.4ff1f7da.css" rel="stylesheet"></head>
+<link href="/index.e415c252.css" rel="stylesheet"></head>
<body>
<div id="httpPath" style="display: none" th:text="${domain}"></div>
<div id="root"></div>
-<script type="text/javascript" src="/index.53599afd.js"></script></body>
+<script type="text/javascript" src="/index.082a3f8f.js"></script></body>
</html>
