Commit f459256f9c0717747985636073a6641b58ef7d47

Authored by guzijian
1 parent 33d110fc

fix: 修改返回日期格式

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -25,14 +25,14 @@ public class BaseEntity implements Serializable @@ -25,14 +25,14 @@ public class BaseEntity implements Serializable
25 private String createBy; 25 private String createBy;
26 26
27 /** 创建时间 */ 27 /** 创建时间 */
28 - @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") 28 + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
29 private Date createTime; 29 private Date createTime;
30 30
31 /** 更新者 */ 31 /** 更新者 */
32 private String updateBy; 32 private String updateBy;
33 33
34 /** 更新时间 */ 34 /** 更新时间 */
35 - @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") 35 + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
36 private Date updateTime; 36 private Date updateTime;
37 37
38 /** 备注 */ 38 /** 备注 */
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
111 // 过滤请求 111 // 过滤请求
112 .authorizeRequests() 112 .authorizeRequests()
113 // 对于登录login 注册register 验证码captchaImage 允许匿名访问 113 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
114 - .antMatchers("/driver/**","/in/**","/eexception/**","/equipment/**","/login", "/register", "/captchaImage").permitAll() 114 + .antMatchers("/getInfo","/driver/**","/in/**","/eexception/**","/equipment/**","/login", "/register", "/captchaImage").permitAll()
115 // 静态资源,可匿名访问 115 // 静态资源,可匿名访问
116 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() 116 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
117 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() 117 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()