mirror of https://github.com/Rekoe/rk_svnadmin
Merge branch 'master' of https://github.com/Rekoe/rk_svnadmin.git
Conflicts: src/main/java/com/rekoe/module/admin/AdminSvnUserAct.javapull/3/head
liuhuan
commit
974f158069
|
|
@ -31,7 +31,7 @@
|
|||
对了，数据库还没完，添上关联关系
|
||||
完手动执行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_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;
|
||||
|
|
@ -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_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;
|
||||
……
|
||||
|
||||
```
|
||||
|
||||
## 3、附录
|
||||
Centos安装apache+svn结合的SVN服务器请参考[Centos安装apache+svn结合的SVN服务器](fl.md)
|
||||
|
|
|
|||
25
pom.xml
25
pom.xml
|
|
@ -11,6 +11,13 @@
|
|||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>ossrh</id>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
@ -32,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>1.0.17</version>
|
||||
<version>1.0.18</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>jconsole</artifactId>
|
||||
|
|
@ -52,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.nutz</groupId>
|
||||
<artifactId>nutz</artifactId>
|
||||
<version>1.r.55</version>
|
||||
<version>1.r.56-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.nutz</groupId>
|
||||
|
|
@ -116,9 +123,9 @@
|
|||
<version>20090211</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-email</groupId>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-email</artifactId>
|
||||
<version>1.1</version>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.nutz</groupId>
|
||||
|
|
@ -195,16 +202,16 @@
|
|||
</dependencies>
|
||||
<build>
|
||||
<sourceDirectory>src/main/java</sourceDirectory>
|
||||
<finalName>rk_svnadmin</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
<includes>
|
||||
<include>com/rekoe/mvc/*.*</include>
|
||||
<include>com/shanggame/mvc/*.*</include>
|
||||
</includes>
|
||||
<filtering>false</filtering>
|
||||
</resource>
|
||||
</resources>
|
||||
<finalName>rk_svnadmin</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
|
@ -256,9 +263,9 @@
|
|||
<targetPath>WEB-INF/classes</targetPath>
|
||||
<includes>
|
||||
<include>msg/**/*</include>
|
||||
<include>log4j.properties</include>
|
||||
<include>oauth_consumer.properties</include>
|
||||
<include>quartz.properties</include>
|
||||
<include>ioc/**/*</include>
|
||||
<include>*.properties</include>
|
||||
<include>init_system_h2.sql</include>
|
||||
<include>shiro.ini</include>
|
||||
<include>ehcache.xml</include>
|
||||
</includes>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,6 @@ public class RepositoryService {
|
|||
result = StringUtils.replace(result, "\b", " ");
|
||||
result = StringUtils.replace(result, "<", " ");// eg. <br/>
|
||||
result = StringUtils.replace(result, "(", " ");// eg. ()
|
||||
|
||||
result = result.trim();
|
||||
int blank = result.indexOf(" ");
|
||||
if (blank != -1) {
|
||||
|
|
|
|||
|
|
@ -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.password=
|
||||
db.password=root
|
||||
db.maxActive=50
|
||||
mail.HostName=smtp.exmail.qq.com
|
||||
|
||||
mail.HostName=smtp.mxhichina.com
|
||||
mail.SmtpPort=465
|
||||
mail.UserName=nutzbook@wendal.net
|
||||
mail.Password=book@2015
|
||||
mail.UserName=webmaster@rekoe.com
|
||||
mail.Password=Rk@5382211
|
||||
mail.SSLOnConnect=true
|
||||
mail.From=nutzbook@wendal.net
|
||||
mail.to=koukou890@qq.com
|
||||
mail.From=webmaster@rekoe.com
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
${name}: 您好 <br/>
|
||||
|
||||
您在项目《${project}》申请的svn信息如下<br/>
|
||||
地址:${url}<br/>
|
||||
账号:${usr}<br/>
|
||||
密码:${pwd }<br/><br/>
|
||||
密码信息请妥善保管。系统邮件请勿回复
|
||||
</p>
|
||||
Loading…
Reference in New Issue