From 426967060ff5fe8d4a5a570a2af021cca8991b9c Mon Sep 17 00:00:00 2001 From: rekoe Date: Fri, 25 Mar 2016 10:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=9B=E5=BB=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/rekoe/domain/ProjectConfig.java | 2 +- src/main/java/com/rekoe/module/admin/AdminProjectAct.java | 2 -- src/main/java/com/rekoe/service/RepositoryService.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rekoe/domain/ProjectConfig.java b/src/main/java/com/rekoe/domain/ProjectConfig.java index eebe69a..8ccc302 100644 --- a/src/main/java/com/rekoe/domain/ProjectConfig.java +++ b/src/main/java/com/rekoe/domain/ProjectConfig.java @@ -38,7 +38,7 @@ public class ProjectConfig implements Serializable { @Column("def_dirs") @ColDefine(type = ColType.VARCHAR, width = 225, adaptor = StringJsonAdaptor.class) - @Default("[server,client,art,design,plan]") + @Default("[\"branches\",\"tags\",\"trunk\",\"trunk/server\",\"trunk/client\",\"trunk/art\",\"trunk/design\",\"trunk/plan\"]") @Comment("默认初始化目录") private List dirs; diff --git a/src/main/java/com/rekoe/module/admin/AdminProjectAct.java b/src/main/java/com/rekoe/module/admin/AdminProjectAct.java index e58019e..2df6dcd 100644 --- a/src/main/java/com/rekoe/module/admin/AdminProjectAct.java +++ b/src/main/java/com/rekoe/module/admin/AdminProjectAct.java @@ -33,7 +33,6 @@ import com.rekoe.service.ProjectService; import com.rekoe.service.RepositoryService; import com.rekoe.service.UsrService; import com.rekoe.utils.CommonUtils; -import com.rekoe.utils.UsrProvider; @IocBean @At("/admin/project") @@ -47,7 +46,6 @@ public class AdminProjectAct extends BaseAction { @RequiresPermissions({ "svn.project:view" }) @PermissionTag(name = "SVN浏览项目", tag = "SVN项目管理") public Pagination list(@Param(value = "pageNumber", df = "1") int page) { - System.out.println(UsrProvider.getCurrentUsr()); return projectService.getObjListByPager(page, 20, null); } diff --git a/src/main/java/com/rekoe/service/RepositoryService.java b/src/main/java/com/rekoe/service/RepositoryService.java index 58f5056..94c554e 100644 --- a/src/main/java/com/rekoe/service/RepositoryService.java +++ b/src/main/java/com/rekoe/service/RepositoryService.java @@ -174,7 +174,7 @@ public class RepositoryService { int i = 0; for (String url : dirs) { try { - urlAr[i] = SVNURL.parseURIEncoded(url); + urlAr[i] = SVNURL.parseURIEncoded(getProjectSVNUrl(pj) + "/" + url); } catch (SVNException e) { LOG.error(e); }