mirror of
https://git.hmsn.ink/kospo/helptalk/api.git
synced 2026-03-19 19:25:11 +09:00
버그 수정
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java'
|
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'
|
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-thymeleaf'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-webflux'
|
implementation 'org.springframework.boot:spring-boot-starter-webflux'
|
||||||
// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent
|
// 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.springframework.retry:spring-retry:2.0.8'
|
||||||
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
|
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
|
||||||
|
|
||||||
|
|||||||
@@ -211,6 +211,8 @@ const question = () => {
|
|||||||
global.element.chatEditorArea.classList.remove('cus-hide');
|
global.element.chatEditorArea.classList.remove('cus-hide');
|
||||||
// 채팅 구독 메시지 보내기
|
// 채팅 구독 메시지 보내기
|
||||||
localStorage.setItem(global.tabId, talkId)
|
localStorage.setItem(global.tabId, talkId)
|
||||||
|
localStorage.setItem('workId', global.work.workId)
|
||||||
|
localStorage.setItem('workNm', global.work.workNm)
|
||||||
// 발 생성자 주입
|
// 발 생성자 주입
|
||||||
global.chatCreator = global.tabId;
|
global.chatCreator = global.tabId;
|
||||||
talkEvent.join(global.talkParams({
|
talkEvent.join(global.talkParams({
|
||||||
|
|||||||
@@ -182,7 +182,6 @@ const talkEvent = {
|
|||||||
workSubscribe: () => {
|
workSubscribe: () => {
|
||||||
return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}`, async function (content) {
|
return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}`, async function (content) {
|
||||||
const payload = JSON.parse(content.body);
|
const payload = JSON.parse(content.body);
|
||||||
console.log('workSubscribe', payload)
|
|
||||||
let sendFlag = false;
|
let sendFlag = false;
|
||||||
while (!sendFlag) {
|
while (!sendFlag) {
|
||||||
if (global.serviceWorkerConnect) {
|
if (global.serviceWorkerConnect) {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class Talk {
|
|||||||
global.option = Common.mergeObject(options, default_options)
|
global.option = Common.mergeObject(options, default_options)
|
||||||
|
|
||||||
/*서비스워커 윈도우 클라이언트 특정 하기 위한 url 맵핑*/
|
/*서비스워커 윈도우 클라이언트 특정 하기 위한 url 맵핑*/
|
||||||
if(options.url !== undefined && options.url !== '') {
|
if(options.url !== '' && options.url !== undefined) {
|
||||||
global.currentUrl = options.url;
|
global.currentUrl = options.url;
|
||||||
} else {
|
} else {
|
||||||
global.currentUrl = window.location.href;
|
global.currentUrl = window.location.href;
|
||||||
|
|||||||
@@ -211,6 +211,8 @@ const question = () => {
|
|||||||
global.element.chatEditorArea.classList.remove('cus-hide');
|
global.element.chatEditorArea.classList.remove('cus-hide');
|
||||||
// 채팅 구독 메시지 보내기
|
// 채팅 구독 메시지 보내기
|
||||||
localStorage.setItem(global.tabId, talkId)
|
localStorage.setItem(global.tabId, talkId)
|
||||||
|
localStorage.setItem('workId', global.work.workId)
|
||||||
|
localStorage.setItem('workNm', global.work.workNm)
|
||||||
// 발 생성자 주입
|
// 발 생성자 주입
|
||||||
global.chatCreator = global.tabId;
|
global.chatCreator = global.tabId;
|
||||||
talkEvent.join(global.talkParams({
|
talkEvent.join(global.talkParams({
|
||||||
|
|||||||
@@ -157,8 +157,7 @@ const talkEvent = {
|
|||||||
},
|
},
|
||||||
// 개인 사번 구독
|
// 개인 사번 구독
|
||||||
userSubscribe: () => {
|
userSubscribe: () => {
|
||||||
const sessionId = talkEvent.generateTabUUID()
|
return global.stomp.subscribe(`/exchange/user.exchange/user.${global.user.sabun}`, async function (content) {
|
||||||
return global.stomp.subscribe(`/exchange/user.exchange/user.${global.user.sabun}.${sessionId}`, async function (content) {
|
|
||||||
const payload = JSON.parse(content.body);
|
const payload = JSON.parse(content.body);
|
||||||
if(payload.type === 'DEAD_MESSAGE') {
|
if(payload.type === 'DEAD_MESSAGE') {
|
||||||
global.shadowRoot.querySelector('.socket-error').classList.remove('cus-hide')
|
global.shadowRoot.querySelector('.socket-error').classList.remove('cus-hide')
|
||||||
@@ -181,8 +180,7 @@ const talkEvent = {
|
|||||||
},
|
},
|
||||||
// 업무 구독
|
// 업무 구독
|
||||||
workSubscribe: () => {
|
workSubscribe: () => {
|
||||||
const sessionId = talkEvent.generateTabUUID()
|
return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}`, async function (content) {
|
||||||
return global.stomp.subscribe(`/exchange/work.exchange/work.${global.work.workId}.${sessionId}`, async function (content) {
|
|
||||||
const payload = JSON.parse(content.body);
|
const payload = JSON.parse(content.body);
|
||||||
let sendFlag = false;
|
let sendFlag = false;
|
||||||
while (!sendFlag) {
|
while (!sendFlag) {
|
||||||
|
|||||||
@@ -1374,6 +1374,7 @@ class Talk {
|
|||||||
const talkId = localStorage.getItem(global.tabId);
|
const talkId = localStorage.getItem(global.tabId);
|
||||||
const workId = localStorage.getItem('workId');
|
const workId = localStorage.getItem('workId');
|
||||||
const workNm = localStorage.getItem('workNm');
|
const workNm = localStorage.getItem('workNm');
|
||||||
|
console.log(talkId, workId, workNm)
|
||||||
if(talkId === null || workId === null) {
|
if(talkId === null || workId === null) {
|
||||||
global.notifier.alert('통신 오류가 발생 했어요.<br/>새로고침 해주세요.')
|
global.notifier.alert('통신 오류가 발생 했어요.<br/>새로고침 해주세요.')
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user