Skip to content

FIX：修复认证鉴权取配置无效 #2377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dynaia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX：修复认证鉴权取配置无效 #2377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions .../src/main/java/com/dianping/cat/system/page/login/service/DefaultCatPropertyProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,26 @@
*/
package com.dianping.cat.system.page.login.service;

import org.apache.commons.lang3.StringUtils;

// Component
public class DefaultCatPropertyProvider implements CatPropertyProvider {
public String getProperty(final String name, final String defaultValue) {
String value = null;
public String getProperty(final String name, final String defaultValue) {
String value = null;

// try to get value from system properties, -D<name>=<value>
if (value == null) {
value = System.getProperty(name);
}
// try to get value from system properties, -D<name>=<value>
if (value == null) {
value = System.getProperty(name);
}

// try to get value from environment variable
if (value == null) {
value = System.getenv(name);
}
// try to get value from environment variable
if (value == null) {
value = System.getenv(name);
}

return defaultValue;
}
if (StringUtils.isBlank(value)) {
return defaultValue;
}
return value;
}
}