From 542931ddfd894e8441b0af1e74cefc517a766535 Mon Sep 17 00:00:00 2001 From: xxm Date: Thu, 8 Jul 2021 15:53:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?doc=20=E6=9B=B4=E6=96=B0README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 13 ++++++++---- _doc/FAQ.md | 20 ------------------- _doc/TODO.md | 0 ...71\347\233\256\351\203\250\347\275\262.md" | 0 4 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 _doc/FAQ.md delete mode 100644 _doc/TODO.md delete mode 100644 "_doc/\351\241\271\347\233\256\351\203\250\347\275\262.md" diff --git a/README.md b/README.md index 12e23ac..aa8c8f9 100644 --- a/README.md +++ b/README.md @@ -61,13 +61,18 @@ - 完善的库存管理，支持预占库存、库存释放、库存扣减、增加库存、库存超卖、库存预警等操作 +## 🥥项目体验 +- 系统管理平台：[待补充]() +- 聚合支付体验：[收银台](http://cashier.web.dev.bootx.cn/doc.html) +- Swagger聚合接口：[API文档](http://gateway.dev.bootx.cn:9000/doc.html) +- 日志分析：[Kibana管理平台](http://elk.dev.bootx.cn:5601/app/discover#) -## 🥥项目体验 +## 🍒文档 -- 聚合支付体验： -- 系统管理平台： -- 项目文档： +- 项目文档：[开发文档](https://www.yuque.com/bootx/bootx-cloud/) +- 项目启动：[启动文档](https://www.yuque.com/bootx/bootx-cloud/vpi0gn) +- 开发计划：[开发计划](https://www.yuque.com/bootx/bootx-cloud/xzmc6c) ## 🥞 系统架构 diff --git a/_doc/FAQ.md b/_doc/FAQ.md deleted file mode 100644 index 91bd68b..0000000 --- a/_doc/FAQ.md +++ /dev/null @@ -1,20 +0,0 @@ -# 🍳FAQ -1. 使用maven可以正常构建，但是IDEA出现`程序包cn.bootx.*`不存在，无法进行启动 - - - 首先判断pom文件是否已经添加依赖，可以执行`mvn -clear compile`进行测试，如果执行正常说明maven配置没问题 - - 如maven配置无问题，可能是IDEA的问题，可以试试以下的方法 - - 进行移包重构导致的类不识别，可以删除这个类，然后撤销 - - 如果是自动生成的类不识别，查看下`target\generated-sources`文件夹下的目录是否未被标记为代码目录 - - 删除.idea文件夹重新打开项目、清除IDEA缓存， - -2. 出现QEntity对象(如QOrder)找不到 - - 执行命令mvn compile`就可以通过APT生成对应的QEntity对象 - -3. 启动时Nacos Client报`failed to req API:/nacos/v1/ns/service/list after all servers...` 错误 - - 替换Spring Cloud Alibaba 默认的 Nacos Client 为2.x版本 - -4. - - diff --git a/_doc/TODO.md b/_doc/TODO.md deleted file mode 100644 index e69de29..0000000 diff --git "a/_doc/\351\241\271\347\233\256\351\203\250\347\275\262.md" "b/_doc/\351\241\271\347\233\256\351\203\250\347\275\262.md" deleted file mode 100644 index e69de29..0000000 -- Gitee From 6b42ddccc8a786f397c08dc463e6c05cfa694d44 Mon Sep 17 00:00:00 2001 From: xxm Date: Thu, 8 Jul 2021 15:55:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?build=20=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config/config/.metadata.yml | 61 +++++++++++++++++++ .../bootx-common-config-dev.yml | 0 .../{ => DEFAULT_GROUP}/bootx-gateway-dev.yml | 0 .../service-auth-center-dev.yml | 0 .../service-baseapi-dev.yml | 0 .../{ => DEFAULT_GROUP}/service-bsp-dev.yml | 0 .../service-goods-center-dev.yml | 0 .../service-notice-center-dev.yml | 0 .../service-order-center-dev.yml | 0 .../service-payment-center-dev.yml | 0 .../service-sales-center-dev.yml | 0 .../service-shop-engine-dev.yml | 0 .../service-user-center-dev.yml | 0 .../log/SensitiveDataLogConverter.java | 4 +- .../starter/log/logback-bootx-common.xml | 22 ++++--- pom.xml | 2 +- 16 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 _config/config/.metadata.yml rename _config/config/{ => DEFAULT_GROUP}/bootx-common-config-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/bootx-gateway-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-auth-center-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-baseapi-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-bsp-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-goods-center-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-notice-center-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-order-center-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-payment-center-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-sales-center-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-shop-engine-dev.yml (100%) rename _config/config/{ => DEFAULT_GROUP}/service-user-center-dev.yml (100%) diff --git a/_config/config/.metadata.yml b/_config/config/.metadata.yml new file mode 100644 index 0000000..179dc6b --- /dev/null +++ b/_config/config/.metadata.yml @@ -0,0 +1,61 @@ +metadata: +- appName: 网关 + dataId: bootx-gateway-dev.yml + desc: 网关 + group: DEFAULT_GROUP + type: yaml +- appName: 基础服务平台 + dataId: service-bsp-dev.yml + desc: 基础服务平台 + group: DEFAULT_GROUP + type: yaml +- appName: 基础api + dataId: service-baseapi-dev.yml + desc: 基础api + group: DEFAULT_GROUP + type: yaml +- appName: 用户中心 + dataId: service-user-center-dev.yml + desc: 用户中心 + group: DEFAULT_GROUP + type: yaml +- appName: 认证中心 + dataId: service-auth-center-dev.yml + desc: 认证中心 + group: DEFAULT_GROUP + type: yaml +- appName: 通知中心 + dataId: service-notice-center-dev.yml + desc: 通知中心 + group: DEFAULT_GROUP + type: yaml +- appName: 公共配置 + dataId: bootx-common-config-dev.yml + desc: 公共配置 + group: DEFAULT_GROUP + type: yaml +- appName: 销售中心 + dataId: service-sales-center-dev.yml + desc: 销售中心 + group: DEFAULT_GROUP + type: yaml +- appName: 商品中心 + dataId: service-goods-center-dev.yml + desc: 商品中心 + group: DEFAULT_GROUP + type: yaml +- appName: 商城引擎 + dataId: service-shop-engine-dev.yml + desc: 商城引擎 + group: DEFAULT_GROUP + type: yaml +- appName: 支付中心 + dataId: service-payment-center-dev.yml + desc: 支付中心 + group: DEFAULT_GROUP + type: yaml +- appName: 订单中心 + dataId: service-order-center-dev.yml + desc: 订单中心 + group: DEFAULT_GROUP + type: yaml diff --git a/_config/config/bootx-common-config-dev.yml b/_config/config/DEFAULT_GROUP/bootx-common-config-dev.yml similarity index 100% rename from _config/config/bootx-common-config-dev.yml rename to _config/config/DEFAULT_GROUP/bootx-common-config-dev.yml diff --git a/_config/config/bootx-gateway-dev.yml b/_config/config/DEFAULT_GROUP/bootx-gateway-dev.yml similarity index 100% rename from _config/config/bootx-gateway-dev.yml rename to _config/config/DEFAULT_GROUP/bootx-gateway-dev.yml diff --git a/_config/config/service-auth-center-dev.yml b/_config/config/DEFAULT_GROUP/service-auth-center-dev.yml similarity index 100% rename from _config/config/service-auth-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-auth-center-dev.yml diff --git a/_config/config/service-baseapi-dev.yml b/_config/config/DEFAULT_GROUP/service-baseapi-dev.yml similarity index 100% rename from _config/config/service-baseapi-dev.yml rename to _config/config/DEFAULT_GROUP/service-baseapi-dev.yml diff --git a/_config/config/service-bsp-dev.yml b/_config/config/DEFAULT_GROUP/service-bsp-dev.yml similarity index 100% rename from _config/config/service-bsp-dev.yml rename to _config/config/DEFAULT_GROUP/service-bsp-dev.yml diff --git a/_config/config/service-goods-center-dev.yml b/_config/config/DEFAULT_GROUP/service-goods-center-dev.yml similarity index 100% rename from _config/config/service-goods-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-goods-center-dev.yml diff --git a/_config/config/service-notice-center-dev.yml b/_config/config/DEFAULT_GROUP/service-notice-center-dev.yml similarity index 100% rename from _config/config/service-notice-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-notice-center-dev.yml diff --git a/_config/config/service-order-center-dev.yml b/_config/config/DEFAULT_GROUP/service-order-center-dev.yml similarity index 100% rename from _config/config/service-order-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-order-center-dev.yml diff --git a/_config/config/service-payment-center-dev.yml b/_config/config/DEFAULT_GROUP/service-payment-center-dev.yml similarity index 100% rename from _config/config/service-payment-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-payment-center-dev.yml diff --git a/_config/config/service-sales-center-dev.yml b/_config/config/DEFAULT_GROUP/service-sales-center-dev.yml similarity index 100% rename from _config/config/service-sales-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-sales-center-dev.yml diff --git a/_config/config/service-shop-engine-dev.yml b/_config/config/DEFAULT_GROUP/service-shop-engine-dev.yml similarity index 100% rename from _config/config/service-shop-engine-dev.yml rename to _config/config/DEFAULT_GROUP/service-shop-engine-dev.yml diff --git a/_config/config/service-user-center-dev.yml b/_config/config/DEFAULT_GROUP/service-user-center-dev.yml similarity index 100% rename from _config/config/service-user-center-dev.yml rename to _config/config/DEFAULT_GROUP/service-user-center-dev.yml diff --git a/bootx-starters/starter-log/src/main/java/cn/bootx/starter/log/SensitiveDataLogConverter.java b/bootx-starters/starter-log/src/main/java/cn/bootx/starter/log/SensitiveDataLogConverter.java index c5e6360..ac19abf 100644 --- a/bootx-starters/starter-log/src/main/java/cn/bootx/starter/log/SensitiveDataLogConverter.java +++ b/bootx-starters/starter-log/src/main/java/cn/bootx/starter/log/SensitiveDataLogConverter.java @@ -2,7 +2,7 @@ package cn.bootx.starter.log; import ch.qos.logback.classic.pattern.MessageConverter; import ch.qos.logback.classic.spi.ILoggingEvent; -import org.springframework.util.StringUtils; +import cn.hutool.core.util.StrUtil; import java.util.HashMap; import java.util.Map; @@ -30,7 +30,7 @@ public class SensitiveDataLogConverter extends MessageConverter { } private static String convert(String msg) { - if (StringUtils.isEmpty(msg)){ + if (StrUtil.isEmpty(msg)){ return msg; } for (Map.Entry entry : REPLACE_RULES.entrySet()) { diff --git a/bootx-starters/starter-log/src/main/resources/cn/bootx/starter/log/logback-bootx-common.xml b/bootx-starters/starter-log/src/main/resources/cn/bootx/starter/log/logback-bootx-common.xml index da02f2c..6c40743 100644 --- a/bootx-starters/starter-log/src/main/resources/cn/bootx/starter/log/logback-bootx-common.xml +++ b/bootx-starters/starter-log/src/main/resources/cn/bootx/starter/log/logback-bootx-common.xml @@ -22,16 +22,18 @@ - { - "log_time": "%date{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}", - "severity": "%level", - "service": "${appname}", - "trace": "%X{traceId:-}", - "span": "%X{spanId:-}", - "class": "%logger{40}", - "rest": "%message", - "stack_trace": "%exception{10}" - } + + { + "log_time": "%date{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}", + "severity": "%level", + "service": "${appname}", + "trace": "%X{traceId:-}", + "span": "%X{spanId:-}", + "class": "%logger{40}", + "rest": "%message", + "stack_trace": "%exception{10}" + } + diff --git a/pom.xml b/pom.xml index 5ce7008..1c5854f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 cn.bootx - edu-planform-bootx + bootx-cloud pom 1.0.0 -- Gitee From 5612f80512ce384af62edce36dc8da5b8ea3faf1 Mon Sep 17 00:00:00 2001 From: xxm Date: Thu, 8 Jul 2021 15:56:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?doc=20=E6=9B=B4=E6=96=B0README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index aa8c8f9..685b8e0 100644 --- a/README.md +++ b/README.md @@ -149,17 +149,6 @@ bootx-cloud └── platform-upms -- 用户权限平台[开发中] ``` -## 🍉QuickStart - -1. 下载项目 -2. 到项目根目录中，执行`maven-install.sh`脚本，将Meven依赖安装到本地仓库中,如果在一个idea中直接打开项目,则不需要执行 -3. 使用IDEA打开项目（推荐每个项目模块都单独使用IDEA打开，便于开发） -4. 项目执行`mvn -clear compile`生成JPA所需到QEntity类 - -## [🍒项目部署](_doc/项目部署.md) -## [🍿 开发计划](_doc/TODO.md) -## [🍳FAQ](_doc/FAQ.md) - ## 🥪 关于我们 微信扫码加入交流群，或添加微信号：`xxxx` 邀请进群 -- Gitee From 8621210cd13e5adbe0a550953498fca15c1c9b92 Mon Sep 17 00:00:00 2001 From: xxm Date: Thu, 8 Jul 2021 16:01:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?doc=20=E6=9B=B4=E6=96=B0README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 685b8e0..e61ecce 100644 --- a/README.md +++ b/README.md @@ -166,3 +166,8 @@ QQ扫码加入QQ交流群 Apache License Version 2.0 +## 🥂其他 + +- star趋势 + +[![Stargazers over time](https://whnb.wang/stars/bootx/bootx-cloud)](https://whnb.wang) -- Gitee