diff --git a/README.md b/README.md index 3e1ff27..f2cea80 100644 --- a/README.md +++ b/README.md @@ -61,3 +61,22 @@ Include /data/svn/httpd.conf ## 3、附录 Centos安装apache+svn结合的SVN服务器请参考[Centos安装apache+svn结合的SVN服务器](fl.md) 管理系统配置请参考[管理系统配置请参考](https://github.com/yuexiaoyun/svnadmin/blob/master/doc/SvnAdmin_Manual_zh_CN.pdf) + + +Docker 部署 +docker run --name svn-server -d -v ~/work/data/svn/repository/:/home/svn/ -v ~/work/data/svn/conf/:/etc/subversion/ -p 3380:80 -p 3690:3690 elleflorio/svn-server + +docker exec -it svn-server /bin/sh + +cd /etc/apache2 + +vi httpd.conf + +ServerName localhost:80 + +chmod -R o+rw /home/svn + + +Nginx 反向代理到3380端口 + + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2938ea3..ea662c2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,17 +1,49 @@ -db.url=jdbc:mysql://127.0.0.1:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8 -db.username=root -db.password=***** -db.maxActive=50 +jdbc.type=druid +jdbc.url=jdbc:mysql://127.0.0.1:3306/rk_admin?characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +jdbc.username=root +jdbc.password=root +jdbc.validationQuery=select 1 +jdbc.maxActive=50 +jdbc.testWhileIdle=true +jdbc.filters=mergeStat +jdbc.connectionProperties=druid.stat.slowSqlMillis=2000 +jdbc.defaultAutoCommit=false -#mail.HostName=smtp.mxhichina.com -#mail.SmtpPort=465 -#mail.UserName=koux@rekoe.com -#mail.Password=RK@53822111 -#mail.SSLOnConnect=true -#mail.From=webmaster@rekoe.com -# qq user mail -mail.HostName=smtp.qq.com -mail.SmtpPort=465 -mail.UserName=koukou890@qq.com -mail.Password=******* -mail.SSLOnConnect=true +#jetty +server.port=8084 +server.host=0.0.0.0 + +jetty.threadpool.idleTimeout=60000 +jetty.threadpool.minThreads=4 +jetty.threadpool.maxThreads=8 +jetty.page.404=/404.html +jetty.page.500=/500.html + +freemarker.suffix=.ftl +freemarker.prefix=~/rk_svnadmin/src/main/resources/ +freemarker.cache_time=-2000 + +shiro.session.manager.globalSessionTimeout=360000000 +redis.host=127.0.0.1 +redis.port=6379 +redis.timeout=2000 +redis.database=5 + +#cache +shiro.session.cache.type=redis +nutz.dao.interceptor.cache.provider.type=jedis +nutz.dao.interceptor.time.enable=true +nutz.dao.interceptor.cache.enable=true +nutz.dao.interceptor.cache.provider.memory.cacheSize=1000 + +email.HostName=smtp.qq.com +email.SmtpPort=465 +email.UserName=xxxxx@qq.com +email.Password=****** +email.SSLOnConnect=true +email.From=xxxx@qq.com +email.charset=UTF-8 + +ngrok.client.auth_token=xxxxxx +ngrok.client.to_port=8084 +ngrok.client.enable=false \ No newline at end of file