diff --git a/build.gradle b/build.gradle index 0e3501a..5a4de0c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.5.6' + id 'org.springframework.boot' version '3.3.2' id 'io.spring.dependency-management' version '1.1.6' } @@ -51,7 +51,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-webflux' // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent - implementation 'org.springframework.boot:spring-boot-starter-parent:3.5.6' implementation 'org.springframework.retry:spring-retry:2.0.8' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' diff --git a/sample/dev/talk/js/module/apis.js b/sample/dev/talk/js/module/apis.js index 3bf2ddd..546aae8 100644 --- a/sample/dev/talk/js/module/apis.js +++ b/sample/dev/talk/js/module/apis.js @@ -211,6 +211,8 @@ const question = () => { global.element.chatEditorArea.classList.remove('cus-hide'); // 채팅 구독 메시지 보내기 localStorage.setItem(global.tabId, talkId) + localStorage.setItem('workId', global.work.workId) + localStorage.setItem('workNm', global.work.workNm) // 발 생성자 주입 global.chatCreator = global.tabId; talkEvent.join(global.talkParams({ diff --git a/sample/dev/talk/js/module/talkEvent.js b/sample/dev/talk/js/module/talkEvent.js index 21aa117..8b9026c 100644 --- a/sample/dev/talk/js/module/talkEvent.js +++ b/sample/dev/talk/js/module/talkEvent.js @@ -182,7 +182,6 @@ const talkEvent = { workSubscribe: () => { return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}`, async function (content) { const payload = JSON.parse(content.body); - console.log('workSubscribe', payload) let sendFlag = false; while (!sendFlag) { if (global.serviceWorkerConnect) { diff --git a/sample/dev/talk/js/talk.js b/sample/dev/talk/js/talk.js index 3858d4a..16a8149 100644 --- a/sample/dev/talk/js/talk.js +++ b/sample/dev/talk/js/talk.js @@ -46,7 +46,7 @@ class Talk { global.option = Common.mergeObject(options, default_options) /*서비스워커 윈도우 클라이언트 특정 하기 위한 url 맵핑*/ - if(options.url !== undefined && options.url !== '') { + if(options.url !== '' && options.url !== undefined) { global.currentUrl = options.url; } else { global.currentUrl = window.location.href; diff --git a/sample/prod/talk/js/module/apis.js b/sample/prod/talk/js/module/apis.js index 17d7fa8..38b5894 100644 --- a/sample/prod/talk/js/module/apis.js +++ b/sample/prod/talk/js/module/apis.js @@ -211,6 +211,8 @@ const question = () => { global.element.chatEditorArea.classList.remove('cus-hide'); // 채팅 구독 메시지 보내기 localStorage.setItem(global.tabId, talkId) + localStorage.setItem('workId', global.work.workId) + localStorage.setItem('workNm', global.work.workNm) // 발 생성자 주입 global.chatCreator = global.tabId; talkEvent.join(global.talkParams({ diff --git a/sample/prod/talk/js/module/talkEvent.js b/sample/prod/talk/js/module/talkEvent.js index 31c233e..34d9fa5 100644 --- a/sample/prod/talk/js/module/talkEvent.js +++ b/sample/prod/talk/js/module/talkEvent.js @@ -157,8 +157,7 @@ const talkEvent = { }, // 개인 사번 구독 userSubscribe: () => { - const sessionId = talkEvent.generateTabUUID() - return global.stomp.subscribe(`/exchange/user.exchange/user.${global.user.sabun}.${sessionId}`, async function (content) { + return global.stomp.subscribe(`/exchange/user.exchange/user.${global.user.sabun}`, async function (content) { const payload = JSON.parse(content.body); if(payload.type === 'DEAD_MESSAGE') { global.shadowRoot.querySelector('.socket-error').classList.remove('cus-hide') @@ -181,8 +180,7 @@ const talkEvent = { }, // 업무 구독 workSubscribe: () => { - const sessionId = talkEvent.generateTabUUID() - return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}.${sessionId}`, async function (content) { + return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}`, async function (content) { const payload = JSON.parse(content.body); let sendFlag = false; while (!sendFlag) { diff --git a/sample/prod/talk/js/talk.js b/sample/prod/talk/js/talk.js index 86f61b6..1ec8ebf 100644 --- a/sample/prod/talk/js/talk.js +++ b/sample/prod/talk/js/talk.js @@ -1374,6 +1374,7 @@ class Talk { const talkId = localStorage.getItem(global.tabId); const workId = localStorage.getItem('workId'); const workNm = localStorage.getItem('workNm'); + console.log(talkId, workId, workNm) if(talkId === null || workId === null) { global.notifier.alert('통신 오류가 발생 했어요.
새로고침 해주세요.') return;