集成单点登录

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteClientServiceImpl.java

@@ -1,12 +1,12 @@
 package org.dromara.system.saas.dubbo;
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.saas.api.RemoteClientService;
 import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
-import org.dromara.system.saas.domain.vo.SysSaasClientVo;
-import org.dromara.system.saas.service.ISysSaasClientService;
+import org.dromara.system.service.ISysClientService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,15 +19,15 @@ import org.springframework.stereotype.Service;
 @DubboService
 public class RemoteClientServiceImpl implements RemoteClientService {
 
-    private final ISysSaasClientService sysSaasClientService;
+    private final ISysClientService clientService;
 
     /**
      * 根据客户端id获取客户端详情
      */
     @Override
     public RemoteClientVo queryByClientId(String clientId) {
-        SysSaasClientVo vo = sysSaasClientService.queryByClientId(clientId);
-        return MapstructUtils.convert(vo, RemoteClientVo.class);
+        SysClientVo vo = clientService.queryByClientId(clientId);
+        return BeanUtil.copyProperties(vo, RemoteClientVo.class);
     }
 
-}
+}

ruoyi-site/ruoyi-gateway/src/main/resources/application-dev.yml

@@ -38,6 +38,7 @@ sa-token:
   sso-client:
     # SSO-Server 端主机地址
     server-url: http://sa-sso-server.com:19000
+    # SSO-client 前端地址
     auth-url: http://sa-sso-server.com:8701/?mode=ticket#/sso-login
     # SSO-Server 端校验ticket地址
     check-ticket-url: http://ruoyi-sso-server:19000

ruoyi-site/ruoyi-gateway/src/main/resources/application-local.yml

@@ -38,6 +38,7 @@ sa-token:
   sso-client:
     # SSO-Server 端主机地址
     server-url: http://sa-sso-server.com:19000
+    # SSO-client 前端地址
     auth-url: http://sa-sso-server.com:8701/?mode=ticket#/sso-login
     # SSO-Server 端校验ticket地址
     check-ticket-url: http://ruoyi-sso-server:19000

ruoyi-site/ruoyi-gateway/src/main/resources/application.yml

@@ -34,9 +34,7 @@ spring:
         - id: ruoyi-h5
           uri: lb://ruoyi-h5
           predicates:
-            - Path=/ruoyi-h5/**
-          filters:
-            - StripPrefix=1
+            - Path=/h5/**
 
 # 安全配置
 security:
@@ -62,5 +60,4 @@ security:
 # 多租户配置
 tenant:
   # 是否开启
-  enable: true
-
+  enable: true

ruoyi-site/ruoyi-h5/src/main/resources/application.yml

@@ -88,9 +88,6 @@ tenant:
     - sys_client
     - sys_oss_config
     - sys_saas_menu
-    - sys_saas_tenant
-    - sys_saas_tenant_package
-    - sys_saas_application
     - sys_saas_role_dept
     - sys_saas_role_menu
     - sys_saas_user_post