diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java index 4f72b3e7..b152c52f 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java @@ -11,7 +11,7 @@ public class SaSso3ClientApp { Solon.start(SaSso3ClientApp.class, args); System.out.println(); - System.out.println("---------------------- Sa-Token SSO 模式三 Client 端启动成功 ----------------------"); + System.out.println("---------------------- Solon Sa-Token SSO 模式三 Client 端启动成功 ----------------------"); System.out.println("配置信息:" + SaSsoManager.getClientConfig()); System.out.println("测试访问应用端一: http://sa-sso-client1.com:9003"); System.out.println("测试访问应用端二: http://sa-sso-client2.com:9003"); diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java deleted file mode 100644 index f7795635..00000000 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java +++ /dev/null @@ -1,50 +0,0 @@ -//package com.pj.sso; -// -//import cn.dev33.satoken.sso.SaSsoManager; -//import cn.dev33.satoken.sso.config.SaSsoClientConfig; -//import cn.dev33.satoken.sso.processor.SaSsoClientProcessor; -//import cn.dev33.satoken.sso.template.SaSsoClientTemplate; -//import org.noear.solon.annotation.Bean; -//import org.noear.solon.annotation.Condition; -//import org.noear.solon.annotation.Configuration; -//import org.noear.solon.annotation.Inject; -// -///** -// * solon 的 sso 适配,在 cn.dev33:sa-token-solon-plugin:1.34.0 里还没有。(临时加这个类) -// * -// * //todo: 如果使用 org.noear:sa-token-solon-plugin:xxx ,则需要删掉这个类 -// * -// * @author noear -// * @since 2.0 -// */ -//@Condition(onClass = SaSsoManager.class) -//@Configuration -//public class SaSsoAutoConfigure { -// /** -// * 获取 SSO 配置Bean -// * */ -// @Bean -// public SaSsoClientConfig getConfig(@Inject(value = "${sa-token.sso-client}",required = false) SaSsoClientConfig ssoConfig) { -// return ssoConfig; -// } -// -// /** -// * 注入 Sa-Token-SSO 配置Bean -// * -// * @param saSsoConfig 配置对象 -// */ -// @Bean -// public void setSaSsoConfig(@Inject(required = false) SaSsoClientConfig saSsoConfig) { -// SaSsoManager.setClientConfig(saSsoConfig); -// } -// -// /** -// * 注入 Sa-Token-SSO 单点登录模块 Bean -// * -// * @param ssoClientTemplate ssoClientTemplate对象 -// */ -// @Bean -// public void setSaSsoClientTemplate(@Inject(required = false) SaSsoClientTemplate ssoClientTemplate) { -// SaSsoClientProcessor.instance.ssoClientTemplate = ssoClientTemplate; -// } -//} diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoProcessorHelper.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoProcessorHelper.java index 0fafb624..5aff4582 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoProcessorHelper.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoProcessorHelper.java @@ -47,6 +47,7 @@ public class SaSsoProcessorHelper { String back = req.getParam(paramName.back); if(SaFoxUtil.isNotEmpty(back)) { if(back.equals(SaSsoConsts.SELF)) { + res.setHeader("Content-Type", "text/html; charset=utf-8"); return ""; } return res.redirect(back);