Skip to content

Commit

Permalink
Add: plugin support dcache
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruanshudong
ruanshudong committed Jun 10, 2022
1 parent 92e3431 commit bd01786
Show file tree
Hide file tree
Showing 37 changed files with 407 additions and 1,025 deletions.
2 changes: 1 addition & 1 deletion app/dao/PluginDao.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const PluginDao = {};

PluginDao.listPlugins = async (type) => {

console.log(type);
// console.log(type);

if (type) {
return await tPlugin.findAll({
Expand Down
13 changes: 10 additions & 3 deletions app/dao/db/db_tars_web_models/t_plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ module.exports = function (sequelize, DataTypes) {
type: DataTypes.STRING(64),
allowNull: false,
defaultValue: '',
unique: "obj"
},
f_path: {
type: DataTypes.STRING(64),
allowNull: false,
defaultValue: '',
unique: "path"
},
f_type: {
type: DataTypes.INTEGER,
Expand All @@ -63,6 +61,15 @@ module.exports = function (sequelize, DataTypes) {
},
}, {
tableName: 't_plugin',
timestamps: false
timestamps: false,
indexes: [{
unique: true,
fields: ['f_obj', 'f_type']
},
{
unique: true,
fields: ['f_path']
}
]
});
};
9 changes: 6 additions & 3 deletions app/service/server/TreeService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,13 @@ TreeService.setCacheData = async (isRefresh) => {
TreeService.setCacheData()

TreeService.getDCacheCommonServer = () => {
return ['DCacheOptServer', 'ConfigServer', 'PropertyServer'];
return ['DCacheOptServer', 'ConfigServer', 'PropertyServer', 'DCacheWebServer'];
}

TreeService.isDCacheCommonServer = (server_name) => {
return server_name === 'DCacheOptServer' ||
server_name === 'ConfigServer' ||
server_name === 'DCacheWebServer' ||
server_name === 'PropertyServer';
}

Expand All @@ -274,13 +275,15 @@ TreeService.getCacheData = async (searchKey, uid, type) => {
// 过滤Dcache
if (type && type === '1') {
// 应用服务
// serverList = serverList.filter(item => item.application !== 'DCache' || (item.application === 'DCache' && TreeService.isDCacheCommonServer(item.server_name)))
serverList = serverList.filter(item => item.application !== 'DCache')
serverList = serverList.filter(item => item.application !== 'DCache' || (item.application === 'DCache' && TreeService.isDCacheCommonServer(item.server_name)))
// serverList = serverList.filter(item => item.application !== 'DCache' || TreeService.isDCacheCommonServer(item.server_name))
} else if (type === '2') {
// DCache
serverList = serverList.filter(item => item.application === 'DCache' && TreeService.isDCacheCommonServer(item.server_name))
}

// console.log(type, serverList);

if (!await AuthService.isAdmin(uid)) {

let auths = await AuthService.getAuthListByUid(uid);
Expand Down
4 changes: 4 additions & 0 deletions client/dist/adminPass.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.7cd6bb2e.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/adminPass.d00768d0.js rel=preload as=script><link href=/static/js/chunk-common.3b4e2581.js rel=preload as=script><link href=/static/js/chunk-vendors.773edb03.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.7cd6bb2e.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.773edb03.js></script><script src=/static/js/chunk-common.3b4e2581.js></script><script src=/static/js/adminPass.d00768d0.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.f35213f9.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/adminPass.82fc795e.js rel=preload as=script><link href=/static/js/chunk-common.d50672e2.js rel=preload as=script><link href=/static/js/chunk-vendors.b346cee7.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f35213f9.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.b346cee7.js></script><script src=/static/js/chunk-common.d50672e2.js></script><script src=/static/js/adminPass.82fc795e.js></script></body></html>
>>>>>>> Add: support plugins (gateway)
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.42b5e95d.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/adminPass.82fc795e.js rel=preload as=script><link href=/static/js/chunk-common.d1edd95a.js rel=preload as=script><link href=/static/js/chunk-vendors.b3534318.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.42b5e95d.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.b3534318.js></script><script src=/static/js/chunk-common.d1edd95a.js></script><script src=/static/js/adminPass.82fc795e.js></script></body></html>
>>>>>>> Add: remove interface debug, use plugins to imp interface debug &
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.f8c999bc.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/adminPass.82fc795e.js rel=preload as=script><link href=/static/js/chunk-common.6e581e28.js rel=preload as=script><link href=/static/js/chunk-vendors.2b167fc9.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f8c999bc.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.2b167fc9.js></script><script src=/static/js/chunk-common.6e581e28.js></script><script src=/static/js/adminPass.82fc795e.js></script></body></html>
>>>>>>> Add: plugin support dcache
4 changes: 4 additions & 0 deletions client/dist/auth.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.be9339f4.css rel=preload as=style><link href=/static/css/chunk-common.7cd6bb2e.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/auth.a4b30d13.js rel=preload as=script><link href=/static/js/chunk-common.3b4e2581.js rel=preload as=script><link href=/static/js/chunk-vendors.773edb03.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.7cd6bb2e.css rel=stylesheet><link href=/static/css/auth.be9339f4.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.773edb03.js></script><script src=/static/js/chunk-common.3b4e2581.js></script><script src=/static/js/auth.a4b30d13.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.be9339f4.css rel=preload as=style><link href=/static/css/chunk-common.f35213f9.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/auth.0204e5ad.js rel=preload as=script><link href=/static/js/chunk-common.d50672e2.js rel=preload as=script><link href=/static/js/chunk-vendors.b346cee7.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f35213f9.css rel=stylesheet><link href=/static/css/auth.be9339f4.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.b346cee7.js></script><script src=/static/js/chunk-common.d50672e2.js></script><script src=/static/js/auth.0204e5ad.js></script></body></html>
>>>>>>> Add: support plugins (gateway)
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.be9339f4.css rel=preload as=style><link href=/static/css/chunk-common.42b5e95d.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/auth.0204e5ad.js rel=preload as=script><link href=/static/js/chunk-common.d1edd95a.js rel=preload as=script><link href=/static/js/chunk-vendors.b3534318.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.42b5e95d.css rel=stylesheet><link href=/static/css/auth.be9339f4.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.b3534318.js></script><script src=/static/js/chunk-common.d1edd95a.js></script><script src=/static/js/auth.0204e5ad.js></script></body></html>
>>>>>>> Add: remove interface debug, use plugins to imp interface debug &
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.be9339f4.css rel=preload as=style><link href=/static/css/chunk-common.f8c999bc.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/js/auth.0204e5ad.js rel=preload as=script><link href=/static/js/chunk-common.6e581e28.js rel=preload as=script><link href=/static/js/chunk-vendors.2b167fc9.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f8c999bc.css rel=stylesheet><link href=/static/css/auth.be9339f4.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.2b167fc9.js></script><script src=/static/js/chunk-common.6e581e28.js></script><script src=/static/js/auth.0204e5ad.js></script></body></html>
>>>>>>> Add: plugin support dcache
4 changes: 4 additions & 0 deletions client/dist/dcache.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.7cd6bb2e.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/dcache.ddf7524f.css rel=preload as=style><link href=/static/js/chunk-common.3b4e2581.js rel=preload as=script><link href=/static/js/chunk-vendors.773edb03.js rel=preload as=script><link href=/static/js/dcache.2603031c.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.7cd6bb2e.css rel=stylesheet><link href=/static/css/dcache.ddf7524f.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.773edb03.js></script><script src=/static/js/chunk-common.3b4e2581.js></script><script src=/static/js/dcache.2603031c.js></script></body></html>
=======
<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.f35213f9.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/dcache.ddf7524f.css rel=preload as=style><link href=/static/js/chunk-common.d50672e2.js rel=preload as=script><link href=/static/js/chunk-vendors.b346cee7.js rel=preload as=script><link href=/static/js/dcache.f159c500.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f35213f9.css rel=stylesheet><link href=/static/css/dcache.ddf7524f.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.b346cee7.js></script><script src=/static/js/chunk-common.d50672e2.js></script><script src=/static/js/dcache.f159c500.js></script></body></html>
>>>>>>> Add: support plugins (gateway)
=======
<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.42b5e95d.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/dcache.ddf7524f.css rel=preload as=style><link href=/static/js/chunk-common.d1edd95a.js rel=preload as=script><link href=/static/js/chunk-vendors.b3534318.js rel=preload as=script><link href=/static/js/dcache.56613590.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.42b5e95d.css rel=stylesheet><link href=/static/css/dcache.ddf7524f.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.b3534318.js></script><script src=/static/js/chunk-common.d1edd95a.js></script><script src=/static/js/dcache.56613590.js></script></body></html>
>>>>>>> Add: remove interface debug, use plugins to imp interface debug &
=======
<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.f8c999bc.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/dcache.ddf7524f.css rel=preload as=style><link href=/static/js/chunk-common.6e581e28.js rel=preload as=script><link href=/static/js/chunk-vendors.2b167fc9.js rel=preload as=script><link href=/static/js/dcache.3ac0fd52.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f8c999bc.css rel=stylesheet><link href=/static/css/dcache.ddf7524f.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.2b167fc9.js></script><script src=/static/js/chunk-common.6e581e28.js></script><script src=/static/js/dcache.3ac0fd52.js></script></body></html>
>>>>>>> Add: plugin support dcache
2 changes: 1 addition & 1 deletion client/dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.42b5e95d.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/index.4eae33bb.css rel=preload as=style><link href=/static/js/chunk-common.d1edd95a.js rel=preload as=script><link href=/static/js/chunk-vendors.b3534318.js rel=preload as=script><link href=/static/js/index.f7467baf.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.42b5e95d.css rel=stylesheet><link href=/static/css/index.4eae33bb.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.b3534318.js></script><script src=/static/js/chunk-common.d1edd95a.js></script><script src=/static/js/index.f7467baf.js></script></body></html>
<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.f8c999bc.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/index.4fb1e4ef.css rel=preload as=style><link href=/static/js/chunk-common.6e581e28.js rel=preload as=script><link href=/static/js/chunk-vendors.2b167fc9.js rel=preload as=script><link href=/static/js/index.308c3cb7.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.f8c999bc.css rel=stylesheet><link href=/static/css/index.4fb1e4ef.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.2b167fc9.js></script><script src=/static/js/chunk-common.6e581e28.js></script><script src=/static/js/index.308c3cb7.js></script></body></html>
Loading

0 comments on commit bd01786

Please sign in to comment.