mirror of https://github.com/Rekoe/rk_svnadmin
update
parent
2d13705948
commit
2cf576c18b
|
@ -1,5 +1,5 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
encoding//src/main/java=UTF-8
|
encoding//src/main/java=UTF-8
|
||||||
encoding//src/main/resources=UTF-8
|
encoding//src/main/resources=UTF-8
|
||||||
encoding//src/main/resources/msg/zh_CN/MessageResources.properties=UTF-8
|
encoding//src/main/resources/msg/zh-CN/MessageResources.properties=UTF-8
|
||||||
encoding/<project>=UTF-8
|
encoding/<project>=UTF-8
|
||||||
|
|
|
@ -22,6 +22,7 @@ import org.nutz.lang.Each;
|
||||||
import org.nutz.lang.ExitLoop;
|
import org.nutz.lang.ExitLoop;
|
||||||
import org.nutz.lang.Lang;
|
import org.nutz.lang.Lang;
|
||||||
import org.nutz.lang.LoopException;
|
import org.nutz.lang.LoopException;
|
||||||
|
import org.nutz.mvc.Mvcs;
|
||||||
import org.nutz.mvc.annotation.Encoding;
|
import org.nutz.mvc.annotation.Encoding;
|
||||||
import org.nutz.mvc.annotation.Fail;
|
import org.nutz.mvc.annotation.Fail;
|
||||||
import org.nutz.mvc.annotation.IocBy;
|
import org.nutz.mvc.annotation.IocBy;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.rekoe.module.admin;
|
package com.rekoe.module.admin;
|
||||||
|
|
||||||
import org.nutz.ioc.loader.annotation.IocBean;
|
import org.nutz.ioc.loader.annotation.IocBean;
|
||||||
|
import org.nutz.mvc.Mvcs;
|
||||||
import org.nutz.mvc.annotation.At;
|
import org.nutz.mvc.annotation.At;
|
||||||
import org.nutz.mvc.annotation.Ok;
|
import org.nutz.mvc.annotation.Ok;
|
||||||
|
|
||||||
|
@ -16,6 +17,7 @@ public class FrameAct {
|
||||||
@At("/admin/frame/user/left")
|
@At("/admin/frame/user/left")
|
||||||
@Ok("fm:template.admin.user.frame.left")
|
@Ok("fm:template.admin.user.frame.left")
|
||||||
public void userLeft() {
|
public void userLeft() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@At("/admin/frame/user/right")
|
@At("/admin/frame/user/right")
|
||||||
|
|
|
@ -95,7 +95,7 @@ public class ProjectGroupUsrService extends BaseService<PjGrUsr> {
|
||||||
* @return 项目的组用户列表
|
* @return 项目的组用户列表
|
||||||
*/
|
*/
|
||||||
public List<PjGrUsr> getList(String pj) {
|
public List<PjGrUsr> getList(String pj) {
|
||||||
Sql sql = Sqls.create("select a.pj,a.gr,b.usr,c.name as usrname from pj_gr a left join pj_gr_usr b on (a.pj=b.pj and a.gr=b.gr) left join usr c on (b.usr = c.usr) where a.pj=@pj and c.is_lock=falsd order by a.gr,b.usr");
|
Sql sql = Sqls.create("select a.pj,a.gr,b.usr,c.name as usrname from pj_gr a left join pj_gr_usr b on (a.pj=b.pj and a.gr=b.gr) left join usr c on (b.usr = c.usr) where a.pj=@pj and c.is_lock=false order by a.gr,b.usr");
|
||||||
sql.setParam("pj", pj);
|
sql.setParam("pj", pj);
|
||||||
final List<PjGrUsr> list = new ArrayList<PjGrUsr>();
|
final List<PjGrUsr> list = new ArrayList<PjGrUsr>();
|
||||||
sql.setCallback(new SqlCallback() {
|
sql.setCallback(new SqlCallback() {
|
||||||
|
|
|
@ -186,12 +186,15 @@ public class RepositoryService {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager("admin", "john");
|
DAVRepositoryFactory.setup();
|
||||||
|
SVNRepositoryFactoryImpl.setup();
|
||||||
|
FSRepositoryFactory.setup();
|
||||||
|
ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager("admin", "123456");
|
||||||
SVNClientManager manager = SVNClientManager.newInstance();
|
SVNClientManager manager = SVNClientManager.newInstance();
|
||||||
manager.setAuthenticationManager(authManager);
|
manager.setAuthenticationManager(authManager);
|
||||||
SVNCommitClient commitClient = SVNClientManager.newInstance().getCommitClient();
|
SVNCommitClient commitClient = SVNClientManager.newInstance().getCommitClient();
|
||||||
try {
|
try {
|
||||||
SVNCommitInfo info = commitClient.doMkDir(new SVNURL[] { SVNURL.parseURIEncoded("http://192.168.3.127/repository/koux/branches") }, "commitMessage", null, true);
|
SVNCommitInfo info = commitClient.doMkDir(new SVNURL[] { SVNURL.parseURIEncoded("http://127.0.0.1:3380/svn/hunnit") }, "commitMessage", null, true);
|
||||||
long newRevision = info.getNewRevision();
|
long newRevision = info.getNewRevision();
|
||||||
System.out.println(newRevision);
|
System.out.println(newRevision);
|
||||||
} catch (SVNException e) {
|
} catch (SVNException e) {
|
||||||
|
|
Loading…
Reference in New Issue