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 eb52866477b8b47984dc46fc5a1e4aae5815e46f..e6e4ea350f99f37a00c8bc9635712cbbed4d342f 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"); } 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 1cbc5590347890a3c2e570dae394ef4d03fb1a78..fbca17a2a911389b1ec2f975c877c99b5c5fbb94 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 f40cd8bfd0ce66d21a7b82d3e86fd6a541ca9586..6ec7e5476d152ee31e7a4bf915a11029d2b6e1e7 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 ece031a2a49c636fdb6b7b80eca0da4d0fb7e9d0..b27d41228dcf0b82a79d153a61e06f5ff79733b7 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 3b3e0629bf0f8b11111400239cf83bdf33a16949..de65dd90f9cc78b54bffa65f2b0cbc1c03dc4202 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()}]])); })