From 077bf0dc2a765439658cccc0d324f175fab9f71a Mon Sep 17 00:00:00 2001 From: caathead <155051876@qq.com> Date: Sun, 2 Mar 2025 17:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/log/log_error.log | 1 + data/log/log_info.log | 12 +++ docs/dev-ops/docker-compose.yml | 20 ++--- .../dev-ops/mysql/sql/xfg-frame-archetype.sql | 90 ++++++++++++++++++- 4 files changed, 112 insertions(+), 11 deletions(-) create mode 100644 data/log/log_error.log create mode 100644 data/log/log_info.log diff --git a/data/log/log_error.log b/data/log/log_error.log new file mode 100644 index 0000000..08f264e --- /dev/null +++ b/data/log/log_error.log @@ -0,0 +1 @@ +25-03-02.16:13:59.293 [main ] WARN ClassPathMapperScanner - No MyBatis mapper was found in '[cn.bugstack]' package. Please check your configuration. diff --git a/data/log/log_info.log b/data/log/log_info.log new file mode 100644 index 0000000..a9291ad --- /dev/null +++ b/data/log/log_info.log @@ -0,0 +1,12 @@ +25-03-02.16:13:58.762 [main ] INFO Application - Starting Application using Java 17.0.10 on xruicc with PID 27904 (D:\MarketingIntegrationSystem\xfg-frame-archetype-lite-app\target\classes started by 15505 in D:\MarketingIntegrationSystem) +25-03-02.16:13:58.765 [main ] INFO Application - The following 1 profile is active: "dev" +25-03-02.16:13:59.293 [main ] WARN ClassPathMapperScanner - No MyBatis mapper was found in '[cn.bugstack]' package. Please check your configuration. +25-03-02.16:13:59.658 [main ] INFO TomcatWebServer - Tomcat initialized with port(s): 8091 (http) +25-03-02.16:13:59.666 [main ] INFO Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8091"] +25-03-02.16:13:59.666 [main ] INFO StandardService - Starting service [Tomcat] +25-03-02.16:13:59.666 [main ] INFO StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.75] +25-03-02.16:13:59.779 [main ] INFO [/] - Initializing Spring embedded WebApplicationContext +25-03-02.16:13:59.780 [main ] INFO ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 972 ms +25-03-02.16:14:00.181 [main ] INFO Http11NioProtocol - Starting ProtocolHandler ["http-nio-8091"] +25-03-02.16:14:00.202 [main ] INFO TomcatWebServer - Tomcat started on port(s): 8091 (http) with context path '' +25-03-02.16:14:00.210 [main ] INFO Application - Started Application in 1.873 seconds (JVM running for 2.651) diff --git a/docs/dev-ops/docker-compose.yml b/docs/dev-ops/docker-compose.yml index 7bcafd0..b9aa41f 100644 --- a/docs/dev-ops/docker-compose.yml +++ b/docs/dev-ops/docker-compose.yml @@ -1,5 +1,7 @@ # 命令执行 docker-compose -f docker-compose.yml up -d version: '3.9' +volumes: + mysql-data: # 定义 named volume services: mysql: image: mysql:8.0.32 @@ -14,11 +16,10 @@ services: MYSQL_PASSWORD: 123456 networks: - my-network - depends_on: - - mysql-job-dbdata ports: - "13306:3306" volumes: + - mysql-data:/var/lib/mysql # 使用 named volume 进行持久化 - ./mysql/sql:/docker-entrypoint-initdb.d healthcheck: test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] @@ -31,15 +32,14 @@ services: limits: cpus: '1.00' memory: 512M - volumes_from: - - mysql-job-dbdata - # 自动加载数据 - mysql-job-dbdata: - image: alpine:3.18.2 - container_name: mysql-job-dbdata - volumes: - - /var/lib/mysql + +# # 自动加载数据 +# mysql-job-dbdata: +# image: alpine:3.18.2 +# container_name: mysql-job-dbdata +# volumes: +# - /var/lib/mysql # phpmyadmin https://hub.docker.com/_/phpmyadmin phpmyadmin: diff --git a/docs/dev-ops/mysql/sql/xfg-frame-archetype.sql b/docs/dev-ops/mysql/sql/xfg-frame-archetype.sql index 8b598d3..3ad951a 100644 --- a/docs/dev-ops/mysql/sql/xfg-frame-archetype.sql +++ b/docs/dev-ops/mysql/sql/xfg-frame-archetype.sql @@ -105,4 +105,92 @@ CREATE TABLE `employee_salary_adjust` ( BEGIN; INSERT INTO `employee_salary_adjust` VALUES (1, '10000001', '109089990198888811', 1000.00, 800.00, 200.00, '2023-07-14 16:55:53', '2023-07-14 16:55:53'); INSERT INTO `employee_salary_adjust` VALUES (2, '10000001', '100908977676001', 100.00, 20.00, 80.00, '2023-07-14 21:57:39', '2023-07-14 21:57:39'); -COMMIT; \ No newline at end of file +COMMIT; + +CREATE database if NOT EXISTS `big_market` default character set utf8mb4 collate utf8mb4_0900_ai_ci; +use `big_market`; +CREATE TABLE `strategy` ( + `id` bigint(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID', + `strategy_id` bigint(8) NOT NULL COMMENT '抽奖策略ID', + `strategy_desc` varchar(128) NOT NULL COMMENT '抽奖策略描述', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `idx_strategy_id` (`strategy_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +LOCK TABLES `strategy` WRITE; +/*!40000 ALTER TABLE `strategy` DISABLE KEYS */; + +INSERT INTO `strategy` (`id`, `strategy_id`, `strategy_desc`, `create_time`, `update_time`) +VALUES + (1,100001,'抽奖策略','2023-12-09 09:37:19','2023-12-09 09:37:19'); +UNLOCK TABLES; + +CREATE TABLE `strategy_award` ( + `id` bigint(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID', + `strategy_id` bigint(8) NOT NULL COMMENT '抽奖策略ID', + `award_id` int(8) NOT NULL COMMENT '抽奖奖品ID - 内部流转使用', + `award_title` varchar(128) NOT NULL COMMENT '抽奖奖品标题', + `award_subtitle` varchar(128) DEFAULT NULL COMMENT '抽奖奖品副标题', + `award_count` int(8) NOT NULL DEFAULT '0' COMMENT '奖品库存总量', + `award_count_surplus` int(8) NOT NULL DEFAULT '0' COMMENT '奖品库存剩余', + `award_rate` decimal(6,4) NOT NULL COMMENT '奖品中奖概率', + `rule_models` varchar(256) DEFAULT NULL COMMENT '规则模型，rule配置的模型同步到此表，便于使用', + `sort` int(2) NOT NULL DEFAULT '0' COMMENT '排序', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + KEY `idx_strategy_id_award_id` (`strategy_id`,`award_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +LOCK TABLES `strategy_award` WRITE; +/*!40000 ALTER TABLE `strategy_award` DISABLE KEYS */; + +INSERT INTO `strategy_award` (`id`, `strategy_id`, `award_id`, `award_title`, `award_subtitle`, `award_count`, `award_count_surplus`, `award_rate`, `rule_models`, `sort`, `create_time`, `update_time`) +VALUES + (1,100001,101,'随机积分',NULL,80000,80000,80.0000,'rule_random,rule_luck_award',1,'2023-12-09 09:38:31','2023-12-09 10:58:06'), + (2,100001,102,'5次使用',NULL,10000,10000,10.0000,'rule_luck_award',2,'2023-12-09 09:39:18','2023-12-09 10:34:23'), + (3,100001,103,'10次使用',NULL,5000,5000,5.0000,'rule_luck_award',3,'2023-12-09 09:42:36','2023-12-09 10:34:24'), + (4,100001,104,'20次使用',NULL,4000,4000,4.0000,'rule_luck_award',4,'2023-12-09 09:43:15','2023-12-09 10:34:25'), + (5,100001,105,'增加gpt-4对话模型',NULL,600,600,0.6000,'rule_luck_award',5,'2023-12-09 09:43:47','2023-12-09 10:34:26'), + (6,100001,106,'增加dall-e-2画图模型',NULL,200,200,0.2000,'rule_luck_award',6,'2023-12-09 09:44:20','2023-12-09 10:34:26'), + (7,100001,107,'增加dall-e-3画图模型','抽奖1次后解锁',200,200,0.2000,'rule_lock,rule_luck_award',7,'2023-12-09 09:45:38','2023-12-09 10:30:59'), + (8,100001,108,'增加100次使用','抽奖2次后解锁',199,199,0.1999,'rule_lock,rule_luck_award',8,'2023-12-09 09:46:02','2023-12-09 12:20:52'), + (9,100001,109,'解锁全部模型','抽奖6次后解锁',1,1,0.0001,'rule_lock,rule_luck_award',9,'2023-12-09 09:46:39','2023-12-09 12:20:50'); +UNLOCK TABLES; + +CREATE TABLE `strategy_rule` ( + `id` bigint(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增ID', + `strategy_id` int(8) NOT NULL COMMENT '抽奖策略ID', + `award_id` int(8) DEFAULT NULL COMMENT '抽奖奖品ID【规则类型为策略，则不需要奖品ID】', + `rule_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '抽象规则类型；1-策略规则、2-奖品规则', + `rule_model` varchar(16) NOT NULL COMMENT '抽奖规则类型【rule_random - 随机值计算、rule_lock - 抽奖几次后解锁、rule_luck_award - 幸运奖(兜底奖品)】', + `rule_value` varchar(64) NOT NULL COMMENT '抽奖规则比值', + `rule_desc` varchar(128) NOT NULL COMMENT '抽奖规则描述', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `idx_strategy_id_award_id` (`strategy_id`,`award_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +LOCK TABLES `strategy_rule` WRITE; +/*!40000 ALTER TABLE `strategy_rule` DISABLE KEYS */; + +INSERT INTO `strategy_rule` (`id`, `strategy_id`, `award_id`, `rule_type`, `rule_model`, `rule_value`, `rule_desc`, `create_time`, `update_time`) +VALUES + (1,100001,101,2,'rule_random','1,1000','随机积分策略','2023-12-09 10:05:30','2023-12-09 12:55:52'), + (2,100001,107,2,'rule_lock','1','抽奖1次后解锁','2023-12-09 10:16:41','2023-12-09 12:55:53'), + (3,100001,108,2,'rule_lock','2','抽奖2次后解锁','2023-12-09 10:17:43','2023-12-09 12:55:54'), + (4,100001,109,2,'rule_lock','6','抽奖6次后解锁','2023-12-09 10:17:43','2023-12-09 12:55:54'), + (5,100001,107,2,'rule_luck_award','1,100','兜底奖品100以内随机积分','2023-12-09 10:30:12','2023-12-09 12:55:55'), + (6,100001,108,2,'rule_luck_award','1,100','兜底奖品100以内随机积分','2023-12-09 10:30:43','2023-12-09 12:55:56'), + (7,100001,101,2,'rule_luck_award','1,10','兜底奖品10以内随机积分','2023-12-09 10:30:43','2023-12-09 12:55:57'), + (8,100001,102,2,'rule_luck_award','1,20','兜底奖品20以内随机积分','2023-12-09 10:30:43','2023-12-09 12:55:57'), + (9,100001,103,2,'rule_luck_award','1,30','兜底奖品30以内随机积分','2023-12-09 10:30:43','2023-12-09 12:55:58'), + (10,100001,104,2,'rule_luck_award','1,40','兜底奖品40以内随机积分','2023-12-09 10:30:43','2023-12-09 12:55:59'), + (11,100001,105,2,'rule_luck_award','1,50','兜底奖品50以内随机积分','2023-12-09 10:30:43','2023-12-09 12:56:00'), + (12,100001,106,2,'rule_luck_award','1,60','兜底奖品60以内随机积分','2023-12-09 10:30:43','2023-12-09 12:56:00'), + (13,100001,NULL,1,'rule_weight','6000,102,103,104,105,106,107,108,109','消耗6000分，必中奖范围','2023-12-09 10:30:43','2023-12-09 12:58:21'), + (14,100001,NULL,1,'rule_blacklist','1','黑名单抽奖，积分兜底','2023-12-09 12:59:45','2023-12-09 13:42:23'); +UNLOCK TABLES; \ No newline at end of file -- GitLab