diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java index f927f299..84b8fcfe 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java @@ -182,7 +182,7 @@ public abstract class AbstractBeanFactory implements BeanFactory, BeanRegistry, @Override public void registerBean(Object obj, String name) throws BeanException { Assert.notNull(obj, "被注册的bean实例不能为空!"); - Assert.notNull(obj, "被注册的bean名称不能为空!"); + Assert.notEmpty(name, "被注册的bean名称不能为空!"); synchronized (mutex) { if (hasBean(obj.getClass(), name)) { throw new BeanException(String.format("Bean[type:%s name:%s] 已存在,不能重复注册!", obj.getClass().getName(), name)); diff --git a/neutrino-proxy-admin/favicon.ico b/neutrino-proxy-admin/favicon.ico index 34b63ac6..4f72f9f5 100644 Binary files a/neutrino-proxy-admin/favicon.ico and b/neutrino-proxy-admin/favicon.ico differ diff --git a/neutrino-proxy-admin/index.html b/neutrino-proxy-admin/index.html index a485ce88..f3690285 100644 --- a/neutrino-proxy-admin/index.html +++ b/neutrino-proxy-admin/index.html @@ -5,7 +5,7 @@ - vue-element-admin + 中微子代理 diff --git a/neutrino-proxy-admin/src/views/login/index.vue b/neutrino-proxy-admin/src/views/login/index.vue index 0ea1764d..9bd2d7a5 100644 --- a/neutrino-proxy-admin/src/views/login/index.vue +++ b/neutrino-proxy-admin/src/views/login/index.vue @@ -3,7 +3,6 @@

{{$t('login.title')}}

-
- - - {{$t('login.thirdpartyTips')}} -
-
-
- -
- diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java index 4bffe280..83541167 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java @@ -23,9 +23,7 @@ package fun.asgc.neutrino.proxy.server; import fun.asgc.neutrino.core.annotation.NeutrinoApplication; -import fun.asgc.neutrino.core.base.GlobalConfig; import fun.asgc.neutrino.core.context.NeutrinoLauncher; -import fun.asgc.neutrino.core.util.SystemUtil; /** *