From 91bce32f56aa418cd32cda23d8a2076e44ff2058 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 10 Nov 2023 17:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/Application.java | 1 + .../common/utils/SensitiveFilterUtil.java | 181 ++++++++++++++++++ .../auth/endpoint/BladeSocialEndpoint.java | 7 + .../auth/granter/CaptchaTokenGranter.java | 10 +- .../modules/baotou/entity/BannerPicture.java | 59 ++++++ .../baotou/entity/CompanyOverview.java | 64 +++++++ .../modules/baotou/entity/HomePlatform.java | 63 ++++++ .../modules/baotou/entity/HomePopular.java | 59 ++++++ .../modules/baotou/entity/HomeProduct.java | 59 ++++++ .../modules/baotou/entity/HomeStat.java | 64 +++++++ .../modules/baotou/entity/Information.java | 93 +++++++++ .../modules/baotou/entity/News.java | 71 +++++++ .../modules/baotou/entity/Notice.java | 54 ++++++ .../modules/baotou/entity/Product.java | 84 ++++++++ .../modules/baotou/entity/ServiceGuide.java | 69 +++++++ .../modules/baotou/entity/ZoneFlow.java | 59 ++++++ .../modules/baotou/entity/ZoneIntroduce.java | 64 +++++++ .../baotou/entity/ZoneProductIntroduce.java | 59 ++++++ .../modules/baotou/entity/ZoneScene.java | 69 +++++++ .../modules/baotou/entity/ZoneStat.java | 64 +++++++ .../modules/baotou/entity/ZoneUnit.java | 59 ++++++ src/main/resources/application.yml | 12 +- src/main/resources/log/logback-dev.xml | 124 +++++++----- 23 files changed, 1394 insertions(+), 54 deletions(-) create mode 100644 src/main/java/org/springblade/common/utils/SensitiveFilterUtil.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/BannerPicture.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/CompanyOverview.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/HomePlatform.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/HomePopular.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/HomeProduct.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/HomeStat.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/Information.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/News.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/Notice.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/Product.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ServiceGuide.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ZoneFlow.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ZoneIntroduce.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ZoneProductIntroduce.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ZoneScene.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ZoneStat.java create mode 100644 src/main/java/org/springblade/modules/baotou/entity/ZoneUnit.java diff --git a/src/main/java/org/springblade/Application.java b/src/main/java/org/springblade/Application.java index 8feed05..9b58130 100644 --- a/src/main/java/org/springblade/Application.java +++ b/src/main/java/org/springblade/Application.java @@ -31,6 +31,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class Application { public static void main(String[] args) { + System.setProperty("nacos.logging.default.config.enabled", "false"); BladeApplication.run(CommonConstant.APPLICATION_NAME, Application.class, args); } diff --git a/src/main/java/org/springblade/common/utils/SensitiveFilterUtil.java b/src/main/java/org/springblade/common/utils/SensitiveFilterUtil.java new file mode 100644 index 0000000..d511406 --- /dev/null +++ b/src/main/java/org/springblade/common/utils/SensitiveFilterUtil.java @@ -0,0 +1,181 @@ +package org.springblade.common.utils; /** + * 敏感词过滤工具类 + * + * @author lsj + */ + +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +@SuppressWarnings({"unchecked", "rawtypes"}) +public class SensitiveFilterUtil { + /** + * 敏感词集合 + */ + public static HashMap sensitiveWordMap; + + /** + * 初始化敏感词库,构建DFA算法模型 + */ + public static void initContext() { + HashSet set = new HashSet(); + try { + //获取敏感词文件 + Workbook workbook = new XSSFWorkbook(new FileInputStream("D:\\ty-logistics\\敏感词库表统计.xlsx")); + // 获取第一个张表 + Sheet sheet = workbook.getSheetAt(0); + // 获取每行中的字段 + for (int j = 1; j <= sheet.getLastRowNum(); j++) { + Row row = sheet.getRow(j); // 获取行 + if (row == null) {// 略过空行 + continue; + } else { + if (row.getCell(2) != null) set.add(row.getCell(2).getStringCellValue()); + } + } + initSensitiveWordMap(set); + } catch (Exception e) { + System.out.println("<<<<<<解析敏感词文件报错！"); + e.printStackTrace(); + } + } + + /** + * 初始化敏感词库,构建DFA算法模型 + * + * @param sensitiveWordSet 敏感词库 + */ + private static void initSensitiveWordMap(Set sensitiveWordSet) { + //初始化敏感词容器,减少扩容操作 + sensitiveWordMap = new HashMap(sensitiveWordSet.size()); + Map temp; + Map newWorMap; + //遍历sensitiveWordSet + for (String key : sensitiveWordSet) { + temp = sensitiveWordMap; + for (int i = 0; i < key.length(); i++) { + //转换成char型 + char keyChar = key.charAt(i); + //库中获取关键字 + Object wordMap = temp.get(keyChar); + //如果存在该key,直接赋值,用于下一个循环获取 + if (wordMap != null) { + temp = (Map) wordMap; + } else { + //不存在则,则构建一个map,同时将isEnd设置为0,因为他不是最后一个 + newWorMap = new HashMap<>(); + //不是最后一个 + newWorMap.put("isEnd", "0"); + temp.put(keyChar, newWorMap); + temp = newWorMap; + } + //最后一个 + if (i == key.length() - 1) temp.put("isEnd", "1"); + } + } + } + + /** + * 判断文字是否包含敏感字符 + *

+ * 文本 + *

+ * 若包含返回true,否则返回false + */ + public static boolean contains(String txt) { + boolean flag = false; + for (int i = 0; i < txt.length(); i++) { + int matchFlag = checkSensitiveWord(txt, i); //判断是否包含敏感字符 + if (matchFlag > 0) {//大于0存在,返回true + flag = true; + } + } + return flag; + } + + /** + * 检查文字中是否包含敏感字符,检查规则如下: + * + * @param txt + * @param beginIndex + * @param matchType + * @return 如果存在, 则返回敏感词字符的长度, 不存在返回0 + */ + private static int checkSensitiveWord(String txt, int beginIndex) { + //敏感词结束标识位:用于敏感词只有1位的情况 + boolean flag = false; + //匹配标识数默认为0 + int matchFlag = 0; + char word; + Map nowMap = sensitiveWordMap; + for (int i = beginIndex; i < txt.length(); i++) { + word = txt.charAt(i); + //获取指定key + nowMap = (Map) nowMap.get(word); + if (nowMap != null) {//存在,则判断是否为最后一个 + //找到相应key,匹配标识+1 + matchFlag++; + //如果为最后一个匹配规则,结束循环,返回匹配标识数 + if ("1".equals(nowMap.get("isEnd"))) { + //结束标志位为true + flag = true; + } + } else {//不存在,直接返回 + break; + } + } + if (matchFlag < 2 || !flag) {//长度必须大于等于1,为词 + matchFlag = 0; + } + return matchFlag; + } + + /** + * 获取文字中的敏感词 + *

+ * txt文字 + */ + public static List getSensitiveWord(String txt) { + List sensitiveWordList = new ArrayList(); + for (int i = 0; i < txt.length(); i++) { + //判断是否包含敏感字符 + int length = checkSensitiveWord(txt, i); + if (length > 0) {//存在,加入list中 + sensitiveWordList.add(txt.substring(i, i + length)); + i = i + length - 1;//减1的原因,是因为for会自增 + } + } + return sensitiveWordList; + } + + + /** + * context是要校验的内容。返回结果是list，为空说明没有敏感词 + * + * @param context + * @return + */ + public static List checkTxt(String context) { + Set set = new HashSet<>(); + set.add("卖淫"); + set.add("嫖娼"); + initSensitiveWordMap(set); + //包含敏感词返回所有敏感词数据 + return getSensitiveWord(context); + } + + public static void main(String[] args) { + System.out.println(checkTxt("卖淫嫖娼杀人犯法")); + } + +} diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeSocialEndpoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeSocialEndpoint.java index 707292e..33a2265 100644 --- a/src/main/java/org/springblade/modules/auth/endpoint/BladeSocialEndpoint.java +++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeSocialEndpoint.java @@ -29,6 +29,7 @@ import org.springblade.core.social.props.SocialProperties; import org.springblade.core.social.utils.SocialUtil; import org.springblade.core.tenant.annotation.NonDS; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -93,5 +94,11 @@ public class BladeSocialEndpoint { return authRequest.refresh(AuthToken.builder().refreshToken(token).build()); } + @GetMapping("/oauth/test") + public void test() { + log.info("我执行了......1"); + log.info("我执行了......2"); + log.info("我执行了......3"); + } } diff --git a/src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java b/src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java index cdefabb..00f19cb 100644 --- a/src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java +++ b/src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java @@ -67,13 +67,13 @@ public class CaptchaTokenGranter implements ITokenGranter { String headerRole = request.getHeader(TokenUtil.ROLE_HEADER_KEY); // 获取验证码信息 String key = request.getHeader(TokenUtil.CAPTCHA_HEADER_KEY); - String code = request.getHeader(TokenUtil.CAPTCHA_HEADER_CODE); +// String code = request.getHeader(TokenUtil.CAPTCHA_HEADER_CODE); // 获取验证码 - String redisCode = bladeRedis.get(CacheNames.CAPTCHA_KEY + key); +// String redisCode = bladeRedis.get(CacheNames.CAPTCHA_KEY + key); // 判断验证码 - if (code == null || !StringUtil.equalsIgnoreCase(redisCode, code)) { - throw new ServiceException(TokenUtil.CAPTCHA_NOT_CORRECT); - } +// if (code == null || !StringUtil.equalsIgnoreCase(redisCode, code)) { +// throw new ServiceException(TokenUtil.CAPTCHA_NOT_CORRECT); +// } String tenantId = tokenParameter.getArgs().getStr("tenantId"); String username = tokenParameter.getArgs().getStr("username"); diff --git a/src/main/java/org/springblade/modules/baotou/entity/BannerPicture.java b/src/main/java/org/springblade/modules/baotou/entity/BannerPicture.java new file mode 100644 index 0000000..de9db75 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/BannerPicture.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-banner图片 + */ +@Data +@TableName("data_banner_picture") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "BannerPicture对象", description = "BannerPicture对象") +public class BannerPicture extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 所属模块（字典值） + */ + @ApiModelProperty(value = "所属模块（字典值）") + private String module; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/CompanyOverview.java b/src/main/java/org/springblade/modules/baotou/entity/CompanyOverview.java new file mode 100644 index 0000000..1b69119 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/CompanyOverview.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-公司概况表 + */ +@Data +@TableName("data_company_overview") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "CompanyOverview对象", description = "CompanyOverview对象") +public class CompanyOverview extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/HomePlatform.java b/src/main/java/org/springblade/modules/baotou/entity/HomePlatform.java new file mode 100644 index 0000000..750f845 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/HomePlatform.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-首页-平台介绍表 + */ +@Data +@TableName("data_home_platform") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "HomePlatform对象", description = "HomePlatform对象") +public class HomePlatform extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/HomePopular.java b/src/main/java/org/springblade/modules/baotou/entity/HomePopular.java new file mode 100644 index 0000000..c450467 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/HomePopular.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-首页-热门表 + */ +@Data +@TableName("data_home_popular") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "HomePopular对象", description = "HomePopular对象") +public class HomePopular extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/HomeProduct.java b/src/main/java/org/springblade/modules/baotou/entity/HomeProduct.java new file mode 100644 index 0000000..1ec5f95 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/HomeProduct.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-首页-产品推介表 + */ +@Data +@TableName("data_home_product") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "HomeProduct对象", description = "HomeProduct对象") +public class HomeProduct extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/HomeStat.java b/src/main/java/org/springblade/modules/baotou/entity/HomeStat.java new file mode 100644 index 0000000..7573218 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/HomeStat.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-首页-统计表 + */ +@Data +@TableName("data_home_stat") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "HomeStat对象", description = "HomeStat对象") +public class HomeStat extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 单位 + */ + @ApiModelProperty(value = "单位") + private String unit; + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private Integer count; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/Information.java b/src/main/java/org/springblade/modules/baotou/entity/Information.java new file mode 100644 index 0000000..9a256fd --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/Information.java @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-数据大厅表 + */ +@Data +@TableName("data_information") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Information对象", description = "Information对象") +public class Information extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 支付方式（产品广场） + */ + @ApiModelProperty(value = "支付方式（产品广场）") + private String payMethod; + /** + * 数据产品（产品广场） + */ + @ApiModelProperty(value = "数据产品（产品广场）") + private String dataProduct; + /** + * 产品分类（产品广场） + */ + @ApiModelProperty(value = "产品分类（产品广场）") + private String productType; + /** + * 产品名称 + */ + @ApiModelProperty(value = "产品名称") + private String name; + /** + * 产品信息 + */ + @ApiModelProperty(value = "产品信息") + private String information; + /** + * 产品价格 + */ + @ApiModelProperty(value = "产品价格") + private Integer price; + /** + * 产品标签 + */ + @ApiModelProperty(value = "产品标签") + private String label; + /** + * 浏览量 + */ + @ApiModelProperty(value = "浏览量") + private Integer pageNum; + /** + * 收藏量 + */ + @ApiModelProperty(value = "收藏量") + private Integer collectNum; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/News.java b/src/main/java/org/springblade/modules/baotou/entity/News.java new file mode 100644 index 0000000..8b55c19 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/News.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +/** + * 实体类-新闻资讯表 + */ +@Data +@TableName("data_news") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "News对象", description = "News对象") +public class News extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String introduce; + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间") + private Date releaseTime; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 分类（字典值） + */ + @ApiModelProperty(value = "分类（字典值）") + private Integer type; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/Notice.java b/src/main/java/org/springblade/modules/baotou/entity/Notice.java new file mode 100644 index 0000000..d275af7 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/Notice.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-公告表 + */ +@Data +@TableName("data_notice") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Notice对象", description = "Notice对象") +public class Notice extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/Product.java b/src/main/java/org/springblade/modules/baotou/entity/Product.java new file mode 100644 index 0000000..cca4295 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/Product.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-产品表 + */ +@Data +@TableName("data_product") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Product对象", description = "Product对象") +public class Product extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 场景分类（数据大厅） + */ + @ApiModelProperty(value = "场景分类（数据大厅）") + private String sceneType; + /** + * 产品名称 + */ + @ApiModelProperty(value = "产品名称") + private String name; + /** + * 产品信息 + */ + @ApiModelProperty(value = "产品信息") + private String information; + /** + * 产品价格 + */ + @ApiModelProperty(value = "产品价格") + private Integer price; + /** + * 产品标签 + */ + @ApiModelProperty(value = "产品标签") + private String label; + /** + * 浏览量 + */ + @ApiModelProperty(value = "浏览量") + private Integer pageNum; + /** + * 收藏量 + */ + @ApiModelProperty(value = "收藏量") + private Integer collectNum; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ServiceGuide.java b/src/main/java/org/springblade/modules/baotou/entity/ServiceGuide.java new file mode 100644 index 0000000..cd37769 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ServiceGuide.java @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-服务指南表 + */ +@Data +@TableName("data_service_guide") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ServiceGuide对象", description = "ServiceGuide对象") +public class ServiceGuide extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 所属模块（字典值） + */ + @ApiModelProperty(value = "所属模块（字典值）") + private String module; + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ZoneFlow.java b/src/main/java/org/springblade/modules/baotou/entity/ZoneFlow.java new file mode 100644 index 0000000..eb07510 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ZoneFlow.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-医疗专区-流程图表 + */ +@Data +@TableName("data_zone_flow") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ZoneFlow对象", description = "ZoneFlow对象") +public class ZoneFlow extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ZoneIntroduce.java b/src/main/java/org/springblade/modules/baotou/entity/ZoneIntroduce.java new file mode 100644 index 0000000..63de28b --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ZoneIntroduce.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-医疗专区-专区介绍表 + */ +@Data +@TableName("data_zone_introduce") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ZoneIntroduce对象", description = "ZoneIntroduce对象") +public class ZoneIntroduce extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ZoneProductIntroduce.java b/src/main/java/org/springblade/modules/baotou/entity/ZoneProductIntroduce.java new file mode 100644 index 0000000..8c28c09 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ZoneProductIntroduce.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-医疗专区-产品介绍表 + */ +@Data +@TableName("data_zone_product_introduce") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ZoneProductIntroduce对象", description = "ZoneProductIntroduce对象") +public class ZoneProductIntroduce extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ZoneScene.java b/src/main/java/org/springblade/modules/baotou/entity/ZoneScene.java new file mode 100644 index 0000000..9643ee2 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ZoneScene.java @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-医疗专区-应用场景表 + */ +@Data +@TableName("data_zone_scene") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ZoneScene对象", description = "ZoneScene对象") +public class ZoneScene extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 所属模块（字典值） + */ + @ApiModelProperty(value = "所属模块（字典值）") + private String module; + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String content; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ZoneStat.java b/src/main/java/org/springblade/modules/baotou/entity/ZoneStat.java new file mode 100644 index 0000000..2b223b7 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ZoneStat.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-医疗专区-统计表 + */ +@Data +@TableName("data_zone_stat") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ZoneStat对象", description = "ZoneStat对象") +public class ZoneStat extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 单位 + */ + @ApiModelProperty(value = "单位") + private String unit; + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private Integer count; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/org/springblade/modules/baotou/entity/ZoneUnit.java b/src/main/java/org/springblade/modules/baotou/entity/ZoneUnit.java new file mode 100644 index 0000000..e9ed183 --- /dev/null +++ b/src/main/java/org/springblade/modules/baotou/entity/ZoneUnit.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.modules.baotou.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 实体类-医疗专区-共建单位表 + */ +@Data +@TableName("data_zone_unit") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ZoneUnit对象", description = "ZoneUnit对象") +public class ZoneUnit extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String url; + /** + * 是否展示 + */ + @ApiModelProperty(value = "是否展示") + private Integer isShow; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 35e2675..9de29f6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -134,19 +134,19 @@ oss: enabled: true #开启oss类型 #minio、s3、qiniu、alioss、huaweiobs、tencentcos - name: qiniu + name: minio #租户模式 - tenant-mode: true + tenant-mode: false #oss服务地址 - endpoint: http://prt1thnw3.bkt.clouddn.com + endpoint: http://192.168.1.102:9000 #minio转换服务地址，用于内网上传后将返回地址改为转换的外网地址 transform-endpoint: http://localhost:9000 #访问key - access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h + access-key: g5HeFysuXl8GR6Rn #密钥key - secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS + secret-key: fz2cbDybMz6VOYFnUHSa24jywAAJ7BkM #存储桶 - bucket-name: bladex + bucket-name: dataOperation #第三方登陆配置 social: diff --git a/src/main/resources/log/logback-dev.xml b/src/main/resources/log/logback-dev.xml index dacc4d8..6b9cf15 100644 --- a/src/main/resources/log/logback-dev.xml +++ b/src/main/resources/log/logback-dev.xml @@ -21,10 +21,44 @@ + + + + + ./logs/info-%d{yyyy-MM-dd}.log + + + %n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n + + + + INFO + ACCEPT + DENY + + + + + + + + ./logs/error-%d{yyyy-MM-dd}.log + + + %n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n + + + + ERROR + ACCEPT + DENY + + + - + ${DESTINATION} @@ -53,6 +87,50 @@ + + + INFO + ACCEPT + DENY + + + + + + ${DESTINATION} + + + + + UTC + + + + { + "traceId": "%X{traceId}", + "requestId": "%X{requestId}", + "accountId": "%X{accountId}", + "tenantId": "%X{tenantId}", + "logLevel": "%level", + "serviceName": "${springAppName:-SpringApp}", + "pid": "${PID:-}", + "thread": "%thread", + "class": "%logger{40}", + "line":"%L", + "message": "%message" + } + + + + + + + + + ERROR + ACCEPT + DENY + @@ -60,54 +138,14 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -