diff --git a/go.mod b/go.mod index e14f4d3..e62201b 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,8 @@ require ( cloud.google.com/go/texttospeech v1.0.0 github.com/gorilla/websocket v1.4.2 github.com/stretchr/testify v1.7.0 - gitlab.com/ics_cinnamon/joy4 v1.0.25 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb ) -replace ( - gitlab.com/ics_cinnamon/joy4 => ../joy4 -) + +replace gitlab.com/ics_cinnamon/joy4 => ../joy4 diff --git a/go.sum b/go.sum index 13b4183..c3ccf82 100644 --- a/go.sum +++ b/go.sum @@ -162,7 +162,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -180,10 +179,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -gitlab.com/ics_cinnamon/joy4 v1.0.24 h1:MQlMxeJ5ZBEerHzHf1D+/ruTeA1YXJKL5XbJdI3NVf4= -gitlab.com/ics_cinnamon/joy4 v1.0.24/go.mod h1:LFfF6nA92KMmd/hrGEgQzkIsX/n+IlqCI8vbY8/NnNI= -gitlab.com/ics_cinnamon/joy4 v1.0.25 h1:e20ciX68hnLv50GVENWDeyYkKz0XiX6ALevQfeSfrQc= -gitlab.com/ics_cinnamon/joy4 v1.0.25/go.mod h1:LFfF6nA92KMmd/hrGEgQzkIsX/n+IlqCI8vbY8/NnNI= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -193,8 +188,6 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -gocv.io/x/gocv v0.27.0 h1:3X8I74ULsWHd4m7DQRv2Nqx5VkKscfUFnKgLNodiboI= -gocv.io/x/gocv v0.27.0/go.mod h1:n4LnYjykU6y9gn48yZf4eLCdtuSb77XxSkW6g0wGf/A= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/icshttp/handler.go b/icshttp/handler.go index 80f2aaf..20241c4 100644 --- a/icshttp/handler.go +++ b/icshttp/handler.go @@ -272,9 +272,9 @@ func (s *ScenarioSession) BOTPFunc(w http.ResponseWriter, r *http.Request) { dstSession := s.GetSession(translateinfo.Token) if request.TalkText != "" { if customerTelno == request.TelNo { - l.PrintAnnouce(request.TalkText, true) - } else { l.PrintAnnouce(request.TalkText, false) + } else { + l.PrintAnnouce(request.TalkText, true) } dstRlt := ResStatus{Count: dstSession.Count + 1, TransLateText: request.TalkText} s.UpdateSession(translateinfo.Token, dstRlt) @@ -282,11 +282,6 @@ func (s *ScenarioSession) BOTPFunc(w http.ResponseWriter, r *http.Request) { } if srcSession.TransLateText != "" { - if customerTelno == request.TelNo { - l.PrintAnnouce(srcSession.TransLateText, false) - } else { - l.PrintAnnouce(srcSession.TransLateText, false) - } response.AnounceMents = srcSession.TransLateText srcRlt := ResStatus{Count: srcSession.Count + 1, Status: scenario.Action, TransLateText: scenario.AnounceMents} s.UpdateSession(request.Token, srcRlt) diff --git a/track20250103_021535.log b/track20250103_021535.log new file mode 100644 index 0000000..e69de29 diff --git a/voiceagent b/voiceagent new file mode 100755 index 0000000..32d9877 Binary files /dev/null and b/voiceagent differ diff --git a/voicebot b/voicebot index 05e3e56..32d9877 100755 Binary files a/voicebot and b/voicebot differ