From 6e7ed1b31876bfbaf6b879825664b0cdc3e6eec4 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Sun, 6 Nov 2022 14:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bx/implatform/config/WebSecurityConfg.java | 4 ---- im-platform/src/main/resources/application.yml | 5 +---- im-ui/.env.development | 7 +++++++ im-ui/.env.production | 6 ++++++ im-ui/src/components/group/AddGroupMember.vue | 2 +- im-ui/src/components/setting/Setting.vue | 12 +++++++----- im-ui/src/store/userStore.js | 2 +- im-ui/src/view/Friend.vue | 3 ++- 8 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 im-ui/.env.development create mode 100644 im-ui/.env.production diff --git a/im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java b/im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java index f5ec8fd..a71dc3e 100644 --- a/im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java +++ b/im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java @@ -42,8 +42,6 @@ import java.io.PrintWriter; public class WebSecurityConfg extends WebSecurityConfigurerAdapter { - @Value("${web-ui.login-page}") - private String loginPage; @Qualifier("securityUserDetailsServiceImpl") @Autowired @@ -62,7 +60,6 @@ public class WebSecurityConfg extends WebSecurityConfigurerAdapter { .and() //2、登录配置表单认证方式 .formLogin() - .loginPage(loginPage)//自定义登录页面的url .usernameParameter("username")//设置登录账号参数，与表单参数一致 .passwordParameter("password")//设置登录密码参数，与表单参数一致 .loginProcessingUrl("/login")//配置默认登录入口 @@ -77,7 +74,6 @@ public class WebSecurityConfg extends WebSecurityConfigurerAdapter { .and() //4、session管理 .sessionManagement() - .invalidSessionUrl(loginPage) //失效后跳转到登陆页面 .and() //5、禁用跨站csrf攻击防御 .csrf() diff --git a/im-platform/src/main/resources/application.yml b/im-platform/src/main/resources/application.yml index 6739f4f..cb3dc6d 100644 --- a/im-platform/src/main/resources/application.yml +++ b/im-platform/src/main/resources/application.yml @@ -30,12 +30,9 @@ mybatis-plus: - classpath*:mapper/*.xml minio: endpoint: http://127.0.0.1:9001 #内网地址 - public: http://3xagfu.natappfree.cc/file #外网访问地址 + public: http://127.0.0.1:9001 #外网访问地址 accessKey: admin secretKey: 12345678 bucketName: box-im imagePath: image filePath: file - -web-ui: - login-page: http://localhost:8080 diff --git a/im-ui/.env.development b/im-ui/.env.development new file mode 100644 index 0000000..0ec9e1c --- /dev/null +++ b/im-ui/.env.development @@ -0,0 +1,7 @@ + +ENV = 'development' + +// 接口请求地址 +VUE_APP_BASE_API = '/api' + +VUE_APP_WS_URL = 'ws://localhost:8878/im' \ No newline at end of file diff --git a/im-ui/.env.production b/im-ui/.env.production new file mode 100644 index 0000000..49fc05a --- /dev/null +++ b/im-ui/.env.production @@ -0,0 +1,6 @@ +ENV = 'production' + +# 接口地址 +VUE_APP_BASE_API = 'http://8.134.92.70/api' + +VUE_APP_WS_URL = 'ws://8.134.92.70:81/im' \ No newline at end of file diff --git a/im-ui/src/components/group/AddGroupMember.vue b/im-ui/src/components/group/AddGroupMember.vue index a0d1c6c..9ace9ce 100644 --- a/im-ui/src/components/group/AddGroupMember.vue +++ b/im-ui/src/components/group/AddGroupMember.vue @@ -1,5 +1,5 @@