From 62b3b1f435be16d352b477ef2efb798c127ff8f3 Mon Sep 17 00:00:00 2001 From: hupeng <664288600@qq.com> Date: Mon, 8 Jan 2024 01:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E7=94=A8=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=A1=A8=E7=9A=84=E7=BB=9F=E4=B8=80=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=A4=84=E7=90=86=EF=BC=8C=20=E4=BD=86mybatis=20plus?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=EF=BC=8C=20=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=9A=84=E8=83=BD=E5=8A=9B=E6=AF=94=E8=BE=83=E5=B7=AE=EF=BC=8C?= =?UTF-8?q?=E8=BF=9C=E4=B8=8D=E5=A6=82=20jpa=E4=BF=AE=E6=94=B9=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/pom.xml | 18 ------ common/src/main/java/com/common/entity/Base.java | 13 ++--- .../src/main/java/com/common/entity/DicTarget.java | 14 +++++ common/src/main/java/com/common/entity/Role.java | 30 ---------- common/src/main/java/com/common/entity/Scene.java | 62 --------------------- common/src/main/java/com/common/entity/User.java | 2 +- common/src/main/resources/sql | 4 +- pom.xml | 3 - zbsz/pom.xml | 27 ++++++--- zbsz/src/main/java/com/zbsz/Run.java | 6 +- zbsz/src/main/java/com/zbsz/aop/LogAop.java | 7 +-- .../com/zbsz/controller/OpenApiController.java | 3 +- zbsz/src/main/java/com/zbsz/entity/Target.java | 18 ++++++ .../main/java/com/zbsz/filter/JwtInterceptor.java | 24 ++++---- .../main/java/com/zbsz/init/CustomInitializer.java | 13 +++++ .../main/java/com/zbsz/mapper/DicTargetMapper.java | 7 +++ .../java/com/zbsz/service/DicTargetService.java | 10 ++++ .../main/java/com/zbsz/service/UserService.java | 7 ++- .../com/zbsz/service/impl/UserServiceImpl.java | 11 ---- zbsz/src/main/java/com/zbsz/tool/JwtTool.java | 64 ---------------------- zbsz/src/main/resources/application.yml | 3 + zbsz/src/main/resources/logback.xml | 50 ++++++++--------- 22 files changed, 146 insertions(+), 250 deletions(-) create mode 100644 common/src/main/java/com/common/entity/DicTarget.java delete mode 100644 common/src/main/java/com/common/entity/Role.java delete mode 100644 common/src/main/java/com/common/entity/Scene.java create mode 100644 zbsz/src/main/java/com/zbsz/entity/Target.java create mode 100644 zbsz/src/main/java/com/zbsz/init/CustomInitializer.java create mode 100644 zbsz/src/main/java/com/zbsz/mapper/DicTargetMapper.java create mode 100644 zbsz/src/main/java/com/zbsz/service/DicTargetService.java delete mode 100644 zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java delete mode 100644 zbsz/src/main/java/com/zbsz/tool/JwtTool.java diff --git a/common/pom.xml b/common/pom.xml index 98124c8..d9017d8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -15,30 +15,12 @@ - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - com.github.xiaoymin knife4j-openapi2-spring-boot-starter ${knife4j.version} - - io.springfox - springfox-swagger-ui - ${swagger.ui.version} - - - com.mchange - c3p0 - ${c3p0.version} - com.baomidou mybatis-plus-boot-starter diff --git a/common/src/main/java/com/common/entity/Base.java b/common/src/main/java/com/common/entity/Base.java index e03799f..6627fdc 100644 --- a/common/src/main/java/com/common/entity/Base.java +++ b/common/src/main/java/com/common/entity/Base.java @@ -12,18 +12,17 @@ import java.util.Date; @Data public class Base { @TableId - @ApiModelProperty(value = "用户主键") + @ApiModelProperty(value = "主键") private Integer id; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") - @TableField("create_at") + @TableField("create_time") @ApiModelProperty(value = "创建时间") - private Date createAt; + private Date createTime; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") - @TableField("update_at") - @ApiModelProperty(value = "创建时间") - private Date updateAt; + @TableField("update_time") + @ApiModelProperty(value = "修改时间") + private Date updateTime; } diff --git a/common/src/main/java/com/common/entity/DicTarget.java b/common/src/main/java/com/common/entity/DicTarget.java new file mode 100644 index 0000000..7d30e02 --- /dev/null +++ b/common/src/main/java/com/common/entity/DicTarget.java @@ -0,0 +1,14 @@ +package com.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@TableName(value = "dic_target") +public class DicTarget extends Base{ + @TableField("type") + @ApiModelProperty(value = "指标类型") + private String type; +} diff --git a/common/src/main/java/com/common/entity/Role.java b/common/src/main/java/com/common/entity/Role.java deleted file mode 100644 index 43f8f2d..0000000 --- a/common/src/main/java/com/common/entity/Role.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.common.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -@TableName(value = "p_role") -public class Role extends Base{ - @TableField("role_type") - @ApiModelProperty(value = "角色类型") - private String roleType; - @TableField("role_name") - @ApiModelProperty(value = "角色名称") - private String roleName; - @TableField("role_desc") - @ApiModelProperty(value = "角色描述") - private String roleDesc; - @TableField("create_by") - @ApiModelProperty(value = "角色创建人") - private String createBy; - @TableField("data_scope") - @ApiModelProperty(value="数据权限定义1-全部权限 2-本部门及以下部门 3-本部门 4-本人 5-自定义 ") - private Integer dataScope; - @ApiModelProperty(value="数据权限定义部门id集合 ") - private List dataDeptIds; -} diff --git a/common/src/main/java/com/common/entity/Scene.java b/common/src/main/java/com/common/entity/Scene.java deleted file mode 100644 index e2e9c87..0000000 --- a/common/src/main/java/com/common/entity/Scene.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.common.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@TableName(value = "p_scene") -public class Scene extends Base{ - @TableField("scene_name") - @ApiModelProperty(value = "技能名称") - private String sceneName; - @TableField("scene_remark") - @ApiModelProperty(value = "备注") - private String sceneRemark; - @ApiModelProperty(value = "角色串") - private String roles; - @TableField("model_notes") - @ApiModelProperty(value = "模型说明") - private String modelNotes; - @TableField("file_url") - @ApiModelProperty(value = "文件地址") - private String fileUrl; - @ApiModelProperty(value = "版本") - private String version; - @TableField("contribution_name") - @ApiModelProperty(value = "贡献者姓名") - private String contributionName; - @TableField("scene_type") - @ApiModelProperty(value = "技能类别 1定制 2永洪 ") - private Short sceneType; - @TableField("scene_url") - @ApiModelProperty(value = "技能URL") - private String sceneUrl; - @TableField("scene_skin") - @ApiModelProperty(value = "场景皮肤") - private String sceneSkin; - @TableField("icon_url") - @ApiModelProperty(value = "icon地址") - private String iconUrl; - @TableField("create_by") - @ApiModelProperty(value = "创建人") - private String createBy; - @TableField("update_by") - @ApiModelProperty(value = "更新人") - private String updateBy; - @ApiModelProperty(value = "删除标记：0-未删除 1-已删除") - private Short deleted; - @TableField("scene_operation") - @ApiModelProperty(value = "技能类型 智能脑，聪明口，灵活手，千里眼") - private String sceneOperation; - @TableField("scene_order") - @ApiModelProperty(value = "排序") - private Integer sceneOrder; - @TableField("scene_code") - @ApiModelProperty(value = "场景编码") - private String sceneCode; - @TableField("scene_tag") - @ApiModelProperty(value = "场景标签") - private String sceneTag; -} diff --git a/common/src/main/java/com/common/entity/User.java b/common/src/main/java/com/common/entity/User.java index a53a980..92718ee 100644 --- a/common/src/main/java/com/common/entity/User.java +++ b/common/src/main/java/com/common/entity/User.java @@ -49,7 +49,7 @@ public class User { private String roleLevel; @ApiModelProperty(value = "用户角色，role id以逗号拼接") private Set roles; - //与实体不一致 + //与其它实体类型和命名不一致 @TableField("create_time") @ApiModelProperty(value="角色列表") private OffsetDateTime createTime; diff --git a/common/src/main/resources/sql b/common/src/main/resources/sql index 06a8d64..dd43796 100644 --- a/common/src/main/resources/sql +++ b/common/src/main/resources/sql @@ -34,7 +34,7 @@ comment on column public.p_user.create_time is '创建时间'; comment on column public.p_user.update_time is '更新时间'; comment on column public.p_user.job_title is '职称'; comment on column public.p_user.role_level is '等级：0运营 1派出所 2分局'; -comment on column public.p_user.roles is 'roleid以逗号拼接'; +comment on column public.p_user.roles is 'role id以逗号拼接'; drop table if exists public.p_role; create table public.p_role ( @@ -57,7 +57,7 @@ comment on column public.p_role.create_by is '创建人'; comment on column public.p_role.update_at is '修改时间'; comment on column public.p_role.update_by is '修改人'; comment on column public.p_role.deleted is '删除标记 0-未删除 1-已删除'; -comment on column public.p_role.data_scope is '数据权限定义1-全部权限 2-本部门及以下部门 3-本部门 4-本人 5-自定义'; +comment on column public.p_role.data_scope is '数据权限定义 1-全部权限 2-本部门及以下部门 3-本部门 4-本人 5-自定义'; drop table if exists public.p_scene; create table public.p_scene ( diff --git a/pom.xml b/pom.xml index 3a01123..df8bbef 100644 --- a/pom.xml +++ b/pom.xml @@ -36,11 +36,8 @@ 2021.0.8 2021.1 2.7.17 - - 4.2.2 3.5.5 - 1.4.2 0.9.5.5 8.0.28 42.3.8 diff --git a/zbsz/pom.xml b/zbsz/pom.xml index 41456cc..344fbed 100644 --- a/zbsz/pom.xml +++ b/zbsz/pom.xml @@ -19,7 +19,27 @@ com.szr common + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-validation + + + io.springfox + springfox-swagger-ui + ${swagger.ui.version} + + + com.mchange + c3p0 + ${c3p0.version} + org.postgresql postgresql @@ -35,13 +55,6 @@ spring-boot-starter-aop - - - com.auth0 - java-jwt - ${jwt.version} - - org.springframework.boot diff --git a/zbsz/src/main/java/com/zbsz/Run.java b/zbsz/src/main/java/com/zbsz/Run.java index 61f250a..5002f9f 100644 --- a/zbsz/src/main/java/com/zbsz/Run.java +++ b/zbsz/src/main/java/com/zbsz/Run.java @@ -1,5 +1,6 @@ package com.zbsz; +import com.zbsz.init.CustomInitializer; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,7 +8,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication @MapperScan("com.zbsz.mapper") public class Run { + public static void main(String[] args) { - SpringApplication.run(Run.class,args); + SpringApplication application = new SpringApplication(Run.class); + application.addInitializers(new CustomInitializer()); + application.run(); } } diff --git a/zbsz/src/main/java/com/zbsz/aop/LogAop.java b/zbsz/src/main/java/com/zbsz/aop/LogAop.java index d96eac7..8190e07 100644 --- a/zbsz/src/main/java/com/zbsz/aop/LogAop.java +++ b/zbsz/src/main/java/com/zbsz/aop/LogAop.java @@ -24,6 +24,7 @@ public class LogAop { Object result=joinPoint.proceed(); log.info("Response："+ JSON.toJSON(result)); log.info("耗时："+(System.currentTimeMillis()-startTime)); + log.info("==================End================="); return result; } @@ -31,17 +32,13 @@ public class LogAop { public void doBefore(JoinPoint joinPoint) { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); HttpServletRequest request = attributes.getRequest(); + log.info(""); log.info("==================Start================="); log.info("URL：" + request.getRequestURL().toString()); log.info("Method：" + request.getMethod().toString()); log.info("Class Method：" + joinPoint.getSignature().getDeclaringTypeName() + "," + joinPoint.getSignature().getName()); log.info("客户端IP：" + request.getRemoteAddr()); log.info("请求参数：" + JSON.toJSON(joinPoint.getArgs())); - } - @After("log()") - public void doAfter() { - log.info("==================End================="); - } } diff --git a/zbsz/src/main/java/com/zbsz/controller/OpenApiController.java b/zbsz/src/main/java/com/zbsz/controller/OpenApiController.java index 9f1d046..dc519c6 100644 --- a/zbsz/src/main/java/com/zbsz/controller/OpenApiController.java +++ b/zbsz/src/main/java/com/zbsz/controller/OpenApiController.java @@ -5,7 +5,6 @@ import com.common.entity.User; import com.zbsz.info.LoginInfo; import com.zbsz.info.Result; import com.zbsz.service.UserService; -import com.zbsz.tool.JwtTool; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -38,7 +37,7 @@ public class OpenApiController { if(user!=null){ result.setCode(CodeMsg.SUCCESS.getCode()); result.setMsg(CodeMsg.SUCCESS.getMessage()); - result.setData(JwtTool.getToken(info.getUserName())); + result.setData("真 * token 串"); log.error("-------- 登录成功 "); }else { result.setCode(CodeMsg.AUTH_FAILURE.getCode()); diff --git a/zbsz/src/main/java/com/zbsz/entity/Target.java b/zbsz/src/main/java/com/zbsz/entity/Target.java new file mode 100644 index 0000000..e6f655d --- /dev/null +++ b/zbsz/src/main/java/com/zbsz/entity/Target.java @@ -0,0 +1,18 @@ +package com.zbsz.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.common.entity.Base; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@TableName(value = "zb_t_target") +public class Target extends Base { + @TableField("target_id") + @ApiModelProperty(value = "指标编号") + private String targetId; + @TableField("target_name") + @ApiModelProperty(value = "指标名称") + private String targetName; +} diff --git a/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java b/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java index 25c1d6f..d6290da 100644 --- a/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java +++ b/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java @@ -1,13 +1,15 @@ package com.zbsz.filter; import com.alibaba.fastjson2.JSONObject; +import com.common.entity.User; import com.common.info.CodeMsg; import com.zbsz.info.Result; -import com.zbsz.tool.JwtTool; +import com.zbsz.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; @@ -15,6 +17,9 @@ import java.io.PrintWriter; @Slf4j public class JwtInterceptor implements HandlerInterceptor { + @Resource + private UserService userService; + //判断然后进行用户拦截 @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { @@ -23,23 +28,22 @@ public class JwtInterceptor implements HandlerInterceptor { return true; } - // 从请求头中取出 token 这里需要和前端约定好把jwt放到请求头一个叫token的地方 - String token = request.getHeader("token"); + //他们校验的居然不是token串，而是去后台校验一个用户id ？？？ + String userId = request.getHeader("userId"); + log.info("获取到用户信息 userId : " + userId); + User user = userService.lambdaQuery().eq(User::getUserId,userId).one(); - //验证token - if(JwtTool.verify(token)){ + if(user!=null){ return true; }else{ response.setCharacterEncoding("UTF-8"); response.setContentType("application/json; charset=utf-8"); + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Headers", "*"); + Result result = new Result(); result.setCode(CodeMsg.AUTH_FAILURE.getCode()); result.setMsg(CodeMsg.AUTH_FAILURE.getMessage()); - if (token == null) { - log.error("-------- 票据丢失，请重新登录"); - }else{ - log.error("-------- 票据认证失败，请重新登录"); - } PrintWriter out = null; try { out = response.getWriter(); diff --git a/zbsz/src/main/java/com/zbsz/init/CustomInitializer.java b/zbsz/src/main/java/com/zbsz/init/CustomInitializer.java new file mode 100644 index 0000000..a99ca2a --- /dev/null +++ b/zbsz/src/main/java/com/zbsz/init/CustomInitializer.java @@ -0,0 +1,13 @@ +package com.zbsz.init; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ConfigurableApplicationContext; + +@Slf4j +public class CustomInitializer implements ApplicationContextInitializer { + @Override + public void initialize(ConfigurableApplicationContext applicationContext) { + log.info("----------- init 暂时不处理"); + } +} diff --git a/zbsz/src/main/java/com/zbsz/mapper/DicTargetMapper.java b/zbsz/src/main/java/com/zbsz/mapper/DicTargetMapper.java new file mode 100644 index 0000000..ff3fe1d --- /dev/null +++ b/zbsz/src/main/java/com/zbsz/mapper/DicTargetMapper.java @@ -0,0 +1,7 @@ +package com.zbsz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.common.entity.DicTarget; + +public interface DicTargetMapper extends BaseMapper { +} diff --git a/zbsz/src/main/java/com/zbsz/service/DicTargetService.java b/zbsz/src/main/java/com/zbsz/service/DicTargetService.java new file mode 100644 index 0000000..cc166bc --- /dev/null +++ b/zbsz/src/main/java/com/zbsz/service/DicTargetService.java @@ -0,0 +1,10 @@ +package com.zbsz.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.common.entity.DicTarget; +import com.zbsz.mapper.DicTargetMapper; +import org.springframework.stereotype.Service; + +@Service +public class DicTargetService extends ServiceImpl { +} diff --git a/zbsz/src/main/java/com/zbsz/service/UserService.java b/zbsz/src/main/java/com/zbsz/service/UserService.java index db52bef..42a4c29 100644 --- a/zbsz/src/main/java/com/zbsz/service/UserService.java +++ b/zbsz/src/main/java/com/zbsz/service/UserService.java @@ -1,7 +1,10 @@ package com.zbsz.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.common.entity.User; +import com.zbsz.mapper.UserMapper; +import org.springframework.stereotype.Service; -public interface UserService extends IService { +@Service +public class UserService extends ServiceImpl { } diff --git a/zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java b/zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java deleted file mode 100644 index b924c42..0000000 --- a/zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zbsz.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.common.entity.User; -import com.zbsz.mapper.UserMapper; -import com.zbsz.service.UserService; -import org.springframework.stereotype.Service; - -@Service -public class UserServiceImpl extends ServiceImpl implements UserService { -} diff --git a/zbsz/src/main/java/com/zbsz/tool/JwtTool.java b/zbsz/src/main/java/com/zbsz/tool/JwtTool.java deleted file mode 100644 index 7ac73a9..0000000 --- a/zbsz/src/main/java/com/zbsz/tool/JwtTool.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zbsz.tool; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.JWTVerifier; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.JWTDecodeException; -import com.auth0.jwt.interfaces.DecodedJWT; - -import java.util.Date; - -public class JwtTool { - private static final long EXPIRE_TIME = 15 * 60 * 60 * 1000; - private static final String TOKEN_SECRET = "hp-xx040506070809-xxx-ppp"; - - /** - * 校验token是否正确 - * - * @param token 密钥 - * @return 是否正确 - */ - public static boolean verify(String token) { - try { - Algorithm algorithm = Algorithm.HMAC256(TOKEN_SECRET); - JWTVerifier verifier = JWT.require(algorithm).build(); - verifier.verify(token); - return true; - } catch (Exception exception) { - return false; - } - } - - /** - * 获得token中的信息无需secret解密也能获得 - * @return token中包含的用户名 - */ - public static String getUsername(String token) { - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("loginName").asString(); - } catch (JWTDecodeException e) { - return null; - } - } - - - /** - * 获取token - * @return jwt token - */ - public static String getToken(String username) { - try { - Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);//过期时间 - Algorithm algorithm = Algorithm.HMAC256(TOKEN_SECRET);//私钥及加密算法 - // 附带username，userId信息，生成签名 - return JWT.create().withAudience(username) - .withIssuedAt(new Date()) //发行时间 - .withExpiresAt(date) //有效时间 - .withClaim("loginName", username) - .sign(algorithm); - } catch (Exception e) { - return null; - } - } -} diff --git a/zbsz/src/main/resources/application.yml b/zbsz/src/main/resources/application.yml index 98416bc..a4cb2bc 100644 --- a/zbsz/src/main/resources/application.yml +++ b/zbsz/src/main/resources/application.yml @@ -12,6 +12,9 @@ spring: mvc: pathmatch: matching-strategy: ant_path_matcher + +custom-initializer: com.zbsz.init.CustomInitializer + mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/zbsz/src/main/resources/logback.xml b/zbsz/src/main/resources/logback.xml index c4d5bed..b66fa38 100644 --- a/zbsz/src/main/resources/logback.xml +++ b/zbsz/src/main/resources/logback.xml @@ -3,14 +3,31 @@ - + + - %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger -%msg%n + ${logPattern} UTF-8 - + + + INFO + ACCEPT + DENY + + + ${log_dir}/%d{yyyy-MM-dd}/info-log.log + ${maxHistory} + + + ${logPattern} + UTF-8 + + + + ERROR ACCEPT @@ -21,31 +38,14 @@ ${maxHistory} - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + ${logPattern} UTF-8 - - - INFO - ACCEPT - DENY - - - ${log_dir}/%d{yyyy-MM-dd}/info-log.log - - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n - UTF-8 - - - - - - - + + + +