Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://www.fdevops.com/wp-content/uploads/2020/07/1595066253-ferry_logo_meitu_1.png">
+  <img src="https://www.fdevops.com/wp-content/uploads/2020/09/1599039924-ferry_log.png">
 </p>
 
 

config/READMEN.md

@@ -1,37 +0,0 @@
-# ⚙ 配置详情
-
-1. 配置文件说明
-```yml
-settings:
-  application:  
-    # 项目启动环境            
-    mode: dev  # dev开发环境 test测试环境 prod线上环境；
-    host: 0.0.0.0  # 主机ip 或者域名，默认0.0.0.0
-    # 服务名称
-    name: ferry   
-    # 服务端口
-    port: 8000   
-    readtimeout: 1   
-    writertimeout: 2 
-  log:
-    # 日志文件存放路径
-    dir: temp/logs
-  jwt:
-    # JWT加密字符串
-    secret: ferry
-    # 过期时间单位：秒
-    timeout: 3600
-  database:
-    # 数据库名称
-    name: dbname 
-    # 数据库类型
-    dbtype: mysql    
-    # 数据库地址
-    host: 127.0.0.1  
-    # 数据库密码
-    password: password  
-    # 数据库端口
-    port: 3306       
-    # 数据库用户名
-    username: root   
-```

config/settings.yml

@@ -2,46 +2,42 @@ script:
   path: ./static/scripts
 settings:
   application:
-    mode: prod  # dev开发环境 test测试环境 prod线上环境
+    domain: localhost:8002
     host: 0.0.0.0
+    ishttps: false
+    mode: prod
     name: ferry
     port: 8002
     readtimeout: 1
     writertimeout: 2
-    domain: localhost:8002
-    ishttps: false
-  ssl:
-    key: keystring
-    pem: temp/pem.pem
-  jwt:
-    secret: ferry
-    timeout: 3600
   database:
-    name: ferry
     dbtype: mysql
     host: 127.0.0.1
+    name: ferry
     password: 123456
     port: 3306
     username: root
-  redis:
+  domain:
-    host: 127.0.0.1
+    gethost: 1
-    port: 6379
+    url: localhost:9527
   email:
     alias: ferry
     host: smtp.163.com
     pass: your password
     port: 465
-    user: your username
+    user: fdevops@163.com
   gorm:
     logmode: 0
     maxidleconn: 0
     maxopenconn: 20000
-  domain: http://192.168.0.100:9527
+  jwt:
+    secret: ferry
+    timeout: 3600
   ldap:
     anonymousquery: 0
     basedn: dc=fdevops,dc=com
     bindpwd: 123456
-    binduserdn: admin
+    binduserdn: cn=admin,dc=fdevops,dc=com
     host: localhost
     port: 389
     tls: 0
@@ -49,10 +45,16 @@ settings:
   log:
     compress: 1
     consolestdout: 1
-    filestdout: 1
+    filestdout: 0
-    level: info
+    level: debug
     localtime: 1
-    maxAge: 30
+    maxage: 30
     maxbackups: 300
     maxsize: 10240
     path: ./logs/ferry.log
+  redis:
+    host: 127.0.0.1
+    port: 6379
+  ssl:
+    key: keystring
+    pem: temp/pem.pem