diff --git a/im-commom/pom.xml b/im-commom/pom.xml index bf1e555..43fb929 100644 --- a/im-commom/pom.xml +++ b/im-commom/pom.xml @@ -59,11 +59,6 @@ java-jwt 3.11.0 - - com.google.guava - guava - 32.1.2-jre - org.slf4j diff --git a/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java b/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java deleted file mode 100644 index 113a221..0000000 --- a/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.bx.implatform.config; - -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.core.Ordered; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -import java.util.Arrays; - -//@Configuration -public class GlobalCorsConfig { - - @Bean - public FilterRegistrationBean corsFilter() { - FilterRegistrationBean corsFilterFilterRegistrationBean = new FilterRegistrationBean<>(); - //添加CORS配置信息 - CorsConfiguration corsConfiguration = new CorsConfiguration(); - //允许的域,不要写*,否则cookie就无法使用了 - corsConfiguration.addAllowedOrigin("*"); - //允许的头信息 - corsConfiguration.addAllowedHeader("*"); - //允许的请求方式 - corsConfiguration.setAllowedMethods(Arrays.asList("POST", "PUT", "GET", "OPTIONS", "DELETE")); - //是否发送cookie信息 - corsConfiguration.setAllowCredentials(true); - //预检请求的有效期,单位为秒 - corsConfiguration.setMaxAge(3600L); - - //添加映射路径,标识待拦截的请求 - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", corsConfiguration); - corsFilterFilterRegistrationBean.setFilter(new CorsFilter(source)); - corsFilterFilterRegistrationBean.setOrder(Ordered.HIGHEST_PRECEDENCE); - return corsFilterFilterRegistrationBean; - } -} diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index 3ca8b03..0e8d8eb 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -2,7 +2,7 @@ package com.bx.implatform.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.text.CharSequenceUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -73,7 +73,7 @@ public class GroupMessageServiceImpl extends ServiceImpl
-
{ if (node.nodeName == "#text") { - sendText = document.getElementById("inputText").innerHTML; + sendText += this.html2Escape(node.textContent); } else if (node.nodeName == "SPAN") { sendText += node.innerText; } else if (node.nodeName == "IMG") { @@ -230,6 +230,16 @@ }) return sendText; }, + html2Escape(strHtml) { + return strHtml.replace(/[<>&"]/g, function(c) { + return { + '<': '<', + '>': '>', + '&': '&', + '"': '"' + }[c]; + }); + }, createAtUserIds() { let ids = []; this.$refs.editBox.childNodes.forEach((node) => { diff --git a/im-uniapp/package.json b/im-uniapp/package.json index 91b9952..6e7405d 100644 --- a/im-uniapp/package.json +++ b/im-uniapp/package.json @@ -6,7 +6,7 @@ "browser":"chrome", "env": { "UNI_PLATFORM": "h5", - "BASE_URL": "http://127.0.0.1:8888", + "BASE_URL": "/api", "WS_URL": "ws://127.0.0.1:8878/im" } }, diff --git a/im-uniapp/vite.config.js b/im-uniapp/vite.config.js new file mode 100644 index 0000000..0c46ed6 --- /dev/null +++ b/im-uniapp/vite.config.js @@ -0,0 +1,19 @@ +import { defineConfig } from "vite" +import uni from "@dcloudio/vite-plugin-uni"; + +export default defineConfig({ + plugins: [ + uni() + ], + server: { + proxy: { + '/api': { + rewrite: path => path.replace(/^\/api/, ''), + logLevel: 'debug', + target: 'http://localhost:8888', + changeOrigin: true + }, + + } + } +}) \ No newline at end of file