diff --git a/Dockerfile b/Dockerfile index 8270c90..27781d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ COPY update-service/pom.xml ./update-service/pom.xml COPY demo-service/pom.xml ./demo-service/pom.xml COPY file-service/pom.xml ./file-service/pom.xml COPY license-service/pom.xml ./license-service/pom.xml -COPY xuqm-log-service/pom.xml ./xuqm-log-service/pom.xml +COPY xuqm-bugcollect-service/pom.xml ./xuqm-bugcollect-service/pom.xml # Pre-download dependencies using BuildKit cache mount — persisted across builds RUN --mount=type=cache,target=/root/.m2 \ @@ -34,7 +34,7 @@ COPY update-service ./update-service COPY demo-service ./demo-service COPY file-service ./file-service COPY license-service ./license-service -COPY xuqm-log-service ./xuqm-log-service +COPY xuqm-bugcollect-service ./xuqm-bugcollect-service RUN --mount=type=cache,target=/root/.m2 \ mvn -s /workspace/maven-settings.xml -pl ${SERVICE_MODULE} -am -DskipTests package diff --git a/Jenkinsfile b/Jenkinsfile index 6110c01..33925d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { parameters { choice( name: 'SERVICE', - choices: ['all', 'tenant-service', 'im-service', 'push-service', 'update-service', 'file-service', 'license-service', 'demo-service', 'xuqm-log-service'], + choices: ['all', 'tenant-service', 'im-service', 'push-service', 'update-service', 'file-service', 'license-service', 'demo-service', 'xuqm-bugcollect-service'], description: '要构建的服务模块（all = 全部，每个服务独立版本号）' ) } @@ -41,7 +41,7 @@ pipeline { stage('Resolve Versions') { steps { script { - def allServices = ['tenant-service', 'im-service', 'push-service', 'update-service', 'file-service', 'license-service', 'demo-service', 'xuqm-log-service'] + def allServices = ['tenant-service', 'im-service', 'push-service', 'update-service', 'file-service', 'license-service', 'demo-service', 'xuqm-bugcollect-service'] // 支持从 job 名自动推断服务（如 xuqmgroup-update-service → update-service） def jobService = env.JOB_NAME.tokenize('/').last() @@ -118,7 +118,7 @@ pipeline { // 合并更新 versions.json（只改动本次构建涉及的服务，不覆盖其它服务或 web 条目） def releasedAt = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone('UTC')) def builtJson = groovy.json.JsonOutput.toJson(serviceVersions) - def allSvcsList = groovy.json.JsonOutput.toJson(['tenant-service', 'im-service', 'push-service', 'update-service', 'file-service', 'license-service', 'demo-service', 'xuqm-log-service']) + def allSvcsList = groovy.json.JsonOutput.toJson(['tenant-service', 'im-service', 'push-service', 'update-service', 'file-service', 'license-service', 'demo-service', 'xuqm-bugcollect-service']) def updateScript = """\ import json, os path = '${env.VERSIONS_FILE}' diff --git a/VERSION.xuqm-log-service b/VERSION.xuqm-bugcollect-service similarity index 100% rename from VERSION.xuqm-log-service rename to VERSION.xuqm-bugcollect-service diff --git a/pom.xml b/pom.xml index eacfc9a..17d4265 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ demo-service file-service license-service - xuqm-log-service + xuqm-bugcollect-service diff --git a/xuqm-log-service/pom.xml b/xuqm-bugcollect-service/pom.xml similarity index 94% rename from xuqm-log-service/pom.xml rename to xuqm-bugcollect-service/pom.xml index 07837b5..8513b77 100644 --- a/xuqm-log-service/pom.xml +++ b/xuqm-bugcollect-service/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - xuqm-log-service - xuqm-log-service - Log collection, dedup, symbolication, webhook notification & funnel analytics + xuqm-bugcollect-service + xuqm-bugcollect-service + Bug collection, dedup, symbolication, webhook notification & funnel analytics diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/LogServiceApplication.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/LogServiceApplication.java similarity index 80% rename from xuqm-log-service/src/main/java/com/xuqm/log/LogServiceApplication.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/LogServiceApplication.java index 48ce01e..9e16ff0 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/LogServiceApplication.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/LogServiceApplication.java @@ -1,4 +1,4 @@ -package com.xuqm.log; +package com.xuqm.bugcollect; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication -@ComponentScan(basePackages = {"com.xuqm.log", "com.xuqm.common"}) +@ComponentScan(basePackages = {"com.xuqm.bugcollect", "com.xuqm.common"}) @EnableAsync public class LogServiceApplication { public static void main(String[] args) { diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/config/SecurityConfig.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/config/SecurityConfig.java similarity index 90% rename from xuqm-log-service/src/main/java/com/xuqm/log/config/SecurityConfig.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/config/SecurityConfig.java index 141346f..b4c8a5f 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/config/SecurityConfig.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.xuqm.log.config; +package com.xuqm.bugcollect.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class SecurityConfig { .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(auth -> auth .requestMatchers("/actuator/**").permitAll() - .requestMatchers("/log/**").permitAll() + .requestMatchers("/bugcollect/**").permitAll() .anyRequest().permitAll() ); return http.build(); diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/controller/GlobalExceptionHandler.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/controller/GlobalExceptionHandler.java similarity index 99% rename from xuqm-log-service/src/main/java/com/xuqm/log/controller/GlobalExceptionHandler.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/controller/GlobalExceptionHandler.java index b2da956..81a9526 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/controller/GlobalExceptionHandler.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/controller/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.xuqm.log.controller; +package com.xuqm.bugcollect.controller; import com.xuqm.common.exception.BusinessException; import com.xuqm.common.model.ApiResponse; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/controller/LogController.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/controller/LogController.java similarity index 95% rename from xuqm-log-service/src/main/java/com/xuqm/log/controller/LogController.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/controller/LogController.java index c558bdb..72e519e 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/controller/LogController.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/controller/LogController.java @@ -1,11 +1,11 @@ -package com.xuqm.log.controller; +package com.xuqm.bugcollect.controller; import com.xuqm.common.model.ApiResponse; import com.xuqm.common.model.PageResult; -import com.xuqm.log.dto.*; -import com.xuqm.log.service.LogService; -import com.xuqm.log.service.SourcemapService; -import com.xuqm.log.service.WebhookService; +import com.xuqm.bugcollect.dto.*; +import com.xuqm.bugcollect.service.LogService; +import com.xuqm.bugcollect.service.SourcemapService; +import com.xuqm.bugcollect.service.WebhookService; import jakarta.validation.Valid; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.*; @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.List; @RestController -@RequestMapping("/log/v1") +@RequestMapping("/bugcollect/v1") public class LogController { private final LogService logService; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/EventBatchRequest.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/EventBatchRequest.java similarity index 95% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/EventBatchRequest.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/EventBatchRequest.java index 48f3f16..bb411e2 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/EventBatchRequest.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/EventBatchRequest.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/FunnelResponse.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/FunnelResponse.java similarity index 81% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/FunnelResponse.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/FunnelResponse.java index e71c1dc..6d84b57 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/FunnelResponse.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/FunnelResponse.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import java.util.List; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueBatchRequest.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueBatchRequest.java similarity index 95% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueBatchRequest.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueBatchRequest.java index ba2abd2..9bedaaa 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueBatchRequest.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueBatchRequest.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueEventResponse.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueEventResponse.java similarity index 94% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueEventResponse.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueEventResponse.java index 40c404e..df978c1 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueEventResponse.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueEventResponse.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueResponse.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueResponse.java similarity index 94% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueResponse.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueResponse.java index 8cecdce..db91738 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/IssueResponse.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/IssueResponse.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/OverviewResponse.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/OverviewResponse.java similarity index 93% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/OverviewResponse.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/OverviewResponse.java index cebacf8..8f5b528 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/OverviewResponse.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/OverviewResponse.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/SourcemapUploadResponse.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/SourcemapUploadResponse.java similarity index 91% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/SourcemapUploadResponse.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/SourcemapUploadResponse.java index 4cc4e5d..6303945 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/SourcemapUploadResponse.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/SourcemapUploadResponse.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/WebhookRequest.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/WebhookRequest.java similarity index 92% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/WebhookRequest.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/WebhookRequest.java index ff0f893..cd51d60 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/WebhookRequest.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/WebhookRequest.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/dto/WebhookResponse.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/WebhookResponse.java similarity index 92% rename from xuqm-log-service/src/main/java/com/xuqm/log/dto/WebhookResponse.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/WebhookResponse.java index 9c9fdf4..19986ce 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/dto/WebhookResponse.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/dto/WebhookResponse.java @@ -1,4 +1,4 @@ -package com.xuqm.log.dto; +package com.xuqm.bugcollect.dto; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogEventEntity.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogEventEntity.java similarity index 98% rename from xuqm-log-service/src/main/java/com/xuqm/log/entity/LogEventEntity.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogEventEntity.java index f9e85f9..bdff55a 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogEventEntity.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogEventEntity.java @@ -1,4 +1,4 @@ -package com.xuqm.log.entity; +package com.xuqm.bugcollect.entity; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogIssueEntity.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogIssueEntity.java similarity index 98% rename from xuqm-log-service/src/main/java/com/xuqm/log/entity/LogIssueEntity.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogIssueEntity.java index 75cadcd..c80951a 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogIssueEntity.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogIssueEntity.java @@ -1,4 +1,4 @@ -package com.xuqm.log.entity; +package com.xuqm.bugcollect.entity; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogIssueEventEntity.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogIssueEventEntity.java similarity index 98% rename from xuqm-log-service/src/main/java/com/xuqm/log/entity/LogIssueEventEntity.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogIssueEventEntity.java index 41cbdc4..25fde7c 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogIssueEventEntity.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogIssueEventEntity.java @@ -1,4 +1,4 @@ -package com.xuqm.log.entity; +package com.xuqm.bugcollect.entity; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogSourcemapEntity.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogSourcemapEntity.java similarity index 97% rename from xuqm-log-service/src/main/java/com/xuqm/log/entity/LogSourcemapEntity.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogSourcemapEntity.java index 4aea61d..d49bfdd 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogSourcemapEntity.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogSourcemapEntity.java @@ -1,4 +1,4 @@ -package com.xuqm.log.entity; +package com.xuqm.bugcollect.entity; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogWebhookEntity.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogWebhookEntity.java similarity index 97% rename from xuqm-log-service/src/main/java/com/xuqm/log/entity/LogWebhookEntity.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogWebhookEntity.java index f2e6475..84a7f17 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/entity/LogWebhookEntity.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/entity/LogWebhookEntity.java @@ -1,4 +1,4 @@ -package com.xuqm.log.entity; +package com.xuqm.bugcollect.entity; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogEventRepository.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogEventRepository.java similarity index 95% rename from xuqm-log-service/src/main/java/com/xuqm/log/repository/LogEventRepository.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogEventRepository.java index 46dc2ea..1ebc47c 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogEventRepository.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogEventRepository.java @@ -1,6 +1,6 @@ -package com.xuqm.log.repository; +package com.xuqm.bugcollect.repository; -import com.xuqm.log.entity.LogEventEntity; +import com.xuqm.bugcollect.entity.LogEventEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogIssueEventRepository.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogIssueEventRepository.java similarity index 86% rename from xuqm-log-service/src/main/java/com/xuqm/log/repository/LogIssueEventRepository.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogIssueEventRepository.java index d40ce56..6e271fd 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogIssueEventRepository.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogIssueEventRepository.java @@ -1,6 +1,6 @@ -package com.xuqm.log.repository; +package com.xuqm.bugcollect.repository; -import com.xuqm.log.entity.LogIssueEventEntity; +import com.xuqm.bugcollect.entity.LogIssueEventEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogIssueRepository.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogIssueRepository.java similarity index 96% rename from xuqm-log-service/src/main/java/com/xuqm/log/repository/LogIssueRepository.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogIssueRepository.java index f21be73..de48322 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogIssueRepository.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogIssueRepository.java @@ -1,6 +1,6 @@ -package com.xuqm.log.repository; +package com.xuqm.bugcollect.repository; -import com.xuqm.log.entity.LogIssueEntity; +import com.xuqm.bugcollect.entity.LogIssueEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogSourcemapRepository.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogSourcemapRepository.java similarity index 80% rename from xuqm-log-service/src/main/java/com/xuqm/log/repository/LogSourcemapRepository.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogSourcemapRepository.java index 353b76a..4fffcaa 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogSourcemapRepository.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogSourcemapRepository.java @@ -1,6 +1,6 @@ -package com.xuqm.log.repository; +package com.xuqm.bugcollect.repository; -import com.xuqm.log.entity.LogSourcemapEntity; +import com.xuqm.bugcollect.entity.LogSourcemapEntity; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogWebhookRepository.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogWebhookRepository.java similarity index 78% rename from xuqm-log-service/src/main/java/com/xuqm/log/repository/LogWebhookRepository.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogWebhookRepository.java index 8c97971..3724e46 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/repository/LogWebhookRepository.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/repository/LogWebhookRepository.java @@ -1,6 +1,6 @@ -package com.xuqm.log.repository; +package com.xuqm.bugcollect.repository; -import com.xuqm.log.entity.LogWebhookEntity; +import com.xuqm.bugcollect.entity.LogWebhookEntity; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/service/LogService.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/LogService.java similarity index 98% rename from xuqm-log-service/src/main/java/com/xuqm/log/service/LogService.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/LogService.java index 080ee33..fa55e3e 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/service/LogService.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/LogService.java @@ -1,10 +1,10 @@ -package com.xuqm.log.service; +package com.xuqm.bugcollect.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xuqm.log.dto.*; -import com.xuqm.log.entity.*; -import com.xuqm.log.repository.*; +import com.xuqm.bugcollect.dto.*; +import com.xuqm.bugcollect.entity.*; +import com.xuqm.bugcollect.repository.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Page; diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/service/SourcemapService.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/SourcemapService.java similarity index 90% rename from xuqm-log-service/src/main/java/com/xuqm/log/service/SourcemapService.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/SourcemapService.java index 0673b56..609590a 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/service/SourcemapService.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/SourcemapService.java @@ -1,8 +1,8 @@ -package com.xuqm.log.service; +package com.xuqm.bugcollect.service; -import com.xuqm.log.dto.SourcemapUploadResponse; -import com.xuqm.log.entity.LogSourcemapEntity; -import com.xuqm.log.repository.LogSourcemapRepository; +import com.xuqm.bugcollect.dto.SourcemapUploadResponse; +import com.xuqm.bugcollect.entity.LogSourcemapEntity; +import com.xuqm.bugcollect.repository.LogSourcemapRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -23,7 +23,7 @@ public class SourcemapService { private final LogSourcemapRepository sourcemapRepository; - @Value("${log-service.sourcemap.storage-dir:/data/log-service/sourcemaps}") + @Value("${bugcollect-service.sourcemap.storage-dir:/data/bugcollect-service/sourcemaps}") private String storageDir; public SourcemapService(LogSourcemapRepository sourcemapRepository) { diff --git a/xuqm-log-service/src/main/java/com/xuqm/log/service/WebhookService.java b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/WebhookService.java similarity index 95% rename from xuqm-log-service/src/main/java/com/xuqm/log/service/WebhookService.java rename to xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/WebhookService.java index c25a017..5f73c78 100644 --- a/xuqm-log-service/src/main/java/com/xuqm/log/service/WebhookService.java +++ b/xuqm-bugcollect-service/src/main/java/com/xuqm/bugcollect/service/WebhookService.java @@ -1,11 +1,11 @@ -package com.xuqm.log.service; +package com.xuqm.bugcollect.service; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xuqm.log.dto.WebhookRequest; -import com.xuqm.log.dto.WebhookResponse; -import com.xuqm.log.entity.LogIssueEntity; -import com.xuqm.log.entity.LogWebhookEntity; -import com.xuqm.log.repository.LogWebhookRepository; +import com.xuqm.bugcollect.dto.WebhookRequest; +import com.xuqm.bugcollect.dto.WebhookResponse; +import com.xuqm.bugcollect.entity.LogIssueEntity; +import com.xuqm.bugcollect.entity.LogWebhookEntity; +import com.xuqm.bugcollect.repository.LogWebhookRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/xuqm-log-service/src/main/resources/application.yml b/xuqm-bugcollect-service/src/main/resources/application.yml similarity index 81% rename from xuqm-log-service/src/main/resources/application.yml rename to xuqm-bugcollect-service/src/main/resources/application.yml index 07ddc97..a6801fb 100644 --- a/xuqm-log-service/src/main/resources/application.yml +++ b/xuqm-bugcollect-service/src/main/resources/application.yml @@ -3,9 +3,9 @@ server: spring: application: - name: xuqm-log-service + name: xuqm-bugcollect-service datasource: - url: jdbc:mysql://39.107.53.187:3306/xuqm_log?useUnicode=true&characterEncoding=utf8&useSSL=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://39.107.53.187:3306/xuqm_bugcollect?useUnicode=true&characterEncoding=utf8&useSSL=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: xuqm password: Xuqm@2026 driver-class-name: com.mysql.cj.jdbc.Driver @@ -50,9 +50,9 @@ spring: max-file-size: 50MB max-request-size: 50MB -log-service: +bugcollect-service: sourcemap: - storage-dir: ${LOG_SOURCEMAP_DIR:/data/log-service/sourcemaps} + storage-dir: ${LOG_SOURCEMAP_DIR:/data/bugcollect-service/sourcemaps} webhook: connect-timeout-ms: 3000 read-timeout-ms: 5000 diff --git a/xuqm-log-service/src/main/resources/db/migration/V1__init.sql b/xuqm-bugcollect-service/src/main/resources/db/migration/V1__init.sql similarity index 100% rename from xuqm-log-service/src/main/resources/db/migration/V1__init.sql rename to xuqm-bugcollect-service/src/main/resources/db/migration/V1__init.sql