Merge pull request #6 from lanyulei/dev

功能完善。

config/settings.dev.yml

@@ -14,13 +14,13 @@ settings:
     dbtype: mysql
     host: 127.0.0.1
     name: ferry
-    password: 123456
+    password: ferry@2020
     port: 3306
     username: ferry
   email:
     alias: ferry
     host: smtp.163.com
-    pass: your password
+    pass: REYVECRYOZEZIFKL
     port: 465
     user: fdevops@163.com
   gorm:
@@ -36,3 +36,4 @@ settings:
   ssl:
     key: keystring
     pem: temp/pem.pem
+  domain: http://192.168.0.100:9527

config/settings.yml

@@ -35,4 +35,5 @@ settings:
   gorm:
     logmode: 0
     maxidleconn: 0
-    maxopenconn: 20000
+    maxopenconn: 20000
+  domain: http://192.168.0.100:9527

pkg/notify/send.go

@@ -6,6 +6,8 @@ import (
 	"ferry/pkg/notify/email"
 	"text/template"
 
+	"github.com/spf13/viper"
+
 	log "github.com/sirupsen/logrus"
 )
 
@@ -27,6 +29,7 @@ type BodyData struct {
 	Content       string      // 通知的内容
 	Description   string      // 表格上面的描述信息
 	ProcessId     int         // 流程ID
+	Domain        string      // 域名地址
 }
 
 func (b *BodyData) ParsingTemplate() (err error) {
@@ -40,6 +43,7 @@ func (b *BodyData) ParsingTemplate() (err error) {
 		return
 	}
 
+	b.Domain = viper.GetString("settings.domain")
 	err = tmpl.Execute(&buf, b)
 	if err != nil {
 		return

static/scripts/echo_test-4171bc7f4a05-admin.sh

@@ -0,0 +1 @@
+echo "test"

static/scripts/print_hello_world-d266ee2a8029-admin.py

@@ -0,0 +1 @@
+print("Hello, World!")

static/template/email.html

@@ -29,7 +29,7 @@
     </table>
 
     <br>
-    <a href="http://localhost:9527/#/process/handle-ticket?workOrderId={{ .Id }}&processId={{ .ProcessId }}" target="_blank">点击此处跳转到工单详情</a>
+    <a href="{{ .Domain }}/#/process/handle-ticket?workOrderId={{ .Id }}&processId={{ .ProcessId }}" target="_blank">点击此处跳转到工单详情</a>
 </body>
 <style>
     table {