From 8f36a4081a7d47eaef1d57ff1dd12e73571be2b9 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Tue, 25 Feb 2025 10:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk-modules/business/pom.xml | 125 ++++++++++++++++ .../dromara/business/BusinessApplication.java | 22 +++ dk-modules/pom.xml | 1 + dk-modules/system/pom.xml | 2 +- docker/docker-compose.yml | 137 +++++++++--------- docker/grafana/grafana.ini | 2 +- sql/wayline_module.sql | 71 +++++++++ 7 files changed, 289 insertions(+), 71 deletions(-) create mode 100644 dk-modules/business/pom.xml create mode 100644 dk-modules/business/src/main/java/org/dromara/business/BusinessApplication.java create mode 100644 sql/wayline_module.sql diff --git a/dk-modules/business/pom.xml b/dk-modules/business/pom.xml new file mode 100644 index 0000000..00a3349 --- /dev/null +++ b/dk-modules/business/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + org.dromara + dk-modules + 2.2.2 + + + business + + business系统业务模块 + + + + + org.dromara + common-nacos + + + + org.dromara + common-sentinel + + + + + org.dromara + common-log + + + + org.dromara + common-dict + + + + org.dromara + common-doc + + + + org.dromara + common-web + + + + org.dromara + common-mybatis + + + + org.dromara + common-dubbo + + + + org.dromara + common-seata + + + + org.dromara + common-idempotent + + + + org.dromara + common-tenant + + + + org.dromara + common-security + + + + org.dromara + common-translation + + + + org.dromara + common-sensitive + + + + org.dromara + common-encrypt + + + + + org.dromara + api-system + + + + org.dromara + api-resource + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/dk-modules/business/src/main/java/org/dromara/business/BusinessApplication.java b/dk-modules/business/src/main/java/org/dromara/business/BusinessApplication.java new file mode 100644 index 0000000..ba5d62d --- /dev/null +++ b/dk-modules/business/src/main/java/org/dromara/business/BusinessApplication.java @@ -0,0 +1,22 @@ +package org.dromara.business; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; + +/** + * @auther yq + * @data 2025/2/25 + */ +@EnableDubbo +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class BusinessApplication { + public static void main(String[] args) { + SpringApplication application = new SpringApplication(BusinessApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ 业务模块启动成功 ლ(´ڡ`ლ)ﾞ "); + } +} diff --git a/dk-modules/pom.xml b/dk-modules/pom.xml index 3aa570a..b715fd4 100644 --- a/dk-modules/pom.xml +++ b/dk-modules/pom.xml @@ -15,6 +15,7 @@ resource workflow sample + business dk-modules diff --git a/dk-modules/system/pom.xml b/dk-modules/system/pom.xml index 6ed43f7..d6f9ac7 100644 --- a/dk-modules/system/pom.xml +++ b/dk-modules/system/pom.xml @@ -12,7 +12,7 @@ system - ruoyi-system系统模块 + system系统模块 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f45b939..727921c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -8,11 +8,11 @@ services: # 时区上海 TZ: Asia/Shanghai # root 密码 - MYSQL_ROOT_PASSWORD: ruoyi123 + MYSQL_ROOT_PASSWORD: 123456 # 初始化数据库 - MYSQL_DATABASE: ry-cloud - ports: - - "3306:3306" + MYSQL_DATABASE: dk-cloud +# ports: +# - "3306:3306" volumes: # 数据挂载 - /docker/mysql/data/:/var/lib/mysql/ @@ -29,12 +29,12 @@ services: network_mode: "host" nacos: - image: ruoyi/ruoyi-nacos:2.2.2 + image: dk/dk-nacos:2.2.2 container_name: nacos - ports: - - "8848:8848" - - "9848:9848" - - "9849:9849" +# ports: +# - "8848:8848" +# - "9848:9848" +# - "9849:9849" environment: TZ: Asia/Shanghai JAVA_OPTS: "-Xms256m -Xmx512m" @@ -48,8 +48,8 @@ services: redis: image: redis:6.2.12 container_name: redis - ports: - - "6379:6379" +# ports: +# - "6379:6379" environment: # 时区上海 TZ: Asia/Shanghai @@ -65,18 +65,18 @@ services: minio: image: minio/minio:RELEASE.2023-03-24T21-41-23Z container_name: minio - ports: - # api 端口 - - "9000:9000" - # 控制台端口 - - "9001:9001" +# ports: +# # api 端口 +# - "9000:9000" +# # 控制台端口 +# - "9001:9001" environment: # 时区上海 TZ: Asia/Shanghai # 管理后台用户名 - MINIO_ROOT_USER: ruoyi + MINIO_ROOT_USER: dk # 管理后台密码，最小8个字符 - MINIO_ROOT_PASSWORD: ruoyi123 + MINIO_ROOT_PASSWORD: 123456 # https需要指定域名 #MINIO_SERVER_URL: "https://xxx.com:9000" #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001" @@ -96,7 +96,7 @@ services: network_mode: "host" seata-server: - image: ruoyi/ruoyi-seata-server:2.2.2 + image: dk/seata-server:2.2.2 container_name: seata-server ports: - "7091:7091" @@ -107,9 +107,9 @@ services: # SEATA_IP: 127.0.0.1 SEATA_PORT: 8091 volumes: - - /docker/ruoyi-seata-server/logs/:/ruoyi/seata-server/logs + - /docker/seata-server/logs/:/dk/seata-server/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" @@ -135,7 +135,7 @@ services: network_mode: "host" sentinel: - image: ruoyi/ruoyi-sentinel-dashboard:2.2.2 + image: dk/sentinel-dashboard:2.2.2 container_name: sentinel environment: TZ: Asia/Shanghai @@ -143,15 +143,14 @@ services: - "8718:8718" volumes: # 配置文件 - - /docker/ruoyi-sentinel-dashboard/logs/:/ruoyi/sentinel-dashboard/logs + - /docker/sentinel-dashboard/logs/:/dk/sentinel-dashboard/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent restart: always network_mode: "host" - - ruoyi-monitor: - image: ruoyi/ruoyi-monitor:2.2.2 - container_name: ruoyi-monitor + monitor: + image: dk/monitor:2.2.2 + container_name: monitor environment: # 时区上海 TZ: Asia/Shanghai @@ -159,15 +158,15 @@ services: - "9100:9100" volumes: # 配置文件 - - /docker/ruoyi-monitor/logs/:/ruoyi/monitor/logs + - /docker/monitor/logs/:/dk/monitor/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-snailjob-server: - image: ruoyi/ruoyi-snailjob-server:2.2.2 - container_name: ruoyi-snailjob-server + snailjob-server: + image: dk/snailjob-server:2.2.2 + container_name: snailjob-server environment: # 时区上海 TZ: Asia/Shanghai @@ -175,13 +174,13 @@ services: - "8800:8800" - "17888:17888" volumes: - - /docker/snailjob/logs/:/ruoyi/snailjob/logs + - /docker/snailjob/logs/:/dk/snailjob/logs privileged: true network_mode: "host" - ruoyi-gateway: - image: ruoyi/ruoyi-gateway:2.2.2 - container_name: ruoyi-gateway + gateway: + image: dk/gateway:2.2.2 + container_name: gateway environment: # 时区上海 TZ: Asia/Shanghai @@ -189,15 +188,15 @@ services: - "8080:8080" volumes: # 配置文件 - - /docker/ruoyi-gateway/logs/:/ruoyi/gateway/logs + - /docker/gateway/logs/:/dk/gateway/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-auth: - image: ruoyi/ruoyi-auth:2.2.2 - container_name: ruoyi-auth + auth: + image: dk/auth:2.2.2 + container_name: auth environment: # 时区上海 TZ: Asia/Shanghai @@ -205,15 +204,15 @@ services: - "9210:9210" volumes: # 配置文件 - - /docker/ruoyi-auth/logs/:/ruoyi/auth/logs + - /docker/auth/logs/:/dk/auth/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-system: - image: ruoyi/ruoyi-system:2.2.2 - container_name: ruoyi-system + system: + image: dk/system:2.2.2 + container_name: system environment: # 时区上海 TZ: Asia/Shanghai @@ -221,15 +220,15 @@ services: - "9201:9201" volumes: # 配置文件 - - /docker/ruoyi-system/logs/:/ruoyi/system/logs + - /docker/system/logs/:/dk/system/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-gen: - image: ruoyi/ruoyi-gen:2.2.2 - container_name: ruoyi-gen + gen: + image: dk/gen:2.2.2 + container_name: gen environment: # 时区上海 TZ: Asia/Shanghai @@ -237,15 +236,15 @@ services: - "9202:9202" volumes: # 配置文件 - - /docker/ruoyi-gen/logs/:/ruoyi/gen/logs + - /docker/gen/logs/:/dk/gen/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-job: - image: ruoyi/ruoyi-job:2.2.2 - container_name: ruoyi-job + job: + image: dk/job:2.2.2 + container_name: job environment: # 时区上海 TZ: Asia/Shanghai @@ -253,15 +252,15 @@ services: - "9203:9203" volumes: # 配置文件 - - /docker/ruoyi-job/logs/:/ruoyi/job/logs + - /docker/job/logs/:/dk/job/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-resource: - image: ruoyi/ruoyi-resource:2.2.2 - container_name: ruoyi-resource + resource: + image: dk/resource:2.2.2 + container_name: resource environment: # 时区上海 TZ: Asia/Shanghai @@ -269,15 +268,15 @@ services: - "9204:9204" volumes: # 配置文件 - - /docker/ruoyi-resource/logs/:/ruoyi/resource/logs + - /docker/resource/logs/:/dk/resource/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" - ruoyi-workflow: - image: ruoyi/ruoyi-workflow:2.2.2 - container_name: ruoyi-workflow + workflow: + image: dk/workflow:2.2.2 + container_name: workflow environment: # 时区上海 TZ: Asia/Shanghai @@ -285,9 +284,9 @@ services: - "9205:9205" volumes: # 配置文件 - - /docker/ruoyi-workflow/logs/:/ruoyi/workflow/logs + - /docker/workflow/logs/:/dk/workflow/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /docker/skywalking/agent/:/dk/skywalking/agent privileged: true network_mode: "host" diff --git a/docker/grafana/grafana.ini b/docker/grafana/grafana.ini index b1e5ac0..6015151 100644 --- a/docker/grafana/grafana.ini +++ b/docker/grafana/grafana.ini @@ -336,7 +336,7 @@ ;enabled = false # specify organization name that should be used for unauthenticated users -;org_name = Main Org. +;org_name = main.java.org.dromara.business.BusinessApplication Org. # specify role for unauthenticated users ;org_role = Viewer diff --git a/sql/wayline_module.sql b/sql/wayline_module.sql new file mode 100644 index 0000000..6bcd288 --- /dev/null +++ b/sql/wayline_module.sql @@ -0,0 +1,71 @@ +/* + Navicat Premium Data Transfer + + Source Server : 8.0 + Source Server Type : MySQL + Source Server Version : 80039 + Source Host : 127.0.0.1:3306 + Source Schema : jeecg-boot + + Target Server Type : MySQL + Target Server Version : 80039 + File Encoding : 65001 + + Date: 15/02/2025 16:05:24 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for wayline_module +-- ---------------------------- +DROP TABLE IF EXISTS `wayline_module`; +CREATE TABLE `wayline_module` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `dept_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门id', + `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门名称', + `platform_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'plough' COMMENT '平台类型', + `platform_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '平台id', + `radius` geomcollection NOT NULL COMMENT '巡查范围', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`, `platform_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wayline_module_handle +-- ---------------------------- +DROP TABLE IF EXISTS `wayline_module_handle`; +CREATE TABLE `wayline_module_handle` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `images` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '图片', + `max_images` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模板图片', + `mate_source_img_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板图片', + `max_mate_source_img_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板图片', + `lng` double NULL DEFAULT NULL COMMENT '经度', + `lat` double NULL DEFAULT NULL COMMENT '纬度', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `wheel_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任务轮id', + `task_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '媒体id', + `dept_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门id', + `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门名称', + `job_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警名称', + `platform_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台类型', + `task_image_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图片id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wayline_splice_tiff +-- ---------------------------- +DROP TABLE IF EXISTS `wayline_splice_tiff`; +CREATE TABLE `wayline_splice_tiff` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '任务id', + `file_id` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '航线id', + `path_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '图片地址', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1;