From e0ca56b93b57a02a422fa193d68d1e865b96b3e0 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 17 Oct 2024 14:11:09 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=A1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 7 + README.md | 93 ------ app_send.sh | 1 + icsapp/execsvc.go | 5 +- icsconf/icsconf.go | 40 ++- icsconf/icsconf_test.go | 7 +- icshttp/handler.go | 632 ++++++++++++++++++++++++++++----------- icshttpclient/client.go | 1 + icssoe.xml | 28 -- icsvbot.xml | 109 ------- start.sh | 4 - startdlv.sh | 1 - startvc.sh | 1 - startvc2.sh | 1 - stop.sh | 4 - track20230622_170834.log | 0 track20231016_134640.log | 0 track20231016_134710.log | 0 track20231016_134809.log | 0 track20231016_135123.log | 0 20 files changed, 512 insertions(+), 422 deletions(-) create mode 100644 .vscode/launch.json delete mode 100644 README.md create mode 100644 app_send.sh delete mode 100644 icssoe.xml delete mode 100644 icsvbot.xml delete mode 100755 start.sh delete mode 100755 startdlv.sh delete mode 100755 startvc.sh delete mode 100755 startvc2.sh delete mode 100755 stop.sh create mode 100644 track20230622_170834.log create mode 100644 track20231016_134640.log create mode 100644 track20231016_134710.log create mode 100644 track20231016_134809.log create mode 100644 track20231016_135123.log diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..5c7247b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,7 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [] +} \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 6b20597..0000000 --- a/README.md +++ /dev/null @@ -1,93 +0,0 @@ -# VoiceAgent - -Voice Agent in golang - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://gitlab.com/ics_cinnamon/voiceagent.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://gitlab.com/ics_cinnamon/voiceagent/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://gitlab.com/-/experiment/new_project_readme_content:e72dfbe5ce686bbb6085424d6a052342?https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. - diff --git a/app_send.sh b/app_send.sh new file mode 100644 index 0000000..69bbd18 --- /dev/null +++ b/app_send.sh @@ -0,0 +1 @@ +scp -v -i /home/ljhwan206/etc/key.pem voicegateway ec2-user@15.165.95.232:/home/ec2-user/vgw/svc/icsbot/bin/ diff --git a/icsapp/execsvc.go b/icsapp/execsvc.go index d1bde9b..2aba191 100644 --- a/icsapp/execsvc.go +++ b/icsapp/execsvc.go @@ -5,7 +5,9 @@ import ( "fmt" "io" "net/http" + "os" "strings" + "syscall" "time" "gitlab.com/cinnamon/voiceagent/icsconf" @@ -49,7 +51,8 @@ func Init(conf *icsconf.IcsConfig) (e *IcsExec) { func (exe IcsExec) Execute() *icserror.IcsError { l := icslog.GetIcsLog() - + logFile, _ := os.Create("track" + time.Now().Format("20060102_150405") + ".log") + syscall.Dup2(int(logFile.Fd()), 2) for !exe.service.GetExit() { for exe.service.GetStop() { time.Sleep(time.Millisecond) diff --git a/icsconf/icsconf.go b/icsconf/icsconf.go index bc7ea7e..3f6c007 100644 --- a/icsconf/icsconf.go +++ b/icsconf/icsconf.go @@ -27,9 +27,14 @@ type IcsConfig struct { SessionExpired SessionExpired `xml:"SESSIONEXPIRED"` DtmfEndSignal DtmfEndSignal `xml:"DTMFEND"` ExceptTest Except `xml:"EXCEPT"` // 예외처리 + Dnis []DNIS `xml:"DNIS"` + TimeSleep TimeSleep `xml:"TIMESLEEP"` + ScenarioConfig map[string][]ScenarioConfig HomeDir string - ScenarioConfig ScenarioConfig `xml:"SCENARIOORDER"` - TimeSleep TimeSleep `xml:"TIMESLEEP"` +} +type DNIS struct { + Dnis string `xml:"dnis,attr"` + ScenarioConfig []ScenarioConfig `xml:"SCENARIOORDER"` } type InfoConfig struct { @@ -234,6 +239,11 @@ func OpenConfig(ConfigFileName string, homeDir string) (*IcsConfig, *icserror.Ic return nil, icserror.ICSERRCONFUnmarshal } + conf.ScenarioConfig = make(map[string][]ScenarioConfig) + for _, value := range conf.Dnis { + conf.ScenarioConfig[value.Dnis] = value.ScenarioConfig + } + if !strings.HasPrefix(conf.LogConfig.Path, "/") { conf.LogConfig.Path = fmt.Sprintf("%s/%s", homeDir, conf.LogConfig.Path) } @@ -337,12 +347,26 @@ func (c IcsConfig) ShowConfig() string { } type ScenarioConfig struct { - Order []string `xml:"method,attr"` - Value []string `xml:"value,attr"` - BargeIn []string `xml:"bargeIn,attr"` - SttMaxTime []int `xml:"sttMaxTime,attr"` - TimeValue []bool `xml:"timeValue,attr"` - TimeSleep []int `xml:"timesleep,attr"` + Action string `xml:"method,attr"` + AnounceMents string `xml:"value,attr"` + BargeIn string `xml:"bargeIn,attr"` + SttMaxTime int `xml:"sttMaxTime,attr"` + TimeValue bool `xml:"timeValue,attr"` + TimeSleep int `xml:"timesleep,attr"` + EndCharacter string `xml:"endcharacter,attr"` + VoiceName int `xml:"voiceName,attr"` + Speed int `xml:"speed,attr"` + Volume int `xml:"volume,attr"` + Pitch int `xml:"pitch,attr"` + MaxWaitTime int `xml:"maxWaitTime,attr"` + MaxDigit int `xml:"maxDigit,attr"` + DigitTerm int `xml:"digitTerm,attr"` + AudioFilePath string `xml:"apath,attr"` + //maxWaitTime + // VoiceName int `json:"voiceName"` + // Speed int `json:"speed"` + // Volume int `json:"volume"` + // Pitch int `json:"pitch"` } type SimConfig struct { diff --git a/icsconf/icsconf_test.go b/icsconf/icsconf_test.go index 143a80e..9ed9e36 100644 --- a/icsconf/icsconf_test.go +++ b/icsconf/icsconf_test.go @@ -1,12 +1,13 @@ package icsconf import ( + "encoding/json" "fmt" "testing" ) func TestGetModName(t *testing.T) { - conf, _ := OpenConfig("/Users/changsoolee/repository/icssoe/icsvc.xml", "/home/icsvc") - - fmt.Println(conf.LicenseConfig) + conf, _ := OpenConfig("/home/icsbot/config/icsbot.xml", "/home/icsvc") + resultJson, _ := json.MarshalIndent(conf, "", " ") + fmt.Println(string(resultJson)) } diff --git a/icshttp/handler.go b/icshttp/handler.go index bb2124e..31c9a66 100644 --- a/icshttp/handler.go +++ b/icshttp/handler.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "math/big" "net/http" + "strconv" "strings" "sync" "time" @@ -38,39 +39,59 @@ type handleInfo struct { h http.HandlerFunc } -type Resquest struct { - Token string `json:"token"` - OprMngCode string `json:"oprMngCode"` - Method string `json:"method"` - TalkText string `json:"talkText"` - CallId string `json:"callId"` - TelNo string `json:"telNo"` - MentType string `json:"mentType"` - RecordFilePath string `json:"recordFilePath"` +type Request struct { + Token string `json:"token"` + OprMngCode string `json:"oprMngCode"` + Method string `json:"method"` + TalkText string `json:"talkText"` + CallId string `json:"callId"` + TrunkGroup string `json:"trunkGroup"` + TelNo string `json:"telNo"` + Dnis string `json:"dnis"` + MentType string `json:"mentType"` + RecordFilePath string `json:"recordFilePath"` + ServerID string `json:"serverId"` + ServerIP string `json:"serverIp"` + Data json.RawMessage `json:"data"` +} + +type Transrate struct { + TargetDnis string `json:"target_dnis"` } type Response struct { - ResultCode int `json:"resultCode"` - Token string `json:"token"` - Action string `json:"action"` - AnounceMents string `json:"announceMents"` - Data ResData `json:"DATA"` + ResultCode int `json:"resultCode"` + Token string `json:"token"` + Action string `json:"action"` + AnounceMents string `json:"announceMents"` + AnnounceFilePath string `json:"announceFilePath"` + Data ResData `json:"DATA"` } type ResData struct { - BargeIn string `json:"bargeIn"` - RecodingFile string `json:"recodingFile"` - SttMaxTime int `json:"sttMaxTime"` - MaxDigit int `json:"maxDigit"` - MinDigit int `json:"minDigit"` - DigitTerm int `json:"digitTerm"` - TelNo string `json:"telNo"` + BargeIn string `json:"bargeIn"` + RecodingFile string `json:"recodingFile"` + SttMaxTime int `json:"sttMaxTime"` + MaxDigit int `json:"maxDigit"` + MinDigit int `json:"minDigit"` + DigitTerm int `json:"digitTerm"` + TelNo string `json:"telNo"` + VoiceName int `json:"voiceName"` + Speed int `json:"speed"` + Volume int `json:"volume"` + Pitch int `json:"pitch"` + EndCharacter []string `json:"endCharacter"` + MaxWaitTime int `json:"maxNoInputTime"` + UUI json.RawMessage `json:"uui"` } type ResStatus struct { Count int Status string NotUnderstand int + PreEventNum int + PreEventNum2 int + LoopCount int } type ScenarioSession struct { @@ -149,15 +170,13 @@ func TTSFunc4(w http.ResponseWriter, r *http.Request) { ///////////////////////////////////////////// //BOT - func (s *ScenarioSession) BOTPFunc(w http.ResponseWriter, r *http.Request) { // get scenario config l := icslog.GetIcsLog() conf := icsconf.GetIcsConfig() scnarioConf := conf.ScenarioConfig - // Request json parsing - request := Resquest{} + request := Request{} resBody, err := ioutil.ReadAll(r.Body) if err != nil { fmt.Println(err) @@ -165,76 +184,71 @@ func (s *ScenarioSession) BOTPFunc(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() err = json.Unmarshal(resBody, &request) + fmt.Printf("%+v\n", request) if err != nil { l.Printf(icslog.LOG_LEVEL_INFO, -1, "response unmarshal error!!!!! ") } agent := strings.SplitN(request.CallId, "@", 2) fmt.Printf(">>>>>> DATA INFO - method [%s], agent [%s], token [%s]\n", request.Method, agent, request.Token) - l.Printf(icslog.LOG_LEVEL_INFO, -1, ">>>>>> DATA INFO - method [%s], agent [%s], token [%s] ", request.Method, agent, request.Token) + l.Printf(icslog.LOG_LEVEL_INFO, -1, ">>>>>> DATA INFO - method [%s], agent [%s], token [%s] talk[%s]", request.Method, agent, request.Token, request.TalkText) response := new(Response) + dnis := request.Dnis + + s.m.Lock() //////////////////////////////////// ///////////// EXCEPT /////////////// //////////////////////////////////// if conf.ExceptTest.TestInfo.Value { // eType := conf.ExceptTest.TestInfo.Type - - if request.Method == "INIT" { - response.ResultCode = conf.ExceptTest.TestInfo.ResultCode - response.Token = conf.ExceptTest.TestInfo.Token - response.Action = conf.ExceptTest.TestInfo.Action - response.AnounceMents = conf.ExceptTest.TestInfo.Announcement - response.Data.BargeIn = conf.ExceptTest.TestInfo.Bargein - response.Data.RecodingFile = conf.ExceptTest.TestInfo.Recodingfile - response.Data.SttMaxTime = conf.ExceptTest.TestInfo.Sttmaxtime - s.session[conf.ExceptTest.TestInfo.Token] = ResStatus{Count: 1, Status: scnarioConf.Order[0], NotUnderstand: 0} - } else if request.TalkText == "ERROR_TTS" || request.TalkText == "ERROR_STT" { - response.ResultCode = 200 - response.Token = request.Token - response.AnounceMents = "서비스에 문제가 발생하여 매장으로 연결해드릴게요." - response.Action = "TRANSFER" - response.Data.BargeIn = "" - response.Data.RecodingFile = "" - response.Data.SttMaxTime = 10 - } else if request.Method != "INIT" && request.TalkText == "" { - response.ResultCode = 200 - response.Token = request.Token - if s.session[request.Token].NotUnderstand == 3 { - response.AnounceMents = "잘 이해하지 못했습니다. 정확한 상담을 위해 매장으로 연결해드릴게요." - response.Action = "END" - } else { - response.AnounceMents = "잘 이해하지 못했습니다. 다시 말씀해주세요." - response.Action = "STT" - s.session[request.Token] = ResStatus{Count: 1, Status: scnarioConf.Order[0], NotUnderstand: s.session[request.Token].NotUnderstand + 1} - } - response.Data.BargeIn = "" - response.Data.RecodingFile = "" - response.Data.SttMaxTime = 10 - } - - // switch eType { - // case "sizeup": + // if request.Method == "INIT" { + // response.ResultCode = conf.ExceptTest.TestInfo.ResultCode + // response.Token = conf.ExceptTest.TestInfo.Token + // response.Action = conf.ExceptTest.TestInfo.Action + // response.AnounceMents = conf.ExceptTest.TestInfo.Announcement + // response.Data.BargeIn = conf.ExceptTest.TestInfo.Bargein + // response.Data.RecodingFile = conf.ExceptTest.TestInfo.Recodingfile + // response.Data.SttMaxTime = conf.ExceptTest.TestInfo.Sttmaxtime + + // s.session[conf.ExceptTest.TestInfo.Token] = ResStatus{Count: 1, Status: scnarioConf[dnis].Action[0], NotUnderstand: 0} + // } else if request.TalkText == "ERROR_TTS" || request.TalkText == "ERROR_STT" { + // response.ResultCode = 200 + // response.Token = request.Token + // response.AnounceMents = "서비스에 문제가 발생하여 매장으로 연결해드릴게요." + // response.Action = "TRANSFER" + // response.Data.BargeIn = "" + // response.Data.RecodingFile = "" + // response.Data.SttMaxTime = 10 + // } else if request.Method == "REFER" { // response.ResultCode = 200 - // response.Token = request.Token + "000000000000000000000000000000" - // response.Action = "" - // response.AnounceMents = "" + // response.Token = request.Token + // response.AnounceMents = "서비스에 문제가 발생하여 매장으로 연결해드릴게요." + // response.Action = "TRANSFER" + // response.Data.BargeIn = "" + // response.Data.RecodingFile = "" + // response.Data.SttMaxTime = 10 + // } else if request.Method != "INIT" && request.TalkText == "" { + // response.ResultCode = 200 + // response.Token = request.Token + // if s.session[request.Token].NotUnderstand == 3 { + // response.AnounceMents = "잘 이해하지 못했습니다. 정확한 상담을 위해 매장으로 연결해드릴게요." + // response.Action = "END" + // } else { + // response.AnounceMents = "잘 이해하지 못했습니다. 다시 말씀해주세요." + // response.Action = "STT" + // s.session[request.Token] = ResStatus{Count: 1, Status: scnarioConf[dnis].Action[0], NotUnderstand: s.session[request.Token].NotUnderstand + 1} + // } // response.Data.BargeIn = "" // response.Data.RecodingFile = "" // response.Data.SttMaxTime = 10 - // case "sizedown": - // case "space": - // case "null": // } } else { //////////////////////////////////// //////// SCENARIO MAPPING/////////// //////////////////////////////////// - - // 현재 들어온 method로 분기 - // next 시나리오로 넘겨주기 - fmt.Printf("response %+v", request) + fmt.Println(request.Method) if request.Method == "HANGUP" { response.ResultCode = 200 response.Token = request.Token @@ -244,109 +258,402 @@ func (s *ScenarioSession) BOTPFunc(w http.ResponseWriter, r *http.Request) { response.Data.RecodingFile = "" response.Data.SttMaxTime = 10 } else if request.Method != "INIT" && request.TalkText == "" { - response.ResultCode = 200 - response.Token = request.Token - if s.session[request.Token].NotUnderstand == 3 { - response.AnounceMents = "잘 이해하지 못했습니다. 정확한 상담을 위해 매장으로 연결해드릴게요." - response.Action = "END" + if request.TalkText == "" { + request.TalkText = "잘못된 값 입력 " + } + + fmt.Println(dnis) + if dnis == "AISB" || dnis == "07075999956" || dnis == "821462" || dnis == "1462" { + dnis = "9013" + } + fmt.Println(dnis) + if dnis != "07012345678" && dnis != "07077442711" { + dnis = "sim" + } + + if dnis == "07012345678" || dnis == "07077442711" { + dnis = "sim3" + } + + if dnis == "9012" { + response.ResultCode = 200 + response.Token = request.Token + response.Action = scnarioConf[dnis][s.session[request.Token].Count+1].Action + response.AnounceMents = scnarioConf[dnis][s.session[request.Token].Count+1].AnounceMents + if s.session[request.Token].Count != 0 && dnis == "9012" { + response.AnounceMents = strings.ReplaceAll(response.AnounceMents, "$", request.TalkText) + } + response.Data.Speed = scnarioConf[dnis][s.session[request.Token].Count+1].Speed + response.Data.VoiceName = scnarioConf[dnis][s.session[request.Token].Count+1].VoiceName + response.Data.Volume = scnarioConf[dnis][s.session[request.Token].Count+1].Volume + response.Data.Pitch = scnarioConf[dnis][s.session[request.Token].Count+1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][s.session[request.Token].Count+1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][s.session[request.Token].Count+1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][s.session[request.Token].Count+1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][s.session[request.Token].Count+1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][s.session[request.Token].Count+1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].Count+1].DigitTerm + response.Data.RecodingFile = "Y" + + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count+1].Action} + + } else if dnis == "sim3" { + //시뮬레이터 + response.ResultCode = 200 + response.Action = scnarioConf[dnis][s.session[request.Token].Count].Action + response.AnounceMents = scnarioConf[dnis][s.session[request.Token].Count].AnounceMents + response.Data.Speed = scnarioConf[dnis][s.session[request.Token].Count].Speed + response.Data.VoiceName = scnarioConf[dnis][s.session[request.Token].Count].VoiceName + response.Data.Volume = scnarioConf[dnis][s.session[request.Token].Count].Volume + response.Data.Pitch = scnarioConf[dnis][s.session[request.Token].Count].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][s.session[request.Token].Count].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][s.session[request.Token].Count].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][s.session[request.Token].Count].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][s.session[request.Token].Count].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][s.session[request.Token].Count+1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].Count].DigitTerm + response.Data.RecodingFile = "Y" + + if s.session[request.Token].LoopCount > 100 { + s.session[request.Token] = ResStatus{LoopCount: s.session[request.Token].LoopCount, Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count+1].Action} + } else { + s.session[request.Token] = ResStatus{LoopCount: s.session[request.Token].LoopCount + 1, Count: 1, Status: scnarioConf[dnis][s.session[request.Token].Count].Action} + } } else { - response.AnounceMents = "잘 이해하지 못했습니다. 다시 말씀해주세요." - response.Action = "STT" - s.session[request.Token] = ResStatus{Count: 1, Status: scnarioConf.Order[0], NotUnderstand: s.session[request.Token].NotUnderstand + 1} + response.ResultCode = 200 + response.Token = request.Token + response.Action = scnarioConf[dnis][1].Action + response.AnounceMents = scnarioConf[dnis][1].AnounceMents + response.AnnounceFilePath = scnarioConf[dnis][1].AudioFilePath + response.Data.Speed = scnarioConf[dnis][1].Speed + response.Data.VoiceName = scnarioConf[dnis][1].VoiceName + response.Data.Volume = scnarioConf[dnis][1].Volume + response.Data.Pitch = scnarioConf[dnis][1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][1].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][1].Action} + //s.m.Unlock() } - response.Data.BargeIn = "" - response.Data.RecodingFile = "" - response.Data.SttMaxTime = 10 } else { - if request.Method == "HANGUP" { - s.ByeCheck(request.Method, request.Token) - } else { - switch request.Method { - case "INIT": - token := createToken(request.CallId) - response.ResultCode = 200 - response.Token = token - response.Action = scnarioConf.Order[1] - response.AnounceMents = scnarioConf.Value[0] - response.Data.BargeIn = scnarioConf.BargeIn[0] - response.Data.RecodingFile = "Y" - response.Data.SttMaxTime = scnarioConf.SttMaxTime[0] - - s.m.Lock() - s.session[token] = ResStatus{Count: 1, Status: scnarioConf.Order[0], NotUnderstand: 0} - s.m.Unlock() - case "STT": - response.ResultCode = 200 - response.Token = request.Token - response.Action = scnarioConf.Order[s.session[request.Token].Count+1] - response.AnounceMents = scnarioConf.Value[s.session[request.Token].Count] - response.Data.BargeIn = scnarioConf.BargeIn[s.session[request.Token].Count] + fmt.Println("RECV METHOD") + fmt.Println(dnis) + // if dnis != "9012" && dnis != "9013" && dnis != "9014" { + // dnis = "sim" + // } else + if dnis == "AISB" || dnis == "07075999956" || dnis == "821462" || dnis == "1462" { + dnis = "9013" + } + fmt.Println(dnis) + if dnis == "9012" || dnis == "07012345678" || dnis == "07077442711" { + dnis = "sim3" + } + + if dnis == "9013" { + dnis = "9014" + } + + fmt.Println(scnarioConf[dnis]) + switch request.Method { + case "INIT": + token := createToken(request.CallId) + response.ResultCode = 200 + response.Token = token + response.Action = scnarioConf[dnis][s.session[request.Token].Count+1].Action + response.AnounceMents = scnarioConf[dnis][s.session[request.Token].Count+1].AnounceMents + response.Data.Speed = scnarioConf[dnis][s.session[request.Token].Count+1].Speed + response.Data.VoiceName = scnarioConf[dnis][s.session[request.Token].Count+1].VoiceName + response.Data.Volume = scnarioConf[dnis][s.session[request.Token].Count+1].Volume + response.Data.Pitch = scnarioConf[dnis][s.session[request.Token].Count+1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][s.session[request.Token].Count+1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][s.session[request.Token].Count+1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][s.session[request.Token].Count+1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][s.session[request.Token].Count+1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][s.session[request.Token].Count+1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].Count+1].DigitTerm + response.AnnounceFilePath = scnarioConf[dnis][s.session[request.Token].Count+1].AudioFilePath + response.Data.RecodingFile = "Y" + //s.m.Lock() + s.session[token] = ResStatus{Count: 1, Status: scnarioConf[dnis][0].Action, NotUnderstand: 0, PreEventNum: 1} + // s.m.Unlock() + case "STT", "DTMF", "BOTH", "MEMO", "NONE": + response.ResultCode = 200 + response.Token = request.Token + if dnis == "9013" || dnis == "9014" { + response.Action = scnarioConf[dnis][s.session[request.Token].Count+1].Action + response.AnounceMents = scnarioConf[dnis][s.session[request.Token].Count+1].AnounceMents + response.Data.Speed = scnarioConf[dnis][s.session[request.Token].Count+1].Speed + response.Data.VoiceName = scnarioConf[dnis][s.session[request.Token].Count+1].VoiceName + response.Data.Volume = scnarioConf[dnis][s.session[request.Token].Count+1].Volume + response.Data.Pitch = scnarioConf[dnis][s.session[request.Token].Count+1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][s.session[request.Token].Count+1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][s.session[request.Token].Count+1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][s.session[request.Token].Count+1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][s.session[request.Token].Count+1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][s.session[request.Token].Count+1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].Count+1].DigitTerm + response.AnnounceFilePath = scnarioConf[dnis][s.session[request.Token].Count+1].AudioFilePath + response.Data.RecodingFile = "Y" - response.Data.SttMaxTime = scnarioConf.SttMaxTime[s.session[request.Token].Count] - - s.m.Lock() - s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf.Order[s.session[request.Token].Count+1]} - s.m.Unlock() - case "DTMF": - response.ResultCode = 200 - response.Token = request.Token - response.Action = scnarioConf.Order[s.session[request.Token].Count+1] - response.AnounceMents = scnarioConf.Value[s.session[request.Token].Count] - response.Data.BargeIn = "N" + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count+1].Action} + // s.m.Unlock() + } else if dnis == "9012" { + response.Action = scnarioConf[dnis][1].Action + response.AnounceMents = scnarioConf[dnis][1].AnounceMents + response.Data.Speed = scnarioConf[dnis][1].Speed + response.Data.VoiceName = scnarioConf[dnis][1].VoiceName + response.Data.Volume = scnarioConf[dnis][1].Volume + response.Data.Pitch = scnarioConf[dnis][1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][1].MaxDigit + // response.Data.EndCharacter = []string{scnarioConf[dnis][1].EndCharacter} + // response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].Count+1].DigitTerm response.Data.RecodingFile = "Y" - response.Data.SttMaxTime = 3 - - s.m.Lock() - s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf.Order[s.session[request.Token].Count+1]} - s.m.Unlock() - case "REFER": - response.ResultCode = 200 - response.Token = request.Token - response.Action = "END" - response.AnounceMents = "네. 매장으로 연결해드릴게요." - response.Data.BargeIn = "" - response.Data.RecodingFile = "" - response.Data.SttMaxTime = 0 - response.Data.TelNo = request.TelNo - - s.m.Lock() - s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf.Order[s.session[request.Token].Count+1]} - s.m.Unlock() - case "BYE": // 전화 종료 요청 - response.ResultCode = 200 - response.Token = request.Token - response.Action = "END" - response.AnounceMents = "접수가 완료되었습니다." - response.Data.BargeIn = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][1].Action} + // s.m.Unlock() + } else if dnis == "1000" { + preEventNum := s.session[request.Token].PreEventNum + fmt.Printf("\n num %+v\n", preEventNum) + switch preEventNum { + case 1: + actionNum, err := strconv.Atoi(request.TalkText) + if err == nil { + response.Action = scnarioConf[dnis][actionNum+2].Action + response.AnounceMents = scnarioConf[dnis][actionNum+2].AnounceMents + response.Data.Speed = scnarioConf[dnis][actionNum+2].Speed + response.Data.VoiceName = scnarioConf[dnis][actionNum+2].VoiceName + response.Data.Volume = scnarioConf[dnis][actionNum+2].Volume + response.Data.Pitch = scnarioConf[dnis][actionNum+2].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][actionNum+2].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][actionNum+2].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][actionNum+2].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][actionNum+2].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][actionNum+2].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][actionNum+2].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][actionNum+2].Action, PreEventNum: actionNum + 2} + // s.m.Unlock() + } else { + response.Action = scnarioConf[dnis][1].Action + response.AnounceMents = scnarioConf[dnis][1].AnounceMents + response.Data.Speed = scnarioConf[dnis][1].Speed + response.Data.VoiceName = scnarioConf[dnis][1].VoiceName + response.Data.Volume = scnarioConf[dnis][1].Volume + response.Data.Pitch = scnarioConf[dnis][1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][1].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][1].Action, PreEventNum: 1} + // s.m.Unlock() + } + case 2: + actionNum, err := strconv.Atoi(request.TalkText) + if err == nil { + if actionNum == 1 { + response.Action = scnarioConf[dnis][s.session[request.Token].PreEventNum2].Action + response.AnounceMents = scnarioConf[dnis][s.session[request.Token].PreEventNum2].AnounceMents + response.Data.Speed = scnarioConf[dnis][s.session[request.Token].PreEventNum2].Speed + response.Data.VoiceName = scnarioConf[dnis][s.session[request.Token].PreEventNum2].VoiceName + response.Data.Volume = scnarioConf[dnis][s.session[request.Token].PreEventNum2].Volume + response.Data.Pitch = scnarioConf[dnis][s.session[request.Token].PreEventNum2].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][s.session[request.Token].PreEventNum2].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][s.session[request.Token].PreEventNum2].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][s.session[request.Token].PreEventNum2].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][s.session[request.Token].PreEventNum2].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][s.session[request.Token].PreEventNum2].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].PreEventNum2].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].PreEventNum2].Action, PreEventNum: s.session[request.Token].PreEventNum2} + // s.m.Unlock() + } else { + response.Action = scnarioConf[dnis][1].Action + response.AnounceMents = scnarioConf[dnis][1].AnounceMents + response.Data.Speed = scnarioConf[dnis][1].Speed + response.Data.VoiceName = scnarioConf[dnis][1].VoiceName + response.Data.Volume = scnarioConf[dnis][1].Volume + response.Data.Pitch = scnarioConf[dnis][1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][1].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][1].Action, PreEventNum: 1, PreEventNum2: 1} + // s.m.Unlock() + } + + } else { + response.Action = scnarioConf[dnis][1].Action + response.AnounceMents = scnarioConf[dnis][1].AnounceMents + response.Data.Speed = scnarioConf[dnis][1].Speed + response.Data.VoiceName = scnarioConf[dnis][1].VoiceName + response.Data.Volume = scnarioConf[dnis][1].Volume + response.Data.Pitch = scnarioConf[dnis][1].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][1].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][1].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][1].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][1].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][1].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][1].Action, PreEventNum: 1} + // s.m.Unlock() + } + default: + + response.Action = scnarioConf[dnis][2].Action + response.AnounceMents = "결과 " + request.TalkText + " " + scnarioConf[dnis][2].AnounceMents + response.Data.Speed = scnarioConf[dnis][2].Speed + response.Data.VoiceName = scnarioConf[dnis][2].VoiceName + response.Data.Volume = scnarioConf[dnis][2].Volume + response.Data.Pitch = scnarioConf[dnis][2].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][2].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][2].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][2].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][2].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][2].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][2].DigitTerm + response.Data.RecodingFile = "Y" + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][2].Action, PreEventNum: 2, PreEventNum2: s.session[request.Token].PreEventNum} + //s.m.Unlock() + } + } else { + //시뮬레이터 + response.Action = scnarioConf[dnis][s.session[request.Token].Count].Action + response.AnounceMents = scnarioConf[dnis][s.session[request.Token].Count].AnounceMents + response.Data.Speed = scnarioConf[dnis][s.session[request.Token].Count].Speed + response.Data.VoiceName = scnarioConf[dnis][s.session[request.Token].Count].VoiceName + response.Data.Volume = scnarioConf[dnis][s.session[request.Token].Count].Volume + response.Data.Pitch = scnarioConf[dnis][s.session[request.Token].Count].Pitch + response.Data.MaxWaitTime = scnarioConf[dnis][s.session[request.Token].Count].MaxWaitTime + response.Data.BargeIn = scnarioConf[dnis][s.session[request.Token].Count].BargeIn + response.Data.SttMaxTime = scnarioConf[dnis][s.session[request.Token].Count].SttMaxTime + response.Data.MaxDigit = scnarioConf[dnis][s.session[request.Token].Count].MaxDigit + response.Data.EndCharacter = []string{scnarioConf[dnis][s.session[request.Token].Count+1].EndCharacter} + response.Data.DigitTerm = scnarioConf[dnis][s.session[request.Token].Count].DigitTerm response.Data.RecodingFile = "Y" - response.Data.SttMaxTime = 0 - // case "HANGUP": - // response.ResultCode = 200 - // response.Token = request.Token - // response.Action = "" - // response.AnounceMents = "" - // response.Data.BargeIn = "" - // response.Data.RecodingFile = "" - // response.Data.SttMaxTime = 0 - // if ByeCheck(request.Method, request.Token) { - // } + + if s.session[request.Token].LoopCount > 100 { + s.session[request.Token] = ResStatus{LoopCount: s.session[request.Token].LoopCount, Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count].Action} + } else { + s.session[request.Token] = ResStatus{LoopCount: s.session[request.Token].LoopCount + 1, Count: s.session[request.Token].Count, Status: scnarioConf[dnis][s.session[request.Token].Count].Action} + } + // s.m.Lock() + // s.m.Unlock() } + + case "REFER": + response.ResultCode = 200 + response.Token = request.Token + response.Action = "TRANSFER" + response.AnounceMents = "네. 매장으로 연결해드릴게요." + response.Data.BargeIn = "" + response.Data.RecodingFile = "" + response.Data.SttMaxTime = 0 + response.Data.TelNo = request.TelNo + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count+1].Action} + case "TRANSFER": + response.ResultCode = 200 + response.Token = request.Token + response.Action = "TRANSFER" + response.AnounceMents = "네. 매장으로 연결해드릴게요." + response.Data.BargeIn = "" + response.Data.RecodingFile = "" + response.Data.SttMaxTime = 0 + response.Data.TelNo = request.TelNo + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count+1].Action} + // s.m.Unlock() + + case "TRNASFER2": // 전화 종료 요청 + response.ResultCode = 200 + response.Token = request.Token + response.Action = "TRANSFER2" + response.AnounceMents = "네. 매장으로 연결해드릴게요." + response.Data.BargeIn = "" + response.Data.RecodingFile = "" + response.Data.SttMaxTime = 0 + response.Data.TelNo = request.TelNo + + // s.m.Lock() + s.session[request.Token] = ResStatus{Count: s.session[request.Token].Count + 1, Status: scnarioConf[dnis][s.session[request.Token].Count+1].Action} + // s.m.Unlock() + + response.Token = request.Token + response.Action = "END" + response.AnounceMents = "접수가 완료되었습니다." + response.Data.BargeIn = "N" + response.Data.RecodingFile = "Y" + response.Data.SttMaxTime = 0 } + } } + response.Data.UUI = json.RawMessage{} + uuiMap := map[string]interface{}{ + "test1": "testdata1231", + "test2": 123, + "test3": 0.1, + } + + // 맵을 JSON으로 마샬링 + uuiJSON, err := json.Marshal(uuiMap) + if err != nil { + fmt.Println("Error marshaling UUI:", err) + return + } + + // 마샬링된 JSON을 json.RawMessage로 변환 + response.Data.UUI = json.RawMessage(uuiJSON) + response.Data.TelNo = request.TelNo + s.m.Unlock() // response marshal + resMarshal, jerr := json.Marshal(response) if jerr != nil { fmt.Println("Json Marshal error ", jerr) } + fmt.Printf("%+v", response) l.Printf(icslog.LOG_LEVEL_INFO, -1, "Send Message\n %s", string(resMarshal)) - if scnarioConf.TimeValue[s.session[request.Token].Count] { - l.Printf(icslog.LOG_LEVEL_INFO, -1, "Time Sleep %d \r\n", scnarioConf.TimeSleep[s.session[request.Token].Count]) - time.Sleep(time.Second * time.Duration(time.Duration(scnarioConf.TimeSleep[s.session[request.Token].Count]))) - } + // if s.session[request.Token].Count < len(scnarioConf[dnis]) && scnarioConf[dnis][s.session[request.Token].Count].TimeValue { + // l.Printf(icslog.LOG_LEVEL_INFO, -1, "Time Sleep %d \r\n", scnarioConf[dnis][s.session[request.Token].Count].TimeSleep) + // time.Sleep(time.Second * time.Duration(time.Duration(scnarioConf[dnis][s.session[request.Token].Count].TimeSleep))) + // } else { + // } + time.Sleep(time.Second * 1) // send response fmt.Fprintln(w, string(resMarshal)) @@ -354,22 +661,9 @@ func (s *ScenarioSession) BOTPFunc(w http.ResponseWriter, r *http.Request) { func createToken(callId string) string { token := "" - // length := []int{8, 4, 4, 4, 12} - // codeAlphabet := "abcdefghijklmnopqrstuvwxyz" - // codeAlphabet += "0123456789" - - // for i, v := range length { - // fmt.Println(i, v) - // for j := 0; j < v; j++ { - // token += string(codeAlphabet[cryptoRandSecure(int64(len(codeAlphabet)))]) - // } - // if v != 12 { - // token += "-" - // } - // } times := fmt.Sprintf("%d", time.Now().UnixNano()/1000000) tokens := strings.Split(callId, "@")[0] + times - token = tokens[0:8] + "-" + tokens[8:12] + "-" + tokens[12:16] + "-" + tokens[16:20] + "-" + tokens[20:32] + token = tokens[0:8] + "-" + tokens[8:10] + "-" + tokens[10:23] return token } diff --git a/icshttpclient/client.go b/icshttpclient/client.go index a171dee..c7b58cb 100644 --- a/icshttpclient/client.go +++ b/icshttpclient/client.go @@ -62,6 +62,7 @@ type DataJSON struct { MinDigit int `json:"minDigit"` DigitTerm int `json:"digitTerm"` TelNo string `json:"telNo"` + UUI string `json:"uui"` } func NewIcsHttpClient(method, url string, body io.Reader) *IcsHttpClient { diff --git a/icssoe.xml b/icssoe.xml deleted file mode 100644 index 1cffc96..0000000 --- a/icssoe.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 00001 - 00 - 192.168.0.21 - - - - - - - - 2CF05DD7C692 - 128 - 9999 - - - log - 100 - - DEBUG - file - - - - - diff --git a/icsvbot.xml b/icsvbot.xml deleted file mode 100644 index 3ee717d..0000000 --- a/icsvbot.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - 2CF05DD7C692 - 6 - 9999 - - - - 00001 - 00 - 192.168.0.21 - - - - - - - - - - - - - - - /home/icsbot/log - 100 - DEBUG2 - file - - - - - - Y - /home/icsva/bin/voice - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/start.sh b/start.sh deleted file mode 100755 index e4cb983..0000000 --- a/start.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/sh -BIN=$ICSVA_ROOT/bin -msg=`$BIN/loader` -echo $msg diff --git a/startdlv.sh b/startdlv.sh deleted file mode 100755 index 187b6eb..0000000 --- a/startdlv.sh +++ /dev/null @@ -1 +0,0 @@ -sudo LD_LIBRARY_PATH=/usr/local/lib ICSVA_ROOT=/home/icsva /root/go/bin/dlv debug /home/shbaik/dev/work/voiceagent/voiceagent.go diff --git a/startvc.sh b/startvc.sh deleted file mode 100755 index 693cf9b..0000000 --- a/startvc.sh +++ /dev/null @@ -1 +0,0 @@ -sudo LD_LIBRARY_PATH=/usr/local/lib ICSVA_ROOT=/home/icsva go run /home/shbaik/dev/work/voiceagent/voiceagent.go diff --git a/startvc2.sh b/startvc2.sh deleted file mode 100755 index 0dd26e1..0000000 --- a/startvc2.sh +++ /dev/null @@ -1 +0,0 @@ -sudo LD_LIBRARY_PATH=/usr/local/lib ICSVA_ROOT=/home/icsva /home/shbaik/dev/work/voiceagent/voiceagent diff --git a/stop.sh b/stop.sh deleted file mode 100755 index df06394..0000000 --- a/stop.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/sh -HOME=$ICSVA_ROOT -`cat $HOME/voiceagent.pid | xargs kill` -echo "VoiceAgent Stoped..." diff --git a/track20230622_170834.log b/track20230622_170834.log new file mode 100644 index 0000000..e69de29 diff --git a/track20231016_134640.log b/track20231016_134640.log new file mode 100644 index 0000000..e69de29 diff --git a/track20231016_134710.log b/track20231016_134710.log new file mode 100644 index 0000000..e69de29 diff --git a/track20231016_134809.log b/track20231016_134809.log new file mode 100644 index 0000000..e69de29 diff --git a/track20231016_135123.log b/track20231016_135123.log new file mode 100644 index 0000000..e69de29