diff --git a/README.md b/README.md index 0de6efe1d..34ad2f0ff 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ ## 版权声明 * BladeX是一个商业化软件，系列产品知识产权归**上海布雷德科技有限公司**独立所有 * 您一旦开始复制、下载、安装或者使用本产品，即被视为完全理解并接受本协议的各项条款 -* 更多详情请看：[BladeX商业授权许可协议](/LICENSE) +* 更多详情请看：[BladeX商业授权许可协议](https://license.bladex.cn) ## 答疑流程 >1. 遇到问题或Bug >2. 业务型问题打断点调试尝试找出问题所在 >3. 系统型问题通过百度、谷歌、社区查找解决方案 ->4. 未解决问题则进入技术社区进行发帖提问：[https://sns.bladex.vip/](https://sns.bladex.vip/) +>4. 未解决问题则进入技术社区进行发帖提问：[https://sns.bladex.cn](https://sns.bladex.cn) >5. 将帖子地址发至商业群，特别简单三言两语就能描述清楚的也可在答疑时间内发至商业群提问 >6. 发帖的时候一定要描述清楚，详细描述遇到问题的**重现步骤**、**报错详细信息**、**相关代码与逻辑**、**使用软件版本**以及**操作系统版本**，否则随意发帖提问将会提高我们的答疑难度。 ## 答疑时间 * 工作日：9:00 ~ 17:00 提供答疑，周末、节假日休息，暂停答疑 * 请勿**私聊提问**，以免被其他用户的消息覆盖从而无法获得答疑 -* 答疑时间外遇到问题可以将问题发帖至[技术社区](https://sns.bladex.vip/)，我们后续会逐个回复 +* 答疑时间外遇到问题可以将问题发帖至[技术社区](https://sns.bladex.cn)，我们后续会逐个回复 ## 授权范围 * 专业版：只可用于**个人学习**及**个人私活**项目，不可用于公司或团队，不可泄露给任何第三方 @@ -22,9 +22,9 @@ * 共同遵守：若甲方需要您提供项目源码，则需代为甲方购买BladeX企业授权，甲方购买后续的所有项目都无需再次购买授权 ## 商用权益 -* ✔️ 遵守[商业协议](/LICENSE)的前提下，将BladeX系列产品用于授权范围内的商用项目，并上线运营 -* ✔️ 遵守[商业协议](/LICENSE)的前提下，不限制项目数，不限制服务器数 -* ✔️ 遵守[商业协议](/LICENSE)的前提下，将自行编写的业务代码申请软件著作权 +* ✔️ 遵守[商业协议](https://license.bladex.cn)的前提下，将BladeX系列产品用于授权范围内的商用项目，并上线运营 +* ✔️ 遵守[商业协议](https://license.bladex.cn)的前提下，不限制项目数，不限制服务器数 +* ✔️ 遵守[商业协议](https://license.bladex.cn)的前提下，将自行编写的业务代码申请软件著作权 ## 何为侵权 * ❌ 不遵守商业协议，私自销售商业源码 diff --git a/blade-biz-common/pom.xml b/blade-biz-common/pom.xml index 88e461997..04699a713 100644 --- a/blade-biz-common/pom.xml +++ b/blade-biz-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 3.1.0.RELEASE + 3.2.0.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 1d7afdf49..9974dbbdf 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 3.1.0.RELEASE + 3.2.0.RELEASE 4.0.0 @@ -78,18 +78,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java b/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java index 4175149f1..eb453748a 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java @@ -81,8 +81,9 @@ public class AuthFilter implements GlobalFilter, Ordered { //判断 Token 状态 if (jwtProperties.getState()) { String tenantId = String.valueOf(claims.get(TokenConstant.TENANT_ID)); + String clientId = String.valueOf(claims.get(TokenConstant.CLIENT_ID)); String userId = String.valueOf(claims.get(TokenConstant.USER_ID)); - String accessToken = JwtUtil.getAccessToken(tenantId, userId, token); + String accessToken = JwtUtil.getAccessToken(tenantId, clientId, userId, token); if (!token.equalsIgnoreCase(accessToken)) { return unAuth(resp, "令牌已失效"); } diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index d4cc52278..a62ff2226 100644 --- a/blade-ops/blade-xxljob-admin/pom.xml +++ b/blade-ops/blade-xxljob-admin/pom.xml @@ -3,7 +3,7 @@ blade-ops org.springblade - 3.1.0.RELEASE + 3.2.0.RELEASE 4.0.0 @@ -92,18 +92,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index d8751fa2b..0d16d66fa 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 3.1.0.RELEASE + 3.2.0.RELEASE 4.0.0 blade-ops ${project.artifactId} - 3.1.0.RELEASE + 3.2.0.RELEASE pom diff --git a/blade-service-api/logpm-basicdata-api/pom.xml b/blade-service-api/logpm-basicdata-api/pom.xml index 9ae7563f0..44995405e 100644 --- a/blade-service-api/logpm-basicdata-api/pom.xml +++ b/blade-service-api/logpm-basicdata-api/pom.xml @@ -6,18 +6,23 @@ org.springblade + 3.2.0.RELEASE blade-service-api - 3.1.0.RELEASE org.springblade logpm-basicdata-api - 3.1.0.RELEASE + 3.2.0.RELEASE + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + cn.hutool hutool-all + diff --git a/blade-service-api/logpm-factory-api/pom.xml b/blade-service-api/logpm-factory-api/pom.xml index 6986bb779..570133971 100644 --- a/blade-service-api/logpm-factory-api/pom.xml +++ b/blade-service-api/logpm-factory-api/pom.xml @@ -2,18 +2,16 @@ - 4.0.0 - - org.springblade blade-service-api - 3.1.0.RELEASE + org.springblade + 3.2.0.RELEASE + 4.0.0 org.springblade logpm-factory-api - 3.1.0.RELEASE + ${bladex.project.version} jar - diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 961e147c9..d9d8e999f 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz org.springblade - 3.1.0.RELEASE + 3.2.0.RELEASE BladeX 微服务API集合 4.0.0 blade-service-api ${project.artifactId} - 3.1.0.RELEASE + 3.2.0.RELEASE pom diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/rule/AbizRule.java b/blade-service/blade-demo/src/main/java/com/example/demo/rule/AbizRule.java new file mode 100644 index 000000000..1184d215f --- /dev/null +++ b/blade-service/blade-demo/src/main/java/com/example/demo/rule/AbizRule.java @@ -0,0 +1,39 @@ +/* + * 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 com.example.demo.rule; + +import com.yomahub.liteflow.annotation.LiteflowComponent; +import com.yomahub.liteflow.core.NodeComponent; +import lombok.extern.slf4j.Slf4j; + + +/** + * A业务 + * + * @author Chill + */ +@Slf4j +@LiteflowComponent(id = "abizRule", name = "A业务") +public class AbizRule extends NodeComponent { + @Override + public void process() throws Exception { + + log.info("A业务执行完毕"); + + } + +} diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/rule/BbizRule.java b/blade-service/blade-demo/src/main/java/com/example/demo/rule/BbizRule.java new file mode 100644 index 000000000..497940afa --- /dev/null +++ b/blade-service/blade-demo/src/main/java/com/example/demo/rule/BbizRule.java @@ -0,0 +1,48 @@ +/* + * 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 com.example.demo.rule; + +import com.example.demo.rule.context.BizContext; +import com.yomahub.liteflow.annotation.LiteflowComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; +import lombok.extern.slf4j.Slf4j; + + +/** + * A业务 + * + * @author Chill + */ +@Slf4j +@LiteflowComponent(id = "bbizRule", name = "B业务") +public class BbizRule extends NodeSwitchComponent { + + @Override + public String processSwitch() throws Exception { + // 获取上下文 + BizContext contextBean = this.getContextBean(BizContext.class); + // 获取条件 + Boolean isPublish = contextBean.getIsPublish(); + log.info("B业务执行判断"); + // 进行节点判断 + if (isPublish) { + return "cbizRule"; + } else { + return "dbizRule"; + } + } +} diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/rule/CbizRule.java b/blade-service/blade-demo/src/main/java/com/example/demo/rule/CbizRule.java new file mode 100644 index 000000000..0a4df053d --- /dev/null +++ b/blade-service/blade-demo/src/main/java/com/example/demo/rule/CbizRule.java @@ -0,0 +1,44 @@ +/* + * 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 com.example.demo.rule; + +import com.example.demo.rule.context.BizContext; +import com.yomahub.liteflow.annotation.LiteflowComponent; +import com.yomahub.liteflow.core.NodeComponent; +import lombok.extern.slf4j.Slf4j; + + +/** + * A业务 + * + * @author Chill + */ +@Slf4j +@LiteflowComponent(id = "cbizRule", name = "C业务") +public class CbizRule extends NodeComponent { + @Override + public void process() throws Exception { + // 获取上下文 + BizContext contextBean = this.getContextBean(BizContext.class); + // 修改上下文 + contextBean.setName(contextBean.getName() + "-> C"); + + log.info("C业务执行完毕"); + + } + +} diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/rule/DbizRule.java b/blade-service/blade-demo/src/main/java/com/example/demo/rule/DbizRule.java new file mode 100644 index 000000000..4b73f5636 --- /dev/null +++ b/blade-service/blade-demo/src/main/java/com/example/demo/rule/DbizRule.java @@ -0,0 +1,45 @@ +/* + * 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 com.example.demo.rule; + +import com.example.demo.rule.context.BizContext; +import com.yomahub.liteflow.annotation.LiteflowComponent; +import com.yomahub.liteflow.core.NodeComponent; +import lombok.extern.slf4j.Slf4j; + + +/** + * A业务 + * + * @author Chill + */ +@Slf4j +@LiteflowComponent(id = "dbizRule", name = "D业务") +public class DbizRule extends NodeComponent { + @Override + public void process() throws Exception { + // 获取上下文 + BizContext contextBean = this.getContextBean(BizContext.class); + // 修改上下文 + contextBean.setName(contextBean.getName() + "-> D"); + + log.info("D业务执行完毕"); + + + } + +} diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/rule/context/BizContext.java b/blade-service/blade-demo/src/main/java/com/example/demo/rule/context/BizContext.java new file mode 100644 index 000000000..ad490d49c --- /dev/null +++ b/blade-service/blade-demo/src/main/java/com/example/demo/rule/context/BizContext.java @@ -0,0 +1,21 @@ +package com.example.demo.rule.context; + +import lombok.Data; + +/** + * 上下文类 + * + * @author Chill + */ +@Data +public class BizContext { + + private Long id; + + private String name; + + private Integer category; + + private Boolean isPublish; + +} diff --git a/blade-service/logpm-aftersales/pom.xml b/blade-service/logpm-aftersales/pom.xml index f790b4038..6fb929191 100644 --- a/blade-service/logpm-aftersales/pom.xml +++ b/blade-service/logpm-aftersales/pom.xml @@ -7,12 +7,13 @@ org.springblade blade-service - 3.1.0.RELEASE + 3.2.0.RELEASE org.springblade logpm-aftersales ${bladex.project.version} + jar @@ -29,5 +30,5 @@ compile - + diff --git a/blade-service/logpm-basic/pom.xml b/blade-service/logpm-basic/pom.xml index 48bd9308b..000f016ca 100644 --- a/blade-service/logpm-basic/pom.xml +++ b/blade-service/logpm-basic/pom.xml @@ -6,9 +6,14 @@ org.springblade blade-service - 3.1.0.RELEASE + 3.2.0.RELEASE + org.springblade + logpm-basic + ${bladex.project.version} + + org.springblade @@ -57,27 +62,13 @@ - - org.springblade - logpm-basic - ${bladex.project.version} - - - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-service/logpm-old-project/pom.xml b/blade-service/logpm-old-project/pom.xml index 167bc079d..e1c50cb96 100644 --- a/blade-service/logpm-old-project/pom.xml +++ b/blade-service/logpm-old-project/pom.xml @@ -7,7 +7,7 @@ org.springblade blade-service - 3.1.0.RELEASE + 3.2.0.RELEASE org.springblade @@ -33,6 +33,10 @@ com.baomidou dynamic-datasource-spring-boot-starter + + org.springblade + blade-starter-liteflow + org.springblade blade-core-test @@ -49,18 +53,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-service/logpm-statisticsdata/pom.xml b/blade-service/logpm-statisticsdata/pom.xml index 403e0317d..4f2471905 100644 --- a/blade-service/logpm-statisticsdata/pom.xml +++ b/blade-service/logpm-statisticsdata/pom.xml @@ -7,11 +7,13 @@ org.springblade blade-service - 3.1.0.RELEASE + 3.2.0.RELEASE org.springblade logpm-statisticsdata + ${bladex.project.version} + jar @@ -29,5 +31,4 @@ - diff --git a/blade-service/logpm-trunkline/pom.xml b/blade-service/logpm-trunkline/pom.xml index 93eb75a45..f1b434b83 100644 --- a/blade-service/logpm-trunkline/pom.xml +++ b/blade-service/logpm-trunkline/pom.xml @@ -6,13 +6,16 @@ org.springblade + 3.2.0.RELEASE blade-service - 3.1.0.RELEASE + 4.0.0 org.springblade logpm-trunkline ${bladex.project.version} + jar + org.springblade @@ -34,7 +37,7 @@ org.springblade logpm-trunkline-api - 3.1.0.RELEASE + 3.2.0.RELEASE compile diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 3284d07d7..818fa5a2f 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,7 +7,7 @@ org.springblade BladeX-Biz - 3.1.0.RELEASE + 3.2.0.RELEASE blade-service @@ -16,8 +16,6 @@ pom 微服务集合 - - logpm-factory diff --git a/doc/docker/README.md b/doc/docker/README.md index e65faed91..b9d1222ba 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -4,9 +4,9 @@ ``` - 192.168.0.157 + 192.168.0.188 admin - Harbor12345 + admin12345 smallchill@163.com @@ -14,13 +14,13 @@ - com.spotify + io.fabric8 ``` ### 2. docker开启远程访问 -如果没有远程访问,会报 `Connect to 192.168.0.157:2375 [/192.168.0.157] failed: Connection refused: connect` +如果没有远程访问,会报 `Connect to 192.168.0.188:2375 [/192.168.0.188] failed: Connection refused: connect` 在`/usr/lib/systemd/system/docker.service`,配置远程访问。主要是在[Service]这个部分，加上下面两个参数： @@ -49,7 +49,7 @@ ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock ``` { "registry-mirrors": ["https://3dse7md.mirror.aliyuncs.com"], - "insecure-registries":["192.168.0.157"] + "insecure-registries":["192.168.0.188"] } ``` @@ -59,18 +59,10 @@ ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} @@ -80,9 +72,9 @@ ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock ### 5. 在每个需要构建子项目的根目录下加入Dockerfile,内容可参考如下 ``` -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/gateway @@ -100,10 +92,15 @@ CMD ["--spring.profiles.active=test"] ### 6. 在工程根目录的docker-compose.yml下加入配置，内容可参考如下 ``` blade-gateway: - image: "${REGISTER}/blade/blade-gateway:${TAG}" + image: "${REGISTER}/blade-gateway:${TAG}" ports: - 80:80 networks: blade_net: ipv4_address: 192.168.2.1 ``` + +### 7. 一切配置完毕，采用fabric插件命令执行构建推送： +``` +mvn clean package docker:build docker:push +``` \ No newline at end of file diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index ab587129b..61cc5f8a4 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -17,10 +17,12 @@ spring: #driver-class-name: oracle.jdbc.OracleDriver #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver #driver-class-name: dm.jdbc.driver.DmDriver + #driver-class-name: com.yashandb.jdbc.Driver druid: # MySql、PostgreSQL、SqlServer、DaMeng校验 validation-query: select 1 - # Oracle校验 + # Oracle、YashanDB校验 + #oracle: true #validation-query: select 1 from dual #项目模块集中配置 @@ -30,14 +32,13 @@ blade: enabled: false address: redis://127.0.0.1:6379 #多团队协作服务配置 - ribbon: - rule: - #开启配置 - enabled: true - #负载均衡优先调用的ip段 - prior-ip-pattern: - - 192.168.0.* - - 127.0.0.1 + loadbalancer: + #开启配置 + enabled: true + #负载均衡优先调用的ip段 + prior-ip-pattern: + - 192.168.0.* + - 127.0.0.1 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: dev: @@ -61,3 +62,7 @@ blade: #url: jdbc:dm://127.0.0.1:5236/BLADEX?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 #username: BLADEX #password: BLADEX + # YashanDB + #url: jdbc:yasdb://127.0.0.1:1688/BLADEX + #username: BLADEX + #password: BLADEX diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 07e52fba3..5940a87ce 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -4,7 +4,7 @@ spring: ##redis 单机环境配置 ##将docker脚本部署的redis服务映射为宿主机ip ##生产环境推荐使用阿里云高可用redis服务并设置密码 - host: 192.168.0.157 + host: 192.168.0.188 port: 3379 password: database: 0 @@ -15,13 +15,16 @@ spring: # commandTimeout: 5000 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - #driver-class-name: org.postgresql.Driver - #driver-class-name: oracle.jdbc.OracleDriver - #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: org.postgresql.Driver + #driver-class-name: oracle.jdbc.OracleDriver + #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: dm.jdbc.driver.DmDriver + #driver-class-name: com.yashandb.jdbc.Driver druid: - # MySql、PostgreSQL、SqlServer校验 + # MySql、PostgreSQL、SqlServer、DaMeng校验 validation-query: select 1 - # Oracle校验 + # Oracle、YashanDB校验 + #oracle: true #validation-query: select 1 from dual #项目模块集中配置 @@ -32,10 +35,10 @@ blade: enabled: false ##将docker脚本部署的redis服务映射为宿主机ip ##生产环境推荐使用阿里云高可用redis服务并设置密码 - address: redis://192.168.0.157:3379 + address: redis://192.168.0.188:3379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: prod: - url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.0.188:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: root diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index 269d7c674..6e7c13cb2 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -3,7 +3,7 @@ spring: redis: ##redis 单机环境配置 ##将docker脚本部署的redis服务映射为宿主机ip - host: 192.168.0.157 + host: 192.168.0.188 port: 3379 password: database: 0 @@ -14,13 +14,16 @@ spring: # commandTimeout: 5000 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - #driver-class-name: org.postgresql.Driver - #driver-class-name: oracle.jdbc.OracleDriver - #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: org.postgresql.Driver + #driver-class-name: oracle.jdbc.OracleDriver + #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: dm.jdbc.driver.DmDriver + #driver-class-name: com.yashandb.jdbc.Driver druid: - # MySql、PostgreSQL、SqlServer校验 + # MySql、PostgreSQL、SqlServer、DaMeng校验 validation-query: select 1 - # Oracle校验 + # Oracle、YashanDB校验 + #oracle: true #validation-query: select 1 from dual #项目模块集中配置 @@ -30,10 +33,10 @@ blade: ##是否启用分布式锁 enabled: false ##将docker脚本部署的redis服务映射为宿主机ip - address: redis://192.168.0.157:3379 + address: redis://192.168.0.188:3379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: test: - url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.0.188:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: root diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 9af0ac3bc..31534c7fd 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -68,7 +68,7 @@ knife4j: swagger: title: BladeX 接口文档系统 description: BladeX 接口文档系统 - version: 3.1.0.RELEASE + version: 3.2.0.RELEASE license: Powered By BladeX license-url: https://bladex.vip terms-of-service-url: https://bladex.vip @@ -83,8 +83,13 @@ blade: token: #是否有状态 state: false + #是否单用户登录 + single: false + #单用户登录范围 + single-level: all #token签名 - sign-key: 请配置签名 + #使用 blade-auth服务 @org.springblade.test.SignKeyGenerator 获取 + sign-key: 请配置32位签名 #redis序列化方式 redis: serializer-type: protostuff @@ -106,6 +111,17 @@ blade: big-num-to-string: true #支持text文本请求,与报文加密同时开启 support-text-plain: false + #日志配置 + log: + request: + #开启控制台请求日志 + enabled: true + #控制台请求日志忽略 + skip-url: + - /blade-desk/notice/list + - /blade-chat/weixin/** + #开启错误日志入库 + error-log: true #xss配置 xss: enabled: true diff --git a/pom.xml b/pom.xml index d6bc07ac4..a501b23d0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade BladeX-Biz - 3.1.0.RELEASE + 3.2.0.RELEASE pom @@ -19,13 +19,13 @@ 6.4.2 2.7.8 - - 192.168.0.157 - http://${docker.registry.url}:2375 + + 192.168.0.188 admin - Harbor12345 + admin12345 blade - 1.4.13 + false + 0.42.0 @@ -54,6 +54,32 @@ + + + + + + + + + + + org.projectlombok lombok @@ -87,7 +113,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.7.10 + 2.7.11 true ${project.build.finalName} @@ -101,29 +127,29 @@ - com.spotify - dockerfile-maven-plugin - ${docker.plugin.version} + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true + true + + ${docker.username} + ${docker.password} + + ${docker.registry.url} + + + ${docker.namespace}/${project.build.finalName}:${project.version} + ${project.name} + + ${project.basedir}/Dockerfile + + + - target/${project.build.finalName}.jar + ${basedir}/target/${project.build.finalName}.jar - - org.apache.maven.plugins @@ -148,13 +174,6 @@ - - com.spotify - dockerfile-maven-plugin - - true - - org.springframework.boot spring-boot-maven-plugin @@ -179,36 +198,43 @@ - - - - - - - - - - - - - - - - - - - - - - + + + aliyun-repos + Aliyun Public Repository + https://maven.aliyun.com/repository/public + + false + + + + bladex + BladeX Release Repository + https://center.javablade.com/api/packages/blade/maven + + aliyun-plugin - https://maven.aliyun.com/repository/public/ + Aliyun Public Plugin + https://maven.aliyun.com/repository/public false + + + bladex + BladeX Release Repository + https://center.javablade.com/api/packages/blade/maven + + + bladex + BladeX Snapshot Repository + https://center.javablade.com/api/packages/blade/maven + + + diff --git a/script/docker/app/.env b/script/docker/app/.env index 795c1284f..c01a767fb 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ -REGISTER=192.168.0.157/blade -TAG=3.1.0.RELEASE +REGISTER=192.168.0.188/blade +TAG=3.2.0.RELEASE diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh index 4a08b6e42..adf1b7854 100644 --- a/script/docker/app/deploy.sh +++ b/script/docker/app/deploy.sh @@ -50,9 +50,9 @@ mount(){ cp nginx/web/nginx.conf /docker/nginx/web/nginx.conf cp -r nginx/web/html /docker/nginx/web/html fi - if test ! -f "/docker/nacos/init.d/custom.properties" ;then - mkdir -p /docker/nacos/init.d - cp nacos/init.d/custom.properties /docker/nacos/init.d/custom.properties + if test ! -f "/docker/nacos/conf/application.properties" ;then + mkdir -p /docker/nacos/conf + cp nacos/conf/application.properties /docker/nacos/conf/application.properties fi if test ! -f "/docker/prometheus/prometheus.yml" ;then mkdir -p /docker/prometheus diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml index 1c57f7a53..a1d841f3f 100644 --- a/script/docker/app/docker-compose.yml +++ b/script/docker/app/docker-compose.yml @@ -6,7 +6,7 @@ services: #################################################################################################### nacos: - image: nacos/nacos-server:2.1.2 + image: nacos/nacos-server:v2.1.2 hostname: "nacos-standalone" environment: - MODE=standalone diff --git a/script/docker/app/nginx/web/nginx.conf b/script/docker/app/nginx/web/nginx.conf index af418a624..c7b15ac49 100644 --- a/script/docker/app/nginx/web/nginx.conf +++ b/script/docker/app/nginx/web/nginx.conf @@ -41,9 +41,9 @@ http { server_name web; root /usr/share/nginx/html; - location / { - root html; - index index.html; + location /{ + index index.html; + error_page 404 /index.html; } location ^~ /oauth/redirect {