github
/
rk_svnadmin
mirror of https://github.com/Rekoe/rk_svnadmin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Rekoe/rk_svnadmin.git 

Conflicts:
	src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java
pull/3/head
liuhuan 2016-04-07 21:34:31 +08:00
parent d2743c0539 8ce1930813
commit 974f158069
6 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -31,7 +31,7 @@
对了，数据库还没完，添上关联关系 对了，数据库还没完，添上关联关系
完手动执行alter 完手动执行alter
…… ```
alter table pj_gr add constraint FK_Relationship_2 foreign key (pj) references pj (pj) on delete restrict on update restrict; alter table pj_gr add constraint FK_Relationship_2 foreign key (pj) references pj (pj) on delete restrict on update restrict;
alter table pj_gr_auth add constraint FK_Reference_6 foreign key (pj, gr) references pj_gr (pj, gr) on delete >restrict on update restrict; alter table pj_gr_auth add constraint FK_Reference_6 foreign key (pj, gr) references pj_gr (pj, gr) on delete >restrict on update restrict;
alter table pj_gr_usr add constraint FK_Reference_10 foreign key (pj, gr) references pj_gr (pj, gr) on delete >restrict on update restrict; alter table pj_gr_usr add constraint FK_Reference_10 foreign key (pj, gr) references pj_gr (pj, gr) on delete >restrict on update restrict;
@ -40,7 +40,8 @@
alter table pj_usr add constraint FK_Reference_7 foreign key (usr) references usr (usr) on delete restrict on update restrict; alter table pj_usr add constraint FK_Reference_7 foreign key (usr) references usr (usr) on delete restrict on update restrict;
alter table pj_usr_auth add constraint FK_Reference_11 foreign key (pj) references pj (pj) on delete restrict on update restrict; alter table pj_usr_auth add constraint FK_Reference_11 foreign key (pj) references pj (pj) on delete restrict on update restrict;
alter table pj_usr_auth add constraint FK_Reference_8 foreign key (usr) references usr (usr) on delete restrict on update restrict; alter table pj_usr_auth add constraint FK_Reference_8 foreign key (usr) references usr (usr) on delete restrict on update restrict;
……
```
## 3、附录 ## 3、附录
Centos安装apache+svn结合的SVN服务器请参考[Centos安装apache+svn结合的SVN服务器](fl.md) Centos安装apache+svn结合的SVN服务器请参考[Centos安装apache+svn结合的SVN服务器](fl.md)

25
pom.xml
View File

@ -11,6 +11,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<repositories> <repositories>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
@ -32,7 +39,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>1.0.17</version> <version>1.0.18</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>jconsole</artifactId> <artifactId>jconsole</artifactId>
@ -52,7 +59,7 @@
<dependency> <dependency>
<groupId>org.nutz</groupId> <groupId>org.nutz</groupId>
<artifactId>nutz</artifactId> <artifactId>nutz</artifactId>
<version>1.r.55</version> <version>1.r.56-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nutz</groupId> <groupId>org.nutz</groupId>
@ -116,9 +123,9 @@
<version>20090211</version> <version>20090211</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-email</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId> <artifactId>commons-email</artifactId>
<version>1.1</version> <version>1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nutz</groupId> <groupId>org.nutz</groupId>
@ -195,16 +202,16 @@
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>src/main/java</sourceDirectory> <sourceDirectory>src/main/java</sourceDirectory>
<finalName>rk_svnadmin</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<includes> <includes>
<include>com/rekoe/mvc/*.*</include> <include>com/shanggame/mvc/*.*</include>
</includes> </includes>
<filtering>false</filtering> <filtering>false</filtering>
</resource> </resource>
</resources> </resources>
<finalName>rk_svnadmin</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -256,9 +263,9 @@
<targetPath>WEB-INF/classes</targetPath> <targetPath>WEB-INF/classes</targetPath>
<includes> <includes>
<include>msg/**/*</include> <include>msg/**/*</include>
<include>log4j.properties</include> <include>ioc/**/*</include>
<include>oauth_consumer.properties</include> <include>*.properties</include>
<include>quartz.properties</include> <include>init_system_h2.sql</include>
<include>shiro.ini</include> <include>shiro.ini</include>
<include>ehcache.xml</include> <include>ehcache.xml</include>
</includes> </includes>

2
src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java
View File

@ -120,6 +120,8 @@ public class AdminSvnUserAct extends BaseAction {
} }
} }
} }
ProjectConfig conf = projectConfigService.get();
emailNotify(user, emailService, conf, user.getEmail(), code);
return Message.success("ok", req); return Message.success("ok", req);
} }

1
src/main/java/com/rekoe/service/RepositoryService.java
View File

@ -94,7 +94,6 @@ public class RepositoryService {
result = StringUtils.replace(result, "\b", " "); result = StringUtils.replace(result, "\b", " ");
result = StringUtils.replace(result, "<", " ");// eg. <br/> result = StringUtils.replace(result, "<", " ");// eg. <br/>
result = StringUtils.replace(result, "(", " ");// eg. () result = StringUtils.replace(result, "(", " ");// eg. ()
result = result.trim(); result = result.trim();
int blank = result.indexOf(" "); int blank = result.indexOf(" ");
if (blank != -1) { if (blank != -1) {

14
src/main/resources/conf.properties
View File

@ -1,11 +1,11 @@
db.url=jdbc:mysql://127.0.0.1:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8 db.url=jdbc:mysql://192.168.1.223:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8
db.username=root db.username=root
db.password= db.password=root
db.maxActive=50 db.maxActive=50
mail.HostName=smtp.exmail.qq.com
mail.HostName=smtp.mxhichina.com
mail.SmtpPort=465 mail.SmtpPort=465
mail.UserName=nutzbook@wendal.net mail.UserName=webmaster@rekoe.com
mail.Password=book@2015 mail.Password=Rk@5382211
mail.SSLOnConnect=true mail.SSLOnConnect=true
mail.From=nutzbook@wendal.net mail.From=webmaster@rekoe.com
mail.to=koukou890@qq.com

8
src/main/webapp/WEB-INF/template/admin/common/project_open.ftl Normal file
View File

@ -0,0 +1,8 @@
${name}: 您好 <br/>
&nbsp;&nbsp;
您在项目《${project}》申请的svn信息如下<br/>
地址:${url}<br/>
账号:${usr}<br/>
密码:${pwd }<br/><br/>
&nbsp;&nbsp;&nbsp;&nbsp;密码信息请妥善保管。系统邮件请勿回复
</p>