diff --git a/leopard-core/pom.xml b/leopard-core/pom.xml index 0dfe9d4..e657099 100644 --- a/leopard-core/pom.xml +++ b/leopard-core/pom.xml @@ -20,10 +20,18 @@ org.springframework.boot spring-boot-starter-data-jpa + + org.springframework.boot + spring-boot-starter-json + cn.hutool hutool-core + + cn.hutool + hutool-http + io.github.ralfkonrad.quantlib_for_maven diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/helper/NumberHelper.java similarity index 97% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/helper/NumberHelper.java index f4687f8..9a30909 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/helper/NumberHelper.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.helper; +package com.lanyuanxiaoyao.leopard.core.helper; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockCollectionService.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockCollectionService.java similarity index 90% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockCollectionService.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockCollectionService.java index c5e012b..d9e1709 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockCollectionService.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockCollectionService.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.service; +package com.lanyuanxiaoyao.leopard.core.service; import com.lanyuanxiaoyao.leopard.core.entity.StockCollection; import com.lanyuanxiaoyao.leopard.core.repository.StockCollectionRepository; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockService.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockService.java similarity index 97% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockService.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockService.java index 899d4a7..e6b19dd 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockService.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockService.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.service; +package com.lanyuanxiaoyao.leopard.core.service; import com.lanyuanxiaoyao.leopard.core.entity.Daily; import com.lanyuanxiaoyao.leopard.core.entity.Daily_; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/TaskService.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TaskService.java similarity index 86% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/TaskService.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TaskService.java index f641387..d0e5232 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/TaskService.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TaskService.java @@ -1,15 +1,15 @@ -package com.lanyuanxiaoyao.leopard.server.service; +package com.lanyuanxiaoyao.leopard.core.service; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.lanyuanxiaoyao.leopard.core.entity.Task; import com.lanyuanxiaoyao.leopard.core.repository.TaskRepository; -import com.lanyuanxiaoyao.leopard.server.service.task.PyramidSelect; -import com.lanyuanxiaoyao.leopard.server.service.task.TaskRunner; -import com.lanyuanxiaoyao.leopard.server.service.task.UpdateDailyTask; -import com.lanyuanxiaoyao.leopard.server.service.task.UpdateFinanceIndicatorTask; -import com.lanyuanxiaoyao.leopard.server.service.task.UpdateStockTask; -import com.lanyuanxiaoyao.leopard.server.service.task.UpdateYearlyTask; +import com.lanyuanxiaoyao.leopard.core.task.PyramidSelect; +import com.lanyuanxiaoyao.leopard.core.task.TaskRunner; +import com.lanyuanxiaoyao.leopard.core.task.UpdateDailyTask; +import com.lanyuanxiaoyao.leopard.core.task.UpdateFinanceIndicatorTask; +import com.lanyuanxiaoyao.leopard.core.task.UpdateStockTask; +import com.lanyuanxiaoyao.leopard.core.task.UpdateYearlyTask; import com.lanyuanxiaoyao.service.template.service.SimpleServiceSupport; import jakarta.transaction.Transactional; import java.util.Map; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/TuShareService.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TuShareService.java similarity index 98% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/TuShareService.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TuShareService.java index 73d4212..c9d9079 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/TuShareService.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TuShareService.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.service; +package com.lanyuanxiaoyao.leopard.core.service; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/PyramidSelect.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/PyramidSelect.java similarity index 96% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/PyramidSelect.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/PyramidSelect.java index f5627f6..312bee8 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/PyramidSelect.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/PyramidSelect.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.service.task; +package com.lanyuanxiaoyao.leopard.core.task; import com.lanyuanxiaoyao.leopard.core.entity.StockCollection; import com.lanyuanxiaoyao.leopard.core.repository.StockCollectionRepository; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/TaskRunner.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/TaskRunner.java similarity index 94% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/TaskRunner.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/TaskRunner.java index 1dbdfec..3f56758 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/TaskRunner.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/TaskRunner.java @@ -1,11 +1,11 @@ -package com.lanyuanxiaoyao.leopard.server.service.task; +package com.lanyuanxiaoyao.leopard.core.task; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.leopard.core.entity.Task; import com.lanyuanxiaoyao.leopard.core.repository.TaskRepository; -import com.lanyuanxiaoyao.leopard.server.service.TaskService; +import com.lanyuanxiaoyao.leopard.core.service.TaskService; import java.time.LocalDateTime; import java.util.Map; import lombok.extern.slf4j.Slf4j; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyTask.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateDailyTask.java similarity index 95% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyTask.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateDailyTask.java index 958968d..47116f7 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyTask.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateDailyTask.java @@ -1,14 +1,14 @@ -package com.lanyuanxiaoyao.leopard.server.service.task; +package com.lanyuanxiaoyao.leopard.core.task; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.leopard.core.entity.Daily; import com.lanyuanxiaoyao.leopard.core.entity.Stock; +import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper; import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository; import com.lanyuanxiaoyao.leopard.core.repository.StockRepository; -import com.lanyuanxiaoyao.leopard.server.helper.NumberHelper; -import com.lanyuanxiaoyao.leopard.server.service.TuShareService; +import com.lanyuanxiaoyao.leopard.core.service.TuShareService; import java.time.LocalDate; import java.util.ArrayList; import java.util.HashMap; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateFinanceIndicatorTask.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateFinanceIndicatorTask.java similarity index 98% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateFinanceIndicatorTask.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateFinanceIndicatorTask.java index 9e81e7b..cbcb9d2 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateFinanceIndicatorTask.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateFinanceIndicatorTask.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.service.task; +package com.lanyuanxiaoyao.leopard.core.task; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.lanyuanxiaoyao.leopard.core.entity.FinanceIndicator; import com.lanyuanxiaoyao.leopard.core.entity.QFinanceIndicator; import com.lanyuanxiaoyao.leopard.core.entity.Stock; +import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper; import com.lanyuanxiaoyao.leopard.core.repository.FinanceIndicatorRepository; import com.lanyuanxiaoyao.leopard.core.repository.StockRepository; -import com.lanyuanxiaoyao.leopard.server.helper.NumberHelper; -import com.lanyuanxiaoyao.leopard.server.service.TuShareService; +import com.lanyuanxiaoyao.leopard.core.service.TuShareService; import java.time.LocalDate; import java.util.List; import java.util.Map; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateStockTask.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateStockTask.java similarity index 94% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateStockTask.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateStockTask.java index 2db3359..af7cc91 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateStockTask.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateStockTask.java @@ -1,9 +1,9 @@ -package com.lanyuanxiaoyao.leopard.server.service.task; +package com.lanyuanxiaoyao.leopard.core.task; import cn.hutool.core.util.EnumUtil; import com.lanyuanxiaoyao.leopard.core.entity.Stock; import com.lanyuanxiaoyao.leopard.core.repository.StockRepository; -import com.lanyuanxiaoyao.leopard.server.service.TuShareService; +import com.lanyuanxiaoyao.leopard.core.service.TuShareService; import java.time.LocalDate; import java.util.Map; import java.util.stream.Collectors; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateYearlyTask.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateYearlyTask.java similarity index 98% rename from leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateYearlyTask.java rename to leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateYearlyTask.java index 04155c8..120ec47 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateYearlyTask.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateYearlyTask.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.leopard.server.service.task; +package com.lanyuanxiaoyao.leopard.core.task; import com.lanyuanxiaoyao.leopard.core.entity.Daily; import com.lanyuanxiaoyao.leopard.core.entity.QDaily; diff --git a/leopard-server/pom.xml b/leopard-server/pom.xml index 2379018..3eae2c1 100644 --- a/leopard-server/pom.xml +++ b/leopard-server/pom.xml @@ -41,24 +41,6 @@ spring-boot-starter-quartz - - cn.hutool - hutool-core - - - cn.hutool - hutool-http - - - - io.github.ralfkonrad.quantlib_for_maven - quantlib - - - org.ta4j - ta4j-core - - com.mysql mysql-connector-j diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/CommonOptionsController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/CommonOptionsController.java index 74767dc..04b6d3e 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/CommonOptionsController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/CommonOptionsController.java @@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.leopard.server.controller; import com.lanyuanxiaoyao.leopard.core.entity.Stock; import com.lanyuanxiaoyao.leopard.core.entity.Task; import com.lanyuanxiaoyao.leopard.core.repository.StockRepository; -import com.lanyuanxiaoyao.leopard.server.service.TaskService; +import com.lanyuanxiaoyao.leopard.core.service.TaskService; import com.lanyuanxiaoyao.service.template.controller.GlobalResponse; import java.util.Arrays; import java.util.Comparator; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/QuartzController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/QuartzController.java index 8c6cca1..ef2cc36 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/QuartzController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/QuartzController.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.leopard.server.controller; +import com.lanyuanxiaoyao.leopard.core.service.TaskService; import com.lanyuanxiaoyao.leopard.server.service.QuartzService; -import com.lanyuanxiaoyao.leopard.server.service.TaskService; import com.lanyuanxiaoyao.service.template.controller.GlobalResponse; import java.time.LocalDateTime; import java.util.List; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockCollectionController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockCollectionController.java index ea5f218..bebd89e 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockCollectionController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockCollectionController.java @@ -1,9 +1,9 @@ package com.lanyuanxiaoyao.leopard.server.controller; import com.lanyuanxiaoyao.leopard.core.entity.StockCollection; +import com.lanyuanxiaoyao.leopard.core.service.StockCollectionService; +import com.lanyuanxiaoyao.leopard.core.service.StockService; import com.lanyuanxiaoyao.leopard.server.entity.StockDetailVo; -import com.lanyuanxiaoyao.leopard.server.service.StockCollectionService; -import com.lanyuanxiaoyao.leopard.server.service.StockService; import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport; import java.util.HashSet; import java.util.Set; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java index f2c49e7..776d08d 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java @@ -2,9 +2,9 @@ package com.lanyuanxiaoyao.leopard.server.controller; import cn.hutool.core.bean.BeanUtil; import com.lanyuanxiaoyao.leopard.core.entity.Stock; +import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper; +import com.lanyuanxiaoyao.leopard.core.service.StockService; import com.lanyuanxiaoyao.leopard.server.entity.StockDetailVo; -import com.lanyuanxiaoyao.leopard.server.helper.NumberHelper; -import com.lanyuanxiaoyao.leopard.server.service.StockService; import com.lanyuanxiaoyao.service.template.controller.GlobalResponse; import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport; import java.time.LocalDate; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskController.java index 55884ca..05903ea 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskController.java @@ -4,7 +4,7 @@ import cn.hutool.core.date.BetweenFormatter; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.lanyuanxiaoyao.leopard.core.entity.Task; -import com.lanyuanxiaoyao.leopard.server.service.TaskService; +import com.lanyuanxiaoyao.leopard.core.service.TaskService; import com.lanyuanxiaoyao.service.template.controller.GlobalResponse; import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport; import java.time.Duration; diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java index 873cd4c..4d15fbc 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java @@ -3,6 +3,7 @@ package com.lanyuanxiaoyao.leopard.server.service; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.lanyuanxiaoyao.leopard.core.service.TaskService; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.ArrayList;