diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml deleted file mode 100644 index b8581a6..0000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml deleted file mode 100644 index be90656..0000000 --- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml deleted file mode 100644 index cba9dd2..0000000 --- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml deleted file mode 100644 index 04213f7..0000000 --- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml deleted file mode 100644 index a4f1650..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml deleted file mode 100644 index 6ac1c42..0000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml deleted file mode 100644 index 6b5496f..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml deleted file mode 100644 index 4f367e7..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml deleted file mode 100644 index 8e50783..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml deleted file mode 100644 index fc8291b..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml deleted file mode 100644 index 4b3ffb1..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml deleted file mode 100644 index 181d095..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml deleted file mode 100644 index 5f3aebe..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml deleted file mode 100644 index 6613def..0000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted file mode 100644 index fbc1b16..0000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_1.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_1.xml deleted file mode 100644 index 56582d6..0000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml deleted file mode 100644 index 5d5c14b..0000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml deleted file mode 100644 index 2d759c1..0000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c6f03cc..608428c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/vvpkassistant/Anchors/AnchorsController.java b/src/main/java/vvpkassistant/Anchors/controller/AnchorsController.java similarity index 94% rename from src/main/java/vvpkassistant/Anchors/AnchorsController.java rename to src/main/java/vvpkassistant/Anchors/controller/AnchorsController.java index 83ca82b..d46a526 100644 --- a/src/main/java/vvpkassistant/Anchors/AnchorsController.java +++ b/src/main/java/vvpkassistant/Anchors/controller/AnchorsController.java @@ -1,13 +1,15 @@ -package vvpkassistant.Anchors; +package vvpkassistant.Anchors.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import vvpkassistant.Anchors.mapper.AnchorDao; +import vvpkassistant.Anchors.model.AnchorModel; import vvpkassistant.Data.ResponseData; import vvpkassistant.Data.ResponseInfo; -import vvpkassistant.pk.PkRecordDao; +import vvpkassistant.pk.mapper.PkRecordDao; import java.util.List; import java.util.Map; diff --git a/src/main/java/vvpkassistant/Anchors/AnchorDao.java b/src/main/java/vvpkassistant/Anchors/mapper/AnchorDao.java similarity index 89% rename from src/main/java/vvpkassistant/Anchors/AnchorDao.java rename to src/main/java/vvpkassistant/Anchors/mapper/AnchorDao.java index cfa0d9f..1014019 100644 --- a/src/main/java/vvpkassistant/Anchors/AnchorDao.java +++ b/src/main/java/vvpkassistant/Anchors/mapper/AnchorDao.java @@ -1,9 +1,10 @@ -package vvpkassistant.Anchors; +package vvpkassistant.Anchors.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import vvpkassistant.Anchors.model.AnchorModel; import java.util.List; diff --git a/src/main/java/vvpkassistant/Anchors/AnchorModel.java b/src/main/java/vvpkassistant/Anchors/model/AnchorModel.java similarity index 93% rename from src/main/java/vvpkassistant/Anchors/AnchorModel.java rename to src/main/java/vvpkassistant/Anchors/model/AnchorModel.java index 9c0f8ef..102c5d3 100644 --- a/src/main/java/vvpkassistant/Anchors/AnchorModel.java +++ b/src/main/java/vvpkassistant/Anchors/model/AnchorModel.java @@ -1,4 +1,4 @@ -package vvpkassistant.Anchors; +package vvpkassistant.Anchors.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigController.java b/src/main/java/vvpkassistant/FunctionConfig/controller/FunctionConfigController.java similarity index 89% rename from src/main/java/vvpkassistant/FunctionConfig/FunctionConfigController.java rename to src/main/java/vvpkassistant/FunctionConfig/controller/FunctionConfigController.java index b8babc4..9cf147a 100644 --- a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigController.java +++ b/src/main/java/vvpkassistant/FunctionConfig/controller/FunctionConfigController.java @@ -1,8 +1,11 @@ -package vvpkassistant.FunctionConfig; +package vvpkassistant.FunctionConfig.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import vvpkassistant.Data.ResponseData; import vvpkassistant.Data.ResponseInfo; +import vvpkassistant.FunctionConfig.mapper.FunctionConfigMapper; +import vvpkassistant.FunctionConfig.model.FunctionConfigModel; +import vvpkassistant.config.FunctionConfigHolder; @RestController @RequestMapping("config") diff --git a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigMapper.java b/src/main/java/vvpkassistant/FunctionConfig/mapper/FunctionConfigMapper.java similarity index 64% rename from src/main/java/vvpkassistant/FunctionConfig/FunctionConfigMapper.java rename to src/main/java/vvpkassistant/FunctionConfig/mapper/FunctionConfigMapper.java index e5e6401..c9b6d1c 100644 --- a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigMapper.java +++ b/src/main/java/vvpkassistant/FunctionConfig/mapper/FunctionConfigMapper.java @@ -1,8 +1,9 @@ -package vvpkassistant.FunctionConfig; +package vvpkassistant.FunctionConfig.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import vvpkassistant.FunctionConfig.model.FunctionConfigModel; @Mapper public interface FunctionConfigMapper extends BaseMapper { diff --git a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigModel.java b/src/main/java/vvpkassistant/FunctionConfig/model/FunctionConfigModel.java similarity index 91% rename from src/main/java/vvpkassistant/FunctionConfig/FunctionConfigModel.java rename to src/main/java/vvpkassistant/FunctionConfig/model/FunctionConfigModel.java index 925a7fc..865f346 100644 --- a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigModel.java +++ b/src/main/java/vvpkassistant/FunctionConfig/model/FunctionConfigModel.java @@ -1,4 +1,4 @@ -package vvpkassistant.FunctionConfig; +package vvpkassistant.FunctionConfig.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/vvpkassistant/Tools/VVRequester.java b/src/main/java/vvpkassistant/Tools/VVRequester.java index 47a644d..33fd7e7 100644 --- a/src/main/java/vvpkassistant/Tools/VVRequester.java +++ b/src/main/java/vvpkassistant/Tools/VVRequester.java @@ -5,11 +5,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; import lombok.SneakyThrows; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import vvpkassistant.Data.WxChatParam; import vvpkassistant.Data.WxParam; -import vvpkassistant.User.UserModel; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/src/main/java/vvpkassistant/User/UserController.java b/src/main/java/vvpkassistant/User/controller/UserController.java similarity index 97% rename from src/main/java/vvpkassistant/User/UserController.java rename to src/main/java/vvpkassistant/User/controller/UserController.java index 52f1336..445e737 100644 --- a/src/main/java/vvpkassistant/User/UserController.java +++ b/src/main/java/vvpkassistant/User/controller/UserController.java @@ -1,4 +1,4 @@ -package vvpkassistant.User; +package vvpkassistant.User.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import vvpkassistant.CoinRecords.CoinRecords; @@ -6,13 +6,15 @@ import vvpkassistant.CoinRecords.CoinRecordsDao; import vvpkassistant.Data.ResponseData; import vvpkassistant.Data.ResponseInfo; import vvpkassistant.Data.WxChatParam; -import vvpkassistant.FunctionConfig.FunctionConfigHolder; +import vvpkassistant.User.mapper.UserDao; +import vvpkassistant.User.model.UserModel; +import vvpkassistant.config.FunctionConfigHolder; import vvpkassistant.Tools.VVRequester; import vvpkassistant.Tools.VVTools; -import vvpkassistant.pk.PkInfoDao; -import vvpkassistant.pk.PkInfoModel; -import vvpkassistant.pk.PkRecordDetail; -import vvpkassistant.pk.PkRecordDetailDao; +import vvpkassistant.pk.mapper.PkInfoDao; +import vvpkassistant.pk.model.PkInfoModel; +import vvpkassistant.pk.model.PkRecordDetail; +import vvpkassistant.pk.mapper.PkRecordDetailDao; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/vvpkassistant/User/UserDao.java b/src/main/java/vvpkassistant/User/mapper/UserDao.java similarity index 92% rename from src/main/java/vvpkassistant/User/UserDao.java rename to src/main/java/vvpkassistant/User/mapper/UserDao.java index a349b18..8388978 100644 --- a/src/main/java/vvpkassistant/User/UserDao.java +++ b/src/main/java/vvpkassistant/User/mapper/UserDao.java @@ -1,11 +1,12 @@ -package vvpkassistant.User; +package vvpkassistant.User.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import vvpkassistant.pk.PkRecord; +import vvpkassistant.User.model.UserModel; +import vvpkassistant.pk.model.PkRecord; import java.util.List; @Mapper diff --git a/src/main/java/vvpkassistant/User/UserModel.java b/src/main/java/vvpkassistant/User/model/UserModel.java similarity index 96% rename from src/main/java/vvpkassistant/User/UserModel.java rename to src/main/java/vvpkassistant/User/model/UserModel.java index 71fa030..8a0de0c 100644 --- a/src/main/java/vvpkassistant/User/UserModel.java +++ b/src/main/java/vvpkassistant/User/model/UserModel.java @@ -1,4 +1,4 @@ -package vvpkassistant.User; +package vvpkassistant.User.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/vvpkassistant/chat/ChatController.java b/src/main/java/vvpkassistant/chat/controller/ChatController.java similarity index 90% rename from src/main/java/vvpkassistant/chat/ChatController.java rename to src/main/java/vvpkassistant/chat/controller/ChatController.java index 47fb51d..836bd6b 100644 --- a/src/main/java/vvpkassistant/chat/ChatController.java +++ b/src/main/java/vvpkassistant/chat/controller/ChatController.java @@ -1,10 +1,12 @@ -package vvpkassistant.chat; +package vvpkassistant.chat.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import vvpkassistant.Data.ResponseData; import vvpkassistant.Data.ResponseInfo; +import vvpkassistant.chat.mapper.ChatDao; +import vvpkassistant.chat.model.ChatModel; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/vvpkassistant/chat/ChatDao.java b/src/main/java/vvpkassistant/chat/mapper/ChatDao.java similarity index 84% rename from src/main/java/vvpkassistant/chat/ChatDao.java rename to src/main/java/vvpkassistant/chat/mapper/ChatDao.java index 638a983..2830157 100644 --- a/src/main/java/vvpkassistant/chat/ChatDao.java +++ b/src/main/java/vvpkassistant/chat/mapper/ChatDao.java @@ -1,9 +1,10 @@ -package vvpkassistant.chat; +package vvpkassistant.chat.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import vvpkassistant.chat.model.ChatModel; @Mapper public interface ChatDao extends BaseMapper { diff --git a/src/main/java/vvpkassistant/chat/ChatModel.java b/src/main/java/vvpkassistant/chat/model/ChatModel.java similarity index 92% rename from src/main/java/vvpkassistant/chat/ChatModel.java rename to src/main/java/vvpkassistant/chat/model/ChatModel.java index 935ab5a..40c6620 100644 --- a/src/main/java/vvpkassistant/chat/ChatModel.java +++ b/src/main/java/vvpkassistant/chat/model/ChatModel.java @@ -1,4 +1,4 @@ -package vvpkassistant.chat; +package vvpkassistant.chat.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigHolder.java b/src/main/java/vvpkassistant/config/FunctionConfigHolder.java similarity index 81% rename from src/main/java/vvpkassistant/FunctionConfig/FunctionConfigHolder.java rename to src/main/java/vvpkassistant/config/FunctionConfigHolder.java index 8aabfe7..34143ac 100644 --- a/src/main/java/vvpkassistant/FunctionConfig/FunctionConfigHolder.java +++ b/src/main/java/vvpkassistant/config/FunctionConfigHolder.java @@ -1,8 +1,9 @@ -package vvpkassistant.FunctionConfig; +package vvpkassistant.config; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; +import vvpkassistant.FunctionConfig.mapper.FunctionConfigMapper; +import vvpkassistant.FunctionConfig.model.FunctionConfigModel; import javax.annotation.PostConstruct; import java.util.List; @@ -12,7 +13,7 @@ import java.util.concurrent.CopyOnWriteArrayList; @RequiredArgsConstructor public class FunctionConfigHolder { // 线程安全的全局配置容器 - static final List CONFIGS = new CopyOnWriteArrayList<>(); + static public final List CONFIGS = new CopyOnWriteArrayList<>(); @Autowired private FunctionConfigMapper configMapper; diff --git a/src/main/java/vvpkassistant/pk/PkController.java b/src/main/java/vvpkassistant/pk/controller/PkController.java similarity index 97% rename from src/main/java/vvpkassistant/pk/PkController.java rename to src/main/java/vvpkassistant/pk/controller/PkController.java index c1a2c49..cbaa740 100644 --- a/src/main/java/vvpkassistant/pk/PkController.java +++ b/src/main/java/vvpkassistant/pk/controller/PkController.java @@ -1,14 +1,20 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import vvpkassistant.CoinRecords.CoinRecords; import vvpkassistant.CoinRecords.CoinRecordsDao; import vvpkassistant.Data.ResponseData; import vvpkassistant.Data.ResponseInfo; -import vvpkassistant.FunctionConfig.FunctionConfigHolder; +import vvpkassistant.config.FunctionConfigHolder; import vvpkassistant.Tools.VVTools; -import vvpkassistant.User.UserDao; -import vvpkassistant.User.UserModel; +import vvpkassistant.User.mapper.UserDao; +import vvpkassistant.User.model.UserModel; +import vvpkassistant.pk.mapper.PkInfoDao; +import vvpkassistant.pk.mapper.PkRecordDao; +import vvpkassistant.pk.mapper.PkRecordDetailDao; +import vvpkassistant.pk.model.PkInfoModel; +import vvpkassistant.pk.model.PkRecord; +import vvpkassistant.pk.model.PkRecordDetail; import java.util.List; import java.util.Map; diff --git a/src/main/java/vvpkassistant/pk/PkInfoDao.java b/src/main/java/vvpkassistant/pk/mapper/PkInfoDao.java similarity index 98% rename from src/main/java/vvpkassistant/pk/PkInfoDao.java rename to src/main/java/vvpkassistant/pk/mapper/PkInfoDao.java index 768f1ba..009e2eb 100644 --- a/src/main/java/vvpkassistant/pk/PkInfoDao.java +++ b/src/main/java/vvpkassistant/pk/mapper/PkInfoDao.java @@ -1,7 +1,8 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.*; import org.jetbrains.annotations.Nullable; +import vvpkassistant.pk.model.PkInfoModel; import java.util.List; import java.util.Map; diff --git a/src/main/java/vvpkassistant/pk/PkRecordDao.java b/src/main/java/vvpkassistant/pk/mapper/PkRecordDao.java similarity index 93% rename from src/main/java/vvpkassistant/pk/PkRecordDao.java rename to src/main/java/vvpkassistant/pk/mapper/PkRecordDao.java index cc2a858..79c2ddb 100644 --- a/src/main/java/vvpkassistant/pk/PkRecordDao.java +++ b/src/main/java/vvpkassistant/pk/mapper/PkRecordDao.java @@ -1,9 +1,12 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import vvpkassistant.pk.model.PkRecordDetail; +import vvpkassistant.pk.model.PkRecord; + import java.util.List; diff --git a/src/main/java/vvpkassistant/pk/PkRecordDetailDao.java b/src/main/java/vvpkassistant/pk/mapper/PkRecordDetailDao.java similarity index 85% rename from src/main/java/vvpkassistant/pk/PkRecordDetailDao.java rename to src/main/java/vvpkassistant/pk/mapper/PkRecordDetailDao.java index 9aea234..8ad5b27 100644 --- a/src/main/java/vvpkassistant/pk/PkRecordDetailDao.java +++ b/src/main/java/vvpkassistant/pk/mapper/PkRecordDetailDao.java @@ -1,9 +1,10 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import vvpkassistant.pk.model.PkRecordDetail; import java.util.List; diff --git a/src/main/java/vvpkassistant/pk/PkInfoModel.java b/src/main/java/vvpkassistant/pk/model/PkInfoModel.java similarity index 97% rename from src/main/java/vvpkassistant/pk/PkInfoModel.java rename to src/main/java/vvpkassistant/pk/model/PkInfoModel.java index 962f715..eef445e 100644 --- a/src/main/java/vvpkassistant/pk/PkInfoModel.java +++ b/src/main/java/vvpkassistant/pk/model/PkInfoModel.java @@ -1,4 +1,4 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/vvpkassistant/pk/PkRecord.java b/src/main/java/vvpkassistant/pk/model/PkRecord.java similarity index 97% rename from src/main/java/vvpkassistant/pk/PkRecord.java rename to src/main/java/vvpkassistant/pk/model/PkRecord.java index 2ffa951..b9512ce 100644 --- a/src/main/java/vvpkassistant/pk/PkRecord.java +++ b/src/main/java/vvpkassistant/pk/model/PkRecord.java @@ -1,4 +1,4 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; diff --git a/src/main/java/vvpkassistant/pk/PkRecordDetail.java b/src/main/java/vvpkassistant/pk/model/PkRecordDetail.java similarity index 95% rename from src/main/java/vvpkassistant/pk/PkRecordDetail.java rename to src/main/java/vvpkassistant/pk/model/PkRecordDetail.java index b7f1f05..c51f145 100644 --- a/src/main/java/vvpkassistant/pk/PkRecordDetail.java +++ b/src/main/java/vvpkassistant/pk/model/PkRecordDetail.java @@ -1,4 +1,4 @@ -package vvpkassistant.pk; +package vvpkassistant.pk.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 4b3c730..8b0e3e7 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -4,8 +4,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: wfn53400 - url: jdbc:mysql://mysql.text.zhukeping.com:3326/vv_assistant?allowMultiQueries=true + password: 123asd + url: jdbc:mysql://localhost:3306/vv_assistant?allowMultiQueries=true chat: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5a53e53..05e7aa7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: profiles: - active: dev + active: prd diff --git a/target/classes/application.yml b/target/classes/application.yml index 5a53e53..05e7aa7 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -3,7 +3,7 @@ server: spring: profiles: - active: dev + active: prd