Skip to content

The Unified and Autonomous Development Platform

HA support for avatars

Robin Shen2c8477bbb9aa
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index 9a4f896ac9..6f7c470092 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -306,7 +306,7 @@ public class Upgrade extends AbstractPlugin {
if (ret == 0) {
logger.info("Updating program files...");
- updateProgramFiles(upgradeDir);
+ updateProgramFiles(upgradeDir, oldDataVersion.get());
logger.info("Restoring database with new program...");
ret = buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {
@@ -333,7 +333,7 @@ public class Upgrade extends AbstractPlugin {
} else {
logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
- updateProgramFiles(upgradeDir);
+ updateProgramFiles(upgradeDir, oldDataVersion.get());
}
} catch (Exception e) {
logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
@@ -414,7 +414,7 @@ public class Upgrade extends AbstractPlugin {
}
}
- protected void updateProgramFiles(File upgradeDir) {
+ protected void updateProgramFiles(File upgradeDir, int oldDataVersion) {
cleanAndCopy(new File(Bootstrap.installDir, "3rdparty-licenses"), new File(upgradeDir, "3rdparty-licenses"));
File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");
@@ -554,16 +554,49 @@ public class Upgrade extends AbstractPlugin {
}
}
- FileUtils.createDir(new File(upgradeDir, "site/assets/root"));
- if (new File(upgradeDir, "site/assets/robots.txt").exists()) {
- try {
- FileUtils.copyFile(
- new File(upgradeDir, "site/assets/robots.txt"),
- new File(upgradeDir, "site/assets/root/robots.txt"));
- FileUtils.deleteFile(new File(upgradeDir, "site/assets/robots.txt"));
- } catch (IOException e) {
- throw new RuntimeException(e);
+ if (oldDataVersion <= 102) {
+ File assetsRootDir = new File(upgradeDir, "site/assets/root");
+ FileUtils.createDir(assetsRootDir);
+ if (new File(upgradeDir, "site/assets/robots.txt").exists()) {
+ try {
+ FileUtils.copyFile(
+ new File(upgradeDir, "site/assets/robots.txt"),
+ new File(assetsRootDir, "robots.txt"));
+ FileUtils.deleteFile(new File(upgradeDir, "site/assets/robots.txt"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ for (File file: assetsRootDir.listFiles()) {
+ try {
+ FileUtils.moveToDirectory(file, new File(upgradeDir, "site/assets"), true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ FileUtils.deleteDir(assetsRootDir);
+
+ File usersDir = new File(upgradeDir, "site/users");
+ if (usersDir.exists()) {
+ for (File file: usersDir.listFiles()) {
+ File oldVisitInfoDir = new File(file, "info");
+ File projectDir = new File(upgradeDir, "site/projects/" + file.getName());
+ if (oldVisitInfoDir.exists() && projectDir.exists()) {
+ File newVisitInfoDir = new File(projectDir, "info/visit");
+ FileUtils.createDir(newVisitInfoDir.getParentFile());
+ FileUtils.deleteDir(newVisitInfoDir);
+ try {
+ FileUtils.moveDirectory(oldVisitInfoDir, newVisitInfoDir);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ FileUtils.deleteDir(usersDir);
}
+ FileUtils.deleteDir(new File(upgradeDir, "site/info"));
}
try {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 97e78bf318..2ef5d512fe 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -541,7 +541,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
checkGitHooksAndConfig(to.getId());
commitInfoManager.cloneInfo(from.getId(), to.getId());
- avatarManager.copyAvatar(from, to);
+ avatarManager.copyProjectAvatar(from.getId(), to.getId());
updateStorageServer(to);
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultVisitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultVisitInfoManager.java
index 8160a1e842..4701071b11 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultVisitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultVisitInfoManager.java
@@ -52,13 +52,13 @@ public class DefaultVisitInfoManager extends AbstractMultiEnvironmentManager
private static final String INFO_DIR = "visit";
- private static final String PULL_REQUEST_STORE = "pullRequest";
+ private static final String PULL_REQUEST_STORE = "pullRequestVisit";
- private static final String PULL_REQUEST_CODE_COMMENT_STORE = "pullRequestCodeComment";
+ private static final String PULL_REQUEST_CODE_COMMENT_STORE = "pullRequestCodeCommentsVisit";
- private static final String CODE_COMMENT_STORE = "codeComment";
+ private static final String CODE_COMMENT_STORE = "codeCommentVisit";
- private static final String ISSUE_STORE = "issue";
+ private static final String ISSUE_STORE = "issueVisit";
private final StorageManager storageManager;
diff --git a/server-core/src/main/java/io/onedev/server/jetty/FileAssetServlet.java b/server-core/src/main/java/io/onedev/server/jetty/FileAssetServlet.java
index 9eb20e5905..bfd679c424 100644
--- a/server-core/src/main/java/io/onedev/server/jetty/FileAssetServlet.java
+++ b/server-core/src/main/java/io/onedev/server/jetty/FileAssetServlet.java
@@ -7,6 +7,8 @@ import java.net.URL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Preconditions;
+
/**
* This servlet serves static web assets from file system.
*
@@ -38,6 +40,8 @@ public class FileAssetServlet extends AssetServlet {
relativePath, assetDir.getAbsolutePath());
}
+ Preconditions.checkArgument(!relativePath.contains(".."));
+
File assetFile = new File(assetDir, relativePath);
if (assetFile.exists()) {
try {
diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
index 9d2de5fd2a..ce4a9e4ce3 100644
--- a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
@@ -178,9 +178,7 @@ public class DefaultStorageManager implements StorageManager, Serializable {
});
}
- }
-
- if (event.getEntity() instanceof Build) {
+ } else if (event.getEntity() instanceof Build) {
Build build = (Build) event.getEntity();
Long projectId = build.getProject().getId();
Long buildNumber = build.getNumber();
@@ -210,9 +208,7 @@ public class DefaultStorageManager implements StorageManager, Serializable {
}
});
-
}
-
}
@Override
@@ -223,5 +219,5 @@ public class DefaultStorageManager implements StorageManager, Serializable {
throw new RuntimeException(e);
}
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java
index 9e9fef2252..e6781cca28 100644
--- a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java
@@ -6,26 +6,23 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.PersonIdent;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-
public interface AvatarManager {
- String getAvatarUrl(User user);
+ String getUserAvatarUrl(Long userId);
- String getAvatarUrl(PersonIdent personIdent);
+ String getPersonAvatarUrl(PersonIdent personIdent);
- String getAvatarUrl(Long projectId);
+ String getProjectAvatarUrl(Long projectId);
- void useAvatar(User user, @Nullable String avatarData);
+ void useUserAvatar(Long userId, @Nullable String avatarData);
- void useAvatar(Project project, @Nullable String avatarData);
+ void useProjectAvatar(Long projectId, @Nullable String avatarData);
- File getUploaded(User user);
+ File getUserUploaded(Long userId);
- File getUploaded(Long projectId);
+ File getProjectUploaded(Long projectId);
- void copyAvatar(Project from, Project to);
+ void copyProjectAvatar(Long fromProjectId, Long toProjectId);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java
index 86d209efe5..34226bebfe 100644
--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java
@@ -3,6 +3,8 @@ package io.onedev.server.web.avatar;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.locks.Lock;
@@ -17,47 +19,61 @@ import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import io.onedev.commons.bootstrap.Bootstrap;
+import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.EmailAddress;
-import io.onedev.server.model.Project;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.util.facade.EmailAddressFacade;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.avatarupload.AvatarUploadField;
@Singleton
-public class DefaultAvatarManager implements AvatarManager {
+public class DefaultAvatarManager implements AvatarManager, Serializable {
private static final int GRAVATAR_SIZE = 256;
- private static final String AVATARS_BASE_URL = "/site/avatars/";
+ private static final String AVATARS_BASE_URL = "/avatars/";
private final SettingManager settingManager;
+ private final UserManager userManager;
+
private final EmailAddressManager emailAddressManager;
+ private final ClusterManager clusterManager;
+
@Inject
- public DefaultAvatarManager(SettingManager settingManager, EmailAddressManager emailAddressManager) {
+ public DefaultAvatarManager(SettingManager settingManager, UserManager userManager,
+ EmailAddressManager emailAddressManager, ClusterManager clusterManager) {
this.settingManager = settingManager;
+ this.userManager = userManager;
this.emailAddressManager = emailAddressManager;
+ this.clusterManager = clusterManager;
+ }
+
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(AvatarManager.class);
}
- @Sessional
@Override
- public String getAvatarUrl(User user) {
- if (user.isUnknown()) {
+ public String getUserAvatarUrl(Long userId) {
+ if (userId.equals(User.UNKNOWN_ID)) {
return AVATARS_BASE_URL + "user.png";
- } else if (user.isSystem()) {
+ } else if (userId.equals(User.SYSTEM_ID)) {
return AVATARS_BASE_URL + "onedev.png";
} else {
- File uploadedFile = getUploaded(user);
+ File uploadedFile = getUserUploaded(userId);
if (uploadedFile.exists())
- return AVATARS_BASE_URL + "uploaded/users/" + user.getId() + ".jpg?version=" + uploadedFile.lastModified();
+ return AVATARS_BASE_URL + "uploaded/users/" + userId + ".jpg?version=" + uploadedFile.lastModified();
- EmailAddress emailAddress = user.getPrimaryEmailAddress();
+ EmailAddressFacade emailAddress = emailAddressManager.findPrimaryFacade(userId);
+ UserFacade user = userManager.findFacadeById(userId);
if (emailAddress == null || !emailAddress.isVerified())
return generateAvatar(user.getName(), null);
else if (settingManager.getSystemSetting().isGravatarEnabled())
@@ -67,15 +83,14 @@ public class DefaultAvatarManager implements AvatarManager {
}
}
- @Sessional
@Override
- public String getAvatarUrl(PersonIdent personIdent) {
+ public String getPersonAvatarUrl(PersonIdent personIdent) {
if (personIdent.getName().equals(User.SYSTEM_NAME)) {
return AVATARS_BASE_URL + "onedev.png";
} else {
- EmailAddress emailAddress = emailAddressManager.findByValue(personIdent.getEmailAddress());
+ EmailAddressFacade emailAddress = emailAddressManager.findFacadeByValue(personIdent.getEmailAddress());
if (emailAddress != null && emailAddress.isVerified()) {
- return getAvatarUrl(emailAddress.getOwner());
+ return getUserAvatarUrl(emailAddress.getOwnerId());
} else if (settingManager.getSystemSetting().isGravatarEnabled()
&& StringUtils.isNotBlank(personIdent.getEmailAddress())) {
return Gravatar.getURL(personIdent.getEmailAddress(), GRAVATAR_SIZE);
@@ -88,26 +103,43 @@ public class DefaultAvatarManager implements AvatarManager {
private String generateAvatar(String primaryName, String secondaryName) {
String encoded = Hex.encodeHexString((primaryName + ":" + AvatarGenerator.version()).getBytes());
+ String normalizedPrimaryName;
if (StringUtils.isBlank(primaryName))
- primaryName = "?";
+ normalizedPrimaryName = "?";
+ else
+ normalizedPrimaryName = primaryName;
+
+ String normalizedSecondaryName;
if (StringUtils.isBlank(secondaryName))
- secondaryName = primaryName;
+ normalizedSecondaryName = normalizedPrimaryName;
+ else
+ normalizedSecondaryName = secondaryName;
- File avatarFile = new File(Bootstrap.getSiteDir(), "assets/avatars/generated/" + encoded + ".png");
- if (!avatarFile.exists()) {
- Lock avatarLock = LockUtils.getLock("generated-avatar:" + encoded);
- avatarLock.lock();
- try {
- String letters = getLetter(primaryName);
- BufferedImage bi = AvatarGenerator.generate(letters, secondaryName);
- FileUtils.createDir(avatarFile.getParentFile());
- ImageIO.write(bi, "PNG", avatarFile);
- } catch (NoSuchAlgorithmException | IOException e) {
- throw new RuntimeException(e);
- } finally {
- avatarLock.unlock();
+ clusterManager.runOnAllServers(new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ File avatarFile = new File(Bootstrap.getSiteDir(), "assets/avatars/generated/" + encoded + ".png");
+ if (!avatarFile.exists()) {
+ Lock avatarLock = LockUtils.getLock("generated-avatar:" + encoded);
+ avatarLock.lock();
+ try {
+ String letters = getLetter(normalizedPrimaryName);
+ BufferedImage bi = AvatarGenerator.generate(letters, normalizedSecondaryName);
+ FileUtils.createDir(avatarFile.getParentFile());
+ ImageIO.write(bi, "PNG", avatarFile);
+ } catch (NoSuchAlgorithmException | IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ avatarLock.unlock();
+ }
+ }
+ return null;
}
- }
+
+ });
return AVATARS_BASE_URL + "generated/" + encoded + ".png";
}
@@ -128,27 +160,36 @@ public class DefaultAvatarManager implements AvatarManager {
}
@Override
- public File getUploaded(User user) {
- return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/users/" + user.getId() + ".jpg");
+ public File getUserUploaded(Long userId) {
+ return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/users/" + userId + ".jpg");
}
- @Sessional
@Override
- public void useAvatar(User user, String avatarData) {
- Lock avatarLock = LockUtils.getLock("uploaded-user-avatar:" + user.getId());
- avatarLock.lock();
- try {
- File avatarFile = getUploaded(user);
- FileUtils.createDir(avatarFile.getParentFile());
- AvatarUploadField.writeToFile(avatarFile, avatarData);
- } finally {
- avatarLock.unlock();
- }
+ public void useUserAvatar(Long userId, String avatarData) {
+ clusterManager.runOnAllServers(new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ Lock avatarLock = LockUtils.getLock("uploaded-user-avatar:" + userId);
+ avatarLock.lock();
+ try {
+ File avatarFile = getUserUploaded(userId);
+ FileUtils.createDir(avatarFile.getParentFile());
+ AvatarUploadField.writeToFile(avatarFile, avatarData);
+ } finally {
+ avatarLock.unlock();
+ }
+ return null;
+ }
+
+ });
}
@Override
- public String getAvatarUrl(Long projectId) {
- File avatarFile = getUploaded(projectId);
+ public String getProjectAvatarUrl(Long projectId) {
+ File avatarFile = getProjectUploaded(projectId);
if (avatarFile.exists())
return AVATARS_BASE_URL + "uploaded/projects/" + projectId + ".jpg?version=" + avatarFile.lastModified();
else
@@ -156,41 +197,61 @@ public class DefaultAvatarManager implements AvatarManager {
}
@Override
- public void useAvatar(Project project, String avatarData) {
- Lock avatarLock = getProjectUploadedAvatarLock(project);
- avatarLock.lock();
- try {
- File avatarFile = getUploaded(project.getId());
- FileUtils.createDir(avatarFile.getParentFile());
- AvatarUploadField.writeToFile(avatarFile, avatarData);
- } finally {
- avatarLock.unlock();
- }
+ public void useProjectAvatar(Long projectId, String avatarData) {
+ clusterManager.runOnAllServers(new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ Lock avatarLock = getProjectUploadedAvatarLock(projectId);
+ avatarLock.lock();
+ try {
+ File avatarFile = getProjectUploaded(projectId);
+ FileUtils.createDir(avatarFile.getParentFile());
+ AvatarUploadField.writeToFile(avatarFile, avatarData);
+ } finally {
+ avatarLock.unlock();
+ }
+ return null;
+ }
+
+ });
}
@Override
- public File getUploaded(Long projectId) {
+ public File getProjectUploaded(Long projectId) {
return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/projects/" + projectId + ".jpg");
}
- private Lock getProjectUploadedAvatarLock(Project project) {
- return LockUtils.getLock("uploaded-project-avatar:" + project.getId());
+ private Lock getProjectUploadedAvatarLock(Long projectId) {
+ return LockUtils.getLock("uploaded-project-avatar:" + projectId);
}
@Override
- public void copyAvatar(Project from, Project to) {
- Lock avatarLock = getProjectUploadedAvatarLock(from);
- avatarLock.lock();
- try {
- File uploaded = getUploaded(from.getId());
- if (uploaded.exists()) {
- FileUtils.copyFile(uploaded, getUploaded(to.getId()));
+ public void copyProjectAvatar(Long fromProjectId, Long toProjectId) {
+ clusterManager.runOnAllServers(new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ Lock avatarLock = getProjectUploadedAvatarLock(fromProjectId);
+ avatarLock.lock();
+ try {
+ File uploaded = getProjectUploaded(fromProjectId);
+ if (uploaded.exists()) {
+ FileUtils.copyFile(uploaded, getProjectUploaded(toProjectId));
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ avatarLock.unlock();
+ }
+ return null;
}
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- avatarLock.unlock();
- }
+
+ });
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java b/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
index 3c0f2ae4c7..aac5914594 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
@@ -2,7 +2,6 @@ package io.onedev.server.web.component.avatarupload;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -87,21 +86,6 @@ public class AvatarUploadField extends FormComponentPanel<String> {
}
}
- @Nullable
- public static String readFromFile(File file) {
- if (file.exists()) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- ImageIO.write(ImageIO.read(file), "jpeg", baos);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return "data:image/jpeg;base64," + DatatypeConverter.printBase64Binary(baos.toByteArray());
- } else {
- return null;
- }
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 6755b44f64..e15db35314 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -401,7 +401,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
} else {
userMap.put("searchKey", noSpaceName);
}
- String avatarUrl = avatarManager.getAvatarUrl(user);
+ String avatarUrl = avatarManager.getUserAvatarUrl(user.getId());
userMap.put("avatarUrl", avatarUrl);
userList.add(userMap);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 60d0584aab..10fbc82328 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -246,7 +246,7 @@ public class MarkdownViewer extends GenericPanel<String> {
case "user":
User user = OneDev.getInstance(UserManager.class).findByName(referenceId);
if (user != null) {
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(user);
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getUserAvatarUrl(user.getId());
String script = String.format("onedev.server.markdown.renderUserTooltip('%s', '%s')",
JavaScriptEscape.escapeJavaScript(avatarUrl),
JavaScriptEscape.escapeJavaScript(user.getDisplayName()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java
index 2e89721885..3007051212 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java
@@ -14,7 +14,7 @@ public class ProjectAvatar extends WebComponent {
public ProjectAvatar(String id, Long projectId) {
super(id);
- url = getAvatarManager().getAvatarUrl(projectId);
+ url = getAvatarManager().getProjectAvatarUrl(projectId);
}
private AvatarManager getAvatarManager() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java
index bb96900d23..f7c3230686 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java
@@ -26,7 +26,7 @@ public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {
AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
params = ProjectPage.paramsOf(project);
- url = avatarManager.getAvatarUrl(project.getId());
+ url = avatarManager.getProjectAvatarUrl(project.getId());
tooltip = project.getPath();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
index 1f3765d42a..040b8bc087 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
@@ -36,7 +36,7 @@ public class ProjectChoiceProvider extends ChoiceProvider<Project> {
writer.key("id").value(choice.getId());
writer.key("path");
writer.value(HtmlEscape.escapeHtml5(choice.getPath()));
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice.getId());
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getProjectAvatarUrl(choice.getId());
writer.key("avatar").value(avatarUrl);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java
index 4ea2327871..619c106798 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserAvatar.java
@@ -18,13 +18,13 @@ public class UserAvatar extends WebComponent {
public UserAvatar(String id, User user) {
super(id);
- url = getAvatarManager().getAvatarUrl(user);
+ url = getAvatarManager().getUserAvatarUrl(user.getId());
system = user.isSystem();
}
public UserAvatar(String id, PersonIdent personIdent) {
super(id);
- url = getAvatarManager().getAvatarUrl(personIdent);
+ url = getAvatarManager().getPersonAvatarUrl(personIdent);
}
private AvatarManager getAvatarManager() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
index 9c897754eb..f2cc2d5fd0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java
@@ -45,12 +45,12 @@ public class AvatarEditPanel extends GenericPanel<User> {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getAvatarManager().getUploaded(getUser()).exists());
+ setVisible(getAvatarManager().getUserUploaded(getUser().getId()).exists());
}
@Override
public void onClick() {
- getAvatarManager().useAvatar(getUser(), null);
+ getAvatarManager().useUserAvatar(getUser().getId(), null);
setResponsePage(getPage().getClass(), getPage().getPageParameters());
}
@@ -65,7 +65,7 @@ public class AvatarEditPanel extends GenericPanel<User> {
protected void onSubmit() {
super.onSubmit();
AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
- avatarManager.useAvatar(getUser(), uploadedAvatarData);
+ avatarManager.useUserAvatar(getUser().getId(), uploadedAvatarData);
setResponsePage(getPage().getClass(), getPage().getPageParameters());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java
index 79968ee262..e77b36bec2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java
@@ -23,7 +23,7 @@ public abstract class AbstractUserChoiceProvider extends ChoiceProvider<User> {
@Override
public void toJson(User choice, JSONWriter writer) throws JSONException {
writer.key("id").value(choice.getId()).key("name").value(HtmlEscape.escapeHtml5(choice.getDisplayName()));
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice);
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getUserAvatarUrl(choice.getId());
writer.key("avatar").value(avatarUrl);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index c2716588bd..6ddfbb33e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -298,7 +298,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
menuItems.add(new SidebarMenuItem.SubMenu("sliders", "Settings", settingMenuItems));
}
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(getProject().getId());
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getProjectAvatarUrl(getProject().getId());
SidebarMenu.Header menuHeader = new SidebarMenu.Header(avatarUrl, getProject().getName()) {
@Override
@@ -477,7 +477,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
}
String urlOfProjectImage = getSettingManager().getSystemSetting().getServerUrl() +
- OneDev.getInstance(AvatarManager.class).getAvatarUrl(getProject().getId());
+ OneDev.getInstance(AvatarManager.class).getProjectAvatarUrl(getProject().getId());
new OpenGraphHeaderMeta(OpenGraphHeaderMetaType.Title, getProject().getPath()).render(response);
new OpenGraphHeaderMeta(OpenGraphHeaderMetaType.Description, description).render(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
index 2f7e7d9aa8..d69d576119 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
@@ -95,7 +95,7 @@ class LastCommitsResource extends AbstractResource {
info.authorName = author.getName();
info.authorEmailAddress = author.getEmailAddress();
}
- info.authorAvatarUrl = avatarManager.getAvatarUrl(author);
+ info.authorAvatarUrl = avatarManager.getPersonAvatarUrl(author);
map.put(entry.getKey(), info);
}
String json;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
index 4b6f677964..c4d2b998b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
@@ -41,12 +41,12 @@ public class AvatarEditPage extends ProjectSettingPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getAvatarManager().getUploaded(getProject().getId()).exists());
+ setVisible(getAvatarManager().getProjectUploaded(getProject().getId()).exists());
}
@Override
public void onClick() {
- getAvatarManager().useAvatar(getProject(), null);
+ getAvatarManager().useProjectAvatar(getProject().getId(), null);
setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getProject()));
}
@@ -61,7 +61,7 @@ public class AvatarEditPage extends ProjectSettingPage {
protected void onSubmit() {
super.onSubmit();
AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);
- avatarManager.useAvatar(getProject(), uploadedAvatarData);
+ avatarManager.useProjectAvatar(getProject().getId(), uploadedAvatarData);
setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getProject()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
index 6524c07b4a..cd79c07f53 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
@@ -65,7 +65,7 @@ class TopContributorsResource extends AbstractResource {
Map<String, Object> contributorData = new HashMap<>();
contributorData.put("authorName", contributor.getAuthor().getName());
contributorData.put("authorEmailAddress", contributor.getAuthor().getEmailAddress());
- contributorData.put("authorAvatarUrl", avatarManager.getAvatarUrl(contributor.getAuthor()));
+ contributorData.put("authorAvatarUrl", avatarManager.getPersonAvatarUrl(contributor.getAuthor()));
contributorData.put("totalCommits", contributor.getTotalContribution().getCommits());
contributorData.put("totalAdditions", contributor.getTotalContribution().getAdditions());
contributorData.put("totalDeletions", contributor.getTotalContribution().getDeletions());
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index e7d3ad7ece..a0c1566496 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -17,10 +17,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.glassfish.jersey.servlet.ServletContainer;
-import com.google.common.collect.Lists;
-
import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.server.ServerSocketServlet;
import io.onedev.server.git.GitFilter;
import io.onedev.server.git.GitLfsFilter;
@@ -122,14 +119,11 @@ public class ProductServletConfigurator implements ServletConfigurator {
* to hold site specific web assets.
*/
File assetsDir = new File(Bootstrap.getSiteDir(), "assets");
- ServletHolder assetsServletHolder = new ServletHolder(new FileAssetServlet(assetsDir));
- context.addServlet(assetsServletHolder, "/site/*");
-
- File rootAssetsDir = new File(Bootstrap.getSiteDir(), "assets/root");
- ServletHolder rootAssetsServletHolder = new ServletHolder(new FileAssetServlet(rootAssetsDir));
- for (File file: FileUtils.listFiles(rootAssetsDir, Lists.newArrayList("**"), Lists.newArrayList())) {
- String path = file.getAbsolutePath().substring(rootAssetsDir.getAbsolutePath().length());
- context.addServlet(rootAssetsServletHolder, path.replace('\\', '/'));
+ for (File file: assetsDir.listFiles()) {
+ if (file.isFile())
+ context.addServlet(new ServletHolder(new FileAssetServlet(assetsDir)), "/" + file.getName());
+ else
+ context.addServlet(new ServletHolder(new FileAssetServlet(file)), "/" + file.getName() + "/*");
}
context.addServlet(new ServletHolder(jerseyServlet), "/api/*");