diff --git a/README.md b/README.md index 400a97c..c436b81 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/pom.xml b/pom.xml index 18be956..b72be24 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,13 @@ UTF-8 + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + true + + @@ -32,7 +39,7 @@ com.alibaba druid - 1.0.17 + 1.0.18 jconsole @@ -52,7 +59,7 @@ org.nutz nutz - 1.r.55 + 1.r.56-SNAPSHOT org.nutz @@ -116,9 +123,9 @@ 20090211 - commons-email + org.apache.commons commons-email - 1.1 + 1.4 org.nutz @@ -195,16 +202,16 @@ src/main/java + rk_svnadmin src/main/resources - com/rekoe/mvc/*.* + com/shanggame/mvc/*.* false - rk_svnadmin org.apache.maven.plugins @@ -256,9 +263,9 @@ WEB-INF/classes msg/**/* - log4j.properties - oauth_consumer.properties - quartz.properties + ioc/**/* + *.properties + init_system_h2.sql shiro.ini ehcache.xml diff --git a/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java b/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java index 13797b2..b2a9964 100644 --- a/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java +++ b/src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java @@ -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); } diff --git a/src/main/java/com/rekoe/service/RepositoryService.java b/src/main/java/com/rekoe/service/RepositoryService.java index f9e4885..69e25ac 100644 --- a/src/main/java/com/rekoe/service/RepositoryService.java +++ b/src/main/java/com/rekoe/service/RepositoryService.java @@ -94,7 +94,6 @@ public class RepositoryService { result = StringUtils.replace(result, "\b", " "); result = StringUtils.replace(result, "<", " ");// eg.
result = StringUtils.replace(result, "(", " ");// eg. () - result = result.trim(); int blank = result.indexOf(" "); if (blank != -1) { diff --git a/src/main/resources/conf.properties b/src/main/resources/conf.properties index 83bc27a..1916c06 100644 --- a/src/main/resources/conf.properties +++ b/src/main/resources/conf.properties @@ -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 \ No newline at end of file +mail.From=webmaster@rekoe.com \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/template/admin/common/project_open.ftl b/src/main/webapp/WEB-INF/template/admin/common/project_open.ftl new file mode 100644 index 0000000..0d6cd36 --- /dev/null +++ b/src/main/webapp/WEB-INF/template/admin/common/project_open.ftl @@ -0,0 +1,8 @@ +${name}: 您好
+   + 您在项目《${project}》申请的svn信息如下
+ 地址:${url}
+ 账号:${usr}
+ 密码:${pwd }

+     密码信息请妥善保管。系统邮件请勿回复 +

\ No newline at end of file