guzijian / bsth-alcohol-sign · Commits

Commit 8f2f8ad0fc5c4ee1cb98c82fe93bbbd1a563b4e2

Authored by guzijian
1 parent f459256f

fix: resolve redis serial date bug

Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
  View file @8f2f8ad
... ... @@ -25,14 +25,14 @@ public class BaseEntity implements Serializable
25 25 private String createBy;
26 26  
27 27 /** 创建时间 */
28   - @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
  28 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
29 29 private Date createTime;
30 30  
31 31 /** 更新者 */
32 32 private String updateBy;
33 33  
34 34 /** 更新时间 */
35   - @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
  35 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
36 36 private Date updateTime;
37 37  
38 38 /** 备注 */
... ...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
  View file @8f2f8ad
... ... @@ -67,7 +67,7 @@ public class SysUser extends BaseEntity
67 67 private String loginIp;
68 68  
69 69 /** 最后登录时间 */
70   - @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
  70 + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss", type = Type.EXPORT)
71 71 private Date loginDate;
72 72  
73 73 /** 部门对象 */
... ...
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
  View file @8f2f8ad
... ... @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
111 111 // 过滤请求
112 112 .authorizeRequests()
113 113 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
114   - .antMatchers("/getInfo","/driver/**","/in/**","/eexception/**","/equipment/**","/login", "/register", "/captchaImage").permitAll()
  114 + .antMatchers("/driver/**","/in/**","/eexception/**","/equipment/**","/login", "/register", "/captchaImage").permitAll()
115 115 // 静态资源，可匿名访问
116 116 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
117 117 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
... ...