From 3db1e464918a3b0ae9f0226478765bc718045fca Mon Sep 17 00:00:00 2001
From: John_Liu <87139327@qq.com>
Date: Fri, 27 Nov 2020 18:45:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AFthymele?=
=?UTF-8?q?af=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/pearadmin/security/SecurityConfig.java | 17 +++++++++++++++++
.../main/resources/application-datasource.yml | 8 ++++----
.../static/component/pear/module/admin.js | 2 +-
.../src/main/resources/templates/index.html | 4 ++--
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java b/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
index 1cbc5590..fbca17a2 100644
--- a/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
+++ b/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
@@ -20,6 +20,11 @@ import org.springframework.security.core.session.SessionRegistryImpl;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring5.ISpringTemplateEngine;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+
import javax.annotation.Resource;
/**
@@ -101,6 +106,18 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
return new SessionRegistryImpl();
}
+ /**
+ * thymeleaf security 别名注册，方便前端使用
+ */
+ @Bean
+ public ISpringTemplateEngine templateEngine(ITemplateResolver templateResolver) {
+ SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+ templateEngine.setTemplateResolver(templateResolver);
+ templateEngine.setEnableSpringELCompiler(true);
+ templateEngine.addDialect(new SpringSecurityDialect());
+ return templateEngine;
+ }
+
/**
* Describe: 配置 Security 控制逻辑
*/
diff --git a/pear-entrance/src/main/resources/application-datasource.yml b/pear-entrance/src/main/resources/application-datasource.yml
index f40cd8bf..6ec7e547 100644
--- a/pear-entrance/src/main/resources/application-datasource.yml
+++ b/pear-entrance/src/main/resources/application-datasource.yml
@@ -1,7 +1,7 @@
spring:
redis:
# 主 机 地 址
- host: 127.0.0.1
+ host: 192.168.0.110
# 端 口
port: 6379
# 认 证
@@ -29,9 +29,9 @@ spring:
datasource:
# 主 库 配 置
master:
- url: jdbc:mysql://mysql.pearadmin.com:3306/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
- username: root
- password: root
+ url: jdbc:mysql://192.168.0.110:33061/oanus_admins?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+ username: oanus_admins
+ password: 123456
druid:
# 初始连接数
initialSize: 5
diff --git a/pear-entrance/src/main/resources/static/component/pear/module/admin.js b/pear-entrance/src/main/resources/static/component/pear/module/admin.js
index ece031a2..b27d4122 100644
--- a/pear-entrance/src/main/resources/static/component/pear/module/admin.js
+++ b/pear-entrance/src/main/resources/static/component/pear/module/admin.js
@@ -268,7 +268,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
icon: 1,
time: 1200
}, function() {
- location.href = "/login";
+ location.href = "/";
});
}
}
diff --git a/pear-entrance/src/main/resources/templates/index.html b/pear-entrance/src/main/resources/templates/index.html
index 3b3e0629..de65dd90 100644
--- a/pear-entrance/src/main/resources/templates/index.html
+++ b/pear-entrance/src/main/resources/templates/index.html
@@ -26,7 +26,7 @@
![]()
-
+
@@ -67,7 +67,7 @@
let admin = layui.admin;
admin.render();
- $('#headImg').attr("src",makeHeadImgByUserName([[${userInfo.realName}]]));
+ $('#headImg').attr("src",makeHeadImgByUserName([[${#authentication.principal.getRealName()}]]));
})
--
Gitee
From 03ee51b994b5ed41296e84813ea7df611d9928eb Mon Sep 17 00:00:00 2001
From: John_Liu <87139327@qq.com>
Date: Fri, 27 Nov 2020 18:54:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=A0=E9=80=92userInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/pearadmin/api/modules/EntranceController.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/pear-entrance/src/main/java/com/pearadmin/api/modules/EntranceController.java b/pear-entrance/src/main/java/com/pearadmin/api/modules/EntranceController.java
index eb528664..e6e4ea35 100644
--- a/pear-entrance/src/main/java/com/pearadmin/api/modules/EntranceController.java
+++ b/pear-entrance/src/main/java/com/pearadmin/api/modules/EntranceController.java
@@ -26,10 +26,8 @@ public class EntranceController extends BaseController {
* Return: 登录视图
* */
@GetMapping("login")
- public ModelAndView login(Model model){
+ public ModelAndView login( ){
if (SecurityUtil.isAuthentication()) {
- SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal();
- model.addAttribute("userInfo",sysUser);
return JumpPage("index");
}else{
return JumpPage("login");
@@ -43,10 +41,8 @@ public class EntranceController extends BaseController {
* */
@GetMapping("index")
@Logging(title = "主页",describe = "返回 Index 主页视图",type = BusinessType.ADD)
- public ModelAndView index(Model model)
+ public ModelAndView index( )
{
- SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal();
- model.addAttribute("userInfo",sysUser);
return JumpPage("index");
}
--
Gitee