diff --git a/blade-biz-common/pom.xml b/blade-biz-common/pom.xml index ad18348f4..422a160a4 100644 --- a/blade-biz-common/pom.xml +++ b/blade-biz-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 @@ -28,12 +28,6 @@ blade-core-auto provided - - - cn.hutool - hutool-all - 5.8.16 - diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index e96a88ed9..d3408c282 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -27,6 +27,16 @@ import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_ */ public interface LauncherConstant { + /** + * xxljob + */ + String APPLICATION_XXLJOB_NAME = APPLICATION_NAME_PREFIX + "xxljob"; + + /** + * xxljob + */ + String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin"; + /** * nacos namespace id */ @@ -45,7 +55,7 @@ public interface LauncherConstant { /** * nacos test 地址 */ - String NACOS_TEST_ADDR = "172.30.0.48:8848"; + String NACOS_TEST_ADDR = "192.168.10.210:8848"; /** * sentinel dev 地址 @@ -75,7 +85,7 @@ public interface LauncherConstant { /** * seata test 地址 */ - String SEATA_TEST_ADDR = "172.30.0.68:8091"; + String SEATA_TEST_ADDR = "192.168.10.210:8091"; /** * dbuuo提供者 @@ -122,8 +132,6 @@ public interface LauncherConstant { */ String APPLICATION_STREAM_PROVIDER_NAME = APPLICATION_NAME_PREFIX + "stream-provider"; - - /** * seata file模式 */ @@ -144,21 +152,6 @@ public interface LauncherConstant { */ String GROUP_NAME = "-group"; - - /** - * 工厂对接服务名称 - */ - String APPLICATION_FACTORY_NAME = "logpm-factory"; - - - String APPLICATION_XXL_JOB_NAME = "logpm-xxl-job"; - - - - - - - /** * seata 服务组格式 * diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 285074b79..adaf9c0d1 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -40,7 +40,6 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); - PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group","DEFAULT_GROUP"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 322430b27..1d7afdf49 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 2b1d72556..bdef3a1f8 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,20 +5,19 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务API集合 logpm-factory-api - @@ -53,12 +52,6 @@ blade-core-auto provided - - - org.springblade - blade-biz-common - ${bladex.project.version} - diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index a21bb0e55..41c5f2f57 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -1,8 +1,42 @@ package com.logpm.factory; +import java.util.Random; + public class TestService { public static void main(String[] args) { + String code = getCharAndNumr(32); + System.out.println(code); + } + /** + * 方法1：生成随机数字和字母组合 + * @param length + * @return + */ + + public static String getCharAndNumr(int length) { + + Random random = new Random(); + + StringBuffer valSb = new StringBuffer(); + + String charStr = "0123456789abcdefghijklmnopqrstuvwxyz"; + + int charLength = charStr.length(); + + + + for (int i = 0; i < length; i++) { + + int index = random.nextInt(charLength); + + valSb.append(charStr.charAt(index)); + + } + + return valSb.toString(); + } + } diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 0edc724d3..a6d5fc06f 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 3.0.1.RELEASE + 3.1.0.RELEASE blade-service ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务集合 diff --git a/doc/nacos/blade-demo-dev.yaml b/doc/nacos/blade-demo-dev.yaml index 2474fbee4..fee2be5a3 100644 --- a/doc/nacos/blade-demo-dev.yaml +++ b/doc/nacos/blade-demo-dev.yaml @@ -1,12 +1,12 @@ #自定义配置 demo: - name: logpm-factory + name: demo-name #放行配置 blade: secure: skip-url: - - /factory/** + - /demo/** datasource: demo: master: diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 470d6c7d2..9af0ac3bc 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -59,22 +59,22 @@ knife4j: enableRequestCache: true enableFilterMultipartApis: false enableFilterMultipartApiMethodType: POST - language: zh-CN + language: zh_cn enableFooter: false enableFooterCustom: true - footerCustomContent: Copyright © 2021 BladeX All Rights Reserved + footerCustomContent: Copyright © 2023 BladeX All Rights Reserved #swagger公共信息 swagger: title: BladeX 接口文档系统 description: BladeX 接口文档系统 - version: 3.0.1.RELEASE + version: 3.1.0.RELEASE license: Powered By BladeX license-url: https://bladex.vip terms-of-service-url: https://bladex.vip contact: - name: smallchill - email: smallchill@163.com + name: 翼宿 + email: bladejava@qq.com url: https://gitee.com/smallc #blade配置 @@ -83,6 +83,8 @@ blade: token: #是否有状态 state: false + #token签名 + sign-key: 请配置签名 #redis序列化方式 redis: serializer-type: protostuff diff --git a/doc/nacos/routes/blade-gateway-dev.json b/doc/nacos/routes/blade-gateway-dev.json index 1fef883ea..23b7e7fb8 100644 --- a/doc/nacos/routes/blade-gateway-dev.json +++ b/doc/nacos/routes/blade-gateway-dev.json @@ -12,6 +12,7 @@ ], "filters": [], "uri": "lb://blade-desk-me" + }, { "id": "example-route", diff --git a/pom.xml b/pom.xml index 8445ed880..809d39a26 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX-Biz - 3.0.1.RELEASE + 3.1.0.RELEASE pom - 3.0.1.RELEASE + 3.1.0.RELEASE 1.8 3.8.1 @@ -19,10 +19,6 @@ 6.4.2 2.7.8 - 2.7.1 - 2021.0.3 - Cairo-SR8 - 192.168.0.157 http://${docker.registry.url}:2375 @@ -34,10 +30,12 @@ blade-biz-common + blade-example + blade-example-api blade-gateway + blade-ops blade-service blade-service-api - @@ -54,27 +52,6 @@ blade-biz-common ${bladex.project.version} - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - io.spring.platform - platform-bom - ${spring.platform.version} - pom - import - @@ -104,7 +81,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + 2.7.10 true ${project.build.finalName} diff --git a/script/docker/app/.env b/script/docker/app/.env index 2dd593efc..795c1284f 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=3.0.1.RELEASE +TAG=3.1.0.RELEASE diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh index 5f3a1d6e1..4a08b6e42 100644 --- a/script/docker/app/deploy.sh +++ b/script/docker/app/deploy.sh @@ -1,3 +1,4 @@ +#!/bin/bash #使用说明，用来提示输入参数 usage() { @@ -13,6 +14,8 @@ port(){ firewall-cmd --add-port=8000/tcp --permanent #nacos firewall-cmd --add-port=8848/tcp --permanent + firewall-cmd --add-port=9848/tcp --permanent + firewall-cmd --add-port=9849/tcp --permanent #sentinel firewall-cmd --add-port=8858/tcp --permanent #grafana @@ -24,13 +27,11 @@ port(){ #admin firewall-cmd --add-port=7002/tcp --permanent #ureport - firewall-cmd --add-port=7003/tcp --permanent + firewall-cmd --add-port=8108/tcp --permanent #zipkin firewall-cmd --add-port=9411/tcp --permanent #prometheus firewall-cmd --add-port=9090/tcp --permanent - #flowdesign - firewall-cmd --add-port=9999/tcp --permanent #swagger firewall-cmd --add-port=18000/tcp --permanent #firewalld @@ -90,12 +91,12 @@ base(){ #启动监控模块 monitor(){ - docker-compose up -d blade-admin blade-turbine + docker-compose up -d blade-admin } #启动程序模块 modules(){ - docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-swagger blade-report blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource + docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-swagger blade-report blade-desk blade-system blade-log blade-flow blade-resource } #启动普罗米修斯模块 diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml index 92b67f3d4..1c57f7a53 100644 --- a/script/docker/app/docker-compose.yml +++ b/script/docker/app/docker-compose.yml @@ -6,16 +6,18 @@ services: #################################################################################################### nacos: - image: nacos/nacos-server:1.3.2 + image: nacos/nacos-server:2.1.2 hostname: "nacos-standalone" environment: - MODE=standalone - TZ=Asia/Shanghai volumes: - /docker/nacos/standalone-logs/:/home/nacos/logs - - /docker/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties + - /docker/nacos/conf/application.properties:/home/nacos/conf/application.properties ports: - 8848:8848 + - 9848:9848 + - 9849:9849 networks: blade_net: ipv4_address: 172.30.0.48 @@ -33,7 +35,7 @@ services: ipv4_address: 172.30.0.58 seata-server: - image: seataio/seata-server:1.4.1 + image: seataio/seata-server:1.6.1 hostname: "seata-server" ports: - 8091:8091 @@ -116,17 +118,6 @@ services: networks: - blade_net - blade-turbine: - image: "${REGISTER}/blade-turbine:${TAG}" - environment: - - TZ=Asia/Shanghai - ports: - - 7003:7003 - privileged: true - restart: always - networks: - - blade_net - blade-gateway1: image: "${REGISTER}/blade-gateway:${TAG}" environment: @@ -173,6 +164,8 @@ services: - TZ=Asia/Shanghai privileged: true restart: always + ports: + - 8108:8108 networks: blade_net: ipv4_address: 172.30.0.98 @@ -195,15 +188,6 @@ services: networks: - blade_net - blade-user: - image: "${REGISTER}/blade-user:${TAG}" - environment: - - TZ=Asia/Shanghai - privileged: true - restart: always - networks: - - blade_net - blade-system: image: "${REGISTER}/blade-system:${TAG}" environment: @@ -222,17 +206,6 @@ services: networks: - blade_net - blade-flow-design: - image: "${REGISTER}/blade-flow-design:${TAG}" - environment: - - TZ=Asia/Shanghai - privileged: true - restart: always - ports: - - 9999:9999 - networks: - - blade_net - blade-resource: image: "${REGISTER}/blade-resource:${TAG}" environment: