diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0233bf..50861e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/download-artifact@v3 with: - name: app + name: evento-lark - name: Rename jar run: mv -v *.jar evento-lark.jar - name: Deploy diff --git a/src/main/java/fun/sast/evento/lark/api/v2/admin/AttachmentController.java b/src/main/java/fun/sast/evento/lark/api/admin/AttachmentController.java similarity index 93% rename from src/main/java/fun/sast/evento/lark/api/v2/admin/AttachmentController.java rename to src/main/java/fun/sast/evento/lark/api/admin/AttachmentController.java index 1b45e46..fb8675f 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/admin/AttachmentController.java +++ b/src/main/java/fun/sast/evento/lark/api/admin/AttachmentController.java @@ -1,8 +1,8 @@ -package fun.sast.evento.lark.api.v2.admin; +package fun.sast.evento.lark.api.admin; import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Attachment; import fun.sast.evento.lark.domain.event.service.AttachmentService; import jakarta.annotation.Resource; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/admin/EventController.java b/src/main/java/fun/sast/evento/lark/api/admin/EventController.java similarity index 96% rename from src/main/java/fun/sast/evento/lark/api/v2/admin/EventController.java rename to src/main/java/fun/sast/evento/lark/api/admin/EventController.java index 4bebec2..4899bde 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/admin/EventController.java +++ b/src/main/java/fun/sast/evento/lark/api/admin/EventController.java @@ -1,8 +1,8 @@ -package fun.sast.evento.lark.api.v2.admin; +package fun.sast.evento.lark.api.admin; import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Event; import fun.sast.evento.lark.domain.event.service.EventService; import fun.sast.evento.lark.domain.event.value.EventCreate; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/admin/FeedbackController.java b/src/main/java/fun/sast/evento/lark/api/admin/FeedbackController.java similarity index 93% rename from src/main/java/fun/sast/evento/lark/api/v2/admin/FeedbackController.java rename to src/main/java/fun/sast/evento/lark/api/admin/FeedbackController.java index c8c00a0..95f2469 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/admin/FeedbackController.java +++ b/src/main/java/fun/sast/evento/lark/api/admin/FeedbackController.java @@ -1,8 +1,8 @@ -package fun.sast.evento.lark.api.v2.admin; +package fun.sast.evento.lark.api.admin; import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.common.value.Pagination; import fun.sast.evento.lark.domain.event.entity.Feedback; import fun.sast.evento.lark.domain.event.service.FeedbackService; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/admin/LarkController.java b/src/main/java/fun/sast/evento/lark/api/admin/LarkController.java similarity index 94% rename from src/main/java/fun/sast/evento/lark/api/v2/admin/LarkController.java rename to src/main/java/fun/sast/evento/lark/api/admin/LarkController.java index ca1c4f9..5315e16 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/admin/LarkController.java +++ b/src/main/java/fun/sast/evento/lark/api/admin/LarkController.java @@ -1,8 +1,8 @@ -package fun.sast.evento.lark.api.v2.admin; +package fun.sast.evento.lark.api.admin; import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.lark.service.LarkDepartmentService; import fun.sast.evento.lark.domain.lark.service.LarkRoomService; import jakarta.annotation.Resource; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/admin/SlideController.java b/src/main/java/fun/sast/evento/lark/api/admin/SlideController.java similarity index 95% rename from src/main/java/fun/sast/evento/lark/api/v2/admin/SlideController.java rename to src/main/java/fun/sast/evento/lark/api/admin/SlideController.java index 38256ae..7f07904 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/admin/SlideController.java +++ b/src/main/java/fun/sast/evento/lark/api/admin/SlideController.java @@ -1,8 +1,8 @@ -package fun.sast.evento.lark.api.v2.admin; +package fun.sast.evento.lark.api.admin; import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Slide; import fun.sast.evento.lark.domain.event.service.SlideService; import jakarta.annotation.Resource; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/admin/SubscriptionController.java b/src/main/java/fun/sast/evento/lark/api/admin/SubscriptionController.java similarity index 95% rename from src/main/java/fun/sast/evento/lark/api/v2/admin/SubscriptionController.java rename to src/main/java/fun/sast/evento/lark/api/admin/SubscriptionController.java index ae0512a..68eb63c 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/admin/SubscriptionController.java +++ b/src/main/java/fun/sast/evento/lark/api/admin/SubscriptionController.java @@ -1,4 +1,4 @@ -package fun.sast.evento.lark.api.v2.admin; +package fun.sast.evento.lark.api.admin; import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/client/AttachmentController.java b/src/main/java/fun/sast/evento/lark/api/client/AttachmentController.java similarity index 90% rename from src/main/java/fun/sast/evento/lark/api/v2/client/AttachmentController.java rename to src/main/java/fun/sast/evento/lark/api/client/AttachmentController.java index 36013cb..f1d48c7 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/client/AttachmentController.java +++ b/src/main/java/fun/sast/evento/lark/api/client/AttachmentController.java @@ -1,6 +1,6 @@ -package fun.sast.evento.lark.api.v2.client; +package fun.sast.evento.lark.api.client; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.service.AttachmentService; import jakarta.annotation.Resource; import org.springframework.cache.annotation.Cacheable; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/client/EventController.java b/src/main/java/fun/sast/evento/lark/api/client/EventController.java similarity index 97% rename from src/main/java/fun/sast/evento/lark/api/v2/client/EventController.java rename to src/main/java/fun/sast/evento/lark/api/client/EventController.java index 2eb4803..e460d52 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/client/EventController.java +++ b/src/main/java/fun/sast/evento/lark/api/client/EventController.java @@ -1,6 +1,6 @@ -package fun.sast.evento.lark.api.v2.client; +package fun.sast.evento.lark.api.client; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.common.value.Pagination; import fun.sast.evento.lark.domain.event.entity.Event; import fun.sast.evento.lark.domain.event.service.EventService; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/client/FeedbackController.java b/src/main/java/fun/sast/evento/lark/api/client/FeedbackController.java similarity index 92% rename from src/main/java/fun/sast/evento/lark/api/v2/client/FeedbackController.java rename to src/main/java/fun/sast/evento/lark/api/client/FeedbackController.java index 9193c12..67a9225 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/client/FeedbackController.java +++ b/src/main/java/fun/sast/evento/lark/api/client/FeedbackController.java @@ -1,6 +1,6 @@ -package fun.sast.evento.lark.api.v2.client; +package fun.sast.evento.lark.api.client; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Feedback; import fun.sast.evento.lark.domain.event.service.FeedbackService; import jakarta.annotation.Resource; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/client/LarkController.java b/src/main/java/fun/sast/evento/lark/api/client/LarkController.java similarity index 81% rename from src/main/java/fun/sast/evento/lark/api/v2/client/LarkController.java rename to src/main/java/fun/sast/evento/lark/api/client/LarkController.java index b433a99..5035289 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/client/LarkController.java +++ b/src/main/java/fun/sast/evento/lark/api/client/LarkController.java @@ -1,6 +1,6 @@ -package fun.sast.evento.lark.api.v2.client; +package fun.sast.evento.lark.api.client; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/client/SlideController.java b/src/main/java/fun/sast/evento/lark/api/client/SlideController.java similarity index 92% rename from src/main/java/fun/sast/evento/lark/api/v2/client/SlideController.java rename to src/main/java/fun/sast/evento/lark/api/client/SlideController.java index 71cb507..7d49e06 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/client/SlideController.java +++ b/src/main/java/fun/sast/evento/lark/api/client/SlideController.java @@ -1,6 +1,6 @@ -package fun.sast.evento.lark.api.v2.client; +package fun.sast.evento.lark.api.client; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Slide; import fun.sast.evento.lark.domain.event.service.SlideService; import jakarta.annotation.Resource; diff --git a/src/main/java/fun/sast/evento/lark/api/v2/client/SubscriptionController.java b/src/main/java/fun/sast/evento/lark/api/client/SubscriptionController.java similarity index 97% rename from src/main/java/fun/sast/evento/lark/api/v2/client/SubscriptionController.java rename to src/main/java/fun/sast/evento/lark/api/client/SubscriptionController.java index b0d8567..dee6093 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/client/SubscriptionController.java +++ b/src/main/java/fun/sast/evento/lark/api/client/SubscriptionController.java @@ -1,4 +1,4 @@ -package fun.sast.evento.lark.api.v2.client; +package fun.sast.evento.lark.api.client; import fun.sast.evento.lark.domain.event.service.SubscriptionService; import fun.sast.evento.lark.domain.subscription.event.EventStateUpdateEvent; diff --git a/src/main/java/fun/sast/evento/lark/api/common/LoginController.java b/src/main/java/fun/sast/evento/lark/api/common/LoginController.java index 967d3c0..3a45787 100644 --- a/src/main/java/fun/sast/evento/lark/api/common/LoginController.java +++ b/src/main/java/fun/sast/evento/lark/api/common/LoginController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/api/login") +@RequestMapping("/api/v2/login") @AllArgsConstructor class LoginController { diff --git a/src/main/java/fun/sast/evento/lark/api/common/UserController.java b/src/main/java/fun/sast/evento/lark/api/common/UserController.java index 1aade2f..c1bc1fb 100644 --- a/src/main/java/fun/sast/evento/lark/api/common/UserController.java +++ b/src/main/java/fun/sast/evento/lark/api/common/UserController.java @@ -2,7 +2,7 @@ import fun.sast.evento.lark.api.security.Permission; import fun.sast.evento.lark.api.security.RequirePermission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.service.UserService; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/fun/sast/evento/lark/api/v1/client/EventController.java b/src/main/java/fun/sast/evento/lark/api/v1/client/EventController.java deleted file mode 100644 index 277528a..0000000 --- a/src/main/java/fun/sast/evento/lark/api/v1/client/EventController.java +++ /dev/null @@ -1,56 +0,0 @@ -package fun.sast.evento.lark.api.v1.client; - -import fun.sast.evento.lark.api.v1.value.V1; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController(value = "v1EventController") -@RequestMapping("/api/v1/event") -class EventController { - - @GetMapping("/conducting") - public List getConducting() { - return List.of(); - } - - @GetMapping("/newest") - public List getNewest() { - return List.of(); - } - - @GetMapping("/history") - public List getHistory() { - return List.of(); - } - - @DeleteMapping("/info") - public Boolean deleteEvent(@RequestParam Integer eventId) { - return true; - } - - @GetMapping("/info") - public V1.Event getEvent(@RequestParam Integer eventId) { - return null; - } - - @GetMapping("/list") - public V1.Page getEvents(@RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "size", required = false, defaultValue = "10") Integer size) { - return new V1.Page<>(List.of(), 1, 10); - } - - @PostMapping("/list") - public List postForEvents(@RequestParam(required = false) List typeId, - @RequestParam(required = false) List departmentId, - @RequestParam(required = false) String time) { - return List.of(); - } - - @GetMapping("/departments") - public List getDepartmentsWithFilter() { - return List.of(); - } - -} - diff --git a/src/main/java/fun/sast/evento/lark/api/v1/client/FeedbackController.java b/src/main/java/fun/sast/evento/lark/api/v1/client/FeedbackController.java deleted file mode 100644 index a3840b9..0000000 --- a/src/main/java/fun/sast/evento/lark/api/v1/client/FeedbackController.java +++ /dev/null @@ -1,59 +0,0 @@ -package fun.sast.evento.lark.api.v1.client; - -import fun.sast.evento.lark.api.v1.value.V1; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController(value = "v1FeedbackController") -@RequestMapping("/api/v1/feedback") -class FeedbackController { - - @GetMapping("/event") - public V1.Feedbacks getFeedback(@RequestParam Integer eventId) { - return null; - } - - @GetMapping("/num") - public V1.Page getFeedbackEvents( - @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "size", required = false, defaultValue = "10") Integer size) { - return null; - } - - - @PostMapping("/info") - public Boolean addFeedback(@RequestParam(required = false) String content, - @RequestParam Double score, - @RequestParam Integer eventId) { - return true; - } - - @GetMapping("/user/list") - public List getListByUserId() { - return null; - } - - @GetMapping("/user/info") - public V1.Feedback getUserFeedback(@RequestParam Integer eventId) { - return null; - } - - @PatchMapping("/info") - public Boolean patchFeedback(@RequestParam(required = false) String content, - @RequestParam(required = false) Double score, - @RequestParam Integer feedbackId) { - return true; - } - - @DeleteMapping("/info") - public Boolean deleteFeedback(@RequestParam Integer feedbackId) { - return true; - } - - @GetMapping("/list") - public List getListByEventId(@RequestParam Integer eventId) { - return List.of(); - } - -} diff --git a/src/main/java/fun/sast/evento/lark/api/v1/client/SlideController.java b/src/main/java/fun/sast/evento/lark/api/v1/client/SlideController.java deleted file mode 100644 index edaa847..0000000 --- a/src/main/java/fun/sast/evento/lark/api/v1/client/SlideController.java +++ /dev/null @@ -1,28 +0,0 @@ -package fun.sast.evento.lark.api.v1.client; - -import fun.sast.evento.lark.api.v1.value.V1; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController(value = "v1SlideController") -@RequestMapping("/api/v1/slide") -class SlideController { - - - @GetMapping("/event/list") - public List event(@RequestParam Integer eventId) { - - return List.of(); - } - - @GetMapping("/home/list") - public V1.SlidePage home(@RequestParam(defaultValue = "1", required = false) Integer current, - @RequestParam(defaultValue = "3", required = false) Integer size) { - return new V1.SlidePage(List.of(), 0); - } - -} diff --git a/src/main/java/fun/sast/evento/lark/api/v1/client/UserController.java b/src/main/java/fun/sast/evento/lark/api/v1/client/UserController.java deleted file mode 100644 index 9cdd658..0000000 --- a/src/main/java/fun/sast/evento/lark/api/v1/client/UserController.java +++ /dev/null @@ -1,59 +0,0 @@ -package fun.sast.evento.lark.api.v1.client; - -import fun.sast.evento.lark.api.v1.value.V1; -import fun.sast.evento.lark.domain.event.entity.User; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController(value = "v1UserController") -@RequestMapping("/api/v1/user") -class UserController { - - @GetMapping("/info") - public V1.User getUser() { - return null; - } - - @PutMapping("/info") - public Boolean putUser(@RequestBody User user) { - return true; - } - - @GetMapping("/subscribe") - public Boolean subscribe(@RequestParam Integer eventId, @RequestParam Boolean isSubscribe) { - return true; - } - - @GetMapping("/subscribed") - public List getSubscribed() { - return List.of(); - } - - @GetMapping("/register") - public Boolean register(@RequestParam Integer eventId, - @RequestParam Boolean isRegister) { - return true; - } - - @GetMapping("/registered") - public List getRegistered() { - return List.of(); - } - - @GetMapping("/participate") - public V1.Participate getParticipation(@RequestParam Integer eventId) { - return null; - } - - @GetMapping("/subscribe/department") - public Boolean subscribeDepartment(@RequestParam Integer departmentId, @RequestParam Boolean isSubscribe) { - return true; - } - - @GetMapping("/subscribe/departments") - public List getSubscribeDepartment() { - return List.of(); - } - -} diff --git a/src/main/java/fun/sast/evento/lark/api/v1/value/V1.java b/src/main/java/fun/sast/evento/lark/api/v1/value/V1.java deleted file mode 100644 index be37d79..0000000 --- a/src/main/java/fun/sast/evento/lark/api/v1/value/V1.java +++ /dev/null @@ -1,108 +0,0 @@ -package fun.sast.evento.lark.api.v1.value; - -import java.util.Date; -import java.util.List; - -public interface V1 { - record Event( - Integer id, - String title, - String description, - Date gmtEventStart, - Date gmtEventEnd, - Date gmtRegistrationStart,//报名 - Date gmtRegistrationEnd,// - EventType eventType, - String location, - String tag, - Integer state,//1:未开始,2:报名中,3:进行中,4:已取消,5:已结束 - List departments - ) { - } - - record Department( - Integer id, - String departmentName - ) { - } - - record EventType( - Integer id, - String typeName, - Boolean allowConflict - ) { - } - - record Feedbacks( - Integer eventId, - Double average, - Integer subscribeNum, - Integer registrationNum, - Integer participantNum, - List feedbacks - ) { - } - - record Feedback( - Integer id, - String content, - Double score, - Integer eventId - ) { - } - - record FeedbackNum( - Integer eventId, - Integer feedbackCount, - String title - ) { - } - - record Page( - List result, - Integer current, - Integer total - ) { - } - - record User( - String id, - String linkId, - String studentId, - String email, - String nickname, - String avatar, - String org, - String bio, - List link - ) { - } - - record Participate( - Boolean isRegistration, - Boolean isParticipate, - Boolean isSubscribe, - String userId, - Integer eventId - ) { - } - - record Slide( - Integer id, - String title, - String link, - String url, - Integer eventId - ) { - } - - //ugly but in google design - record SlidePage( - List slides, - int total - ) { - } - -} - - diff --git a/src/main/java/fun/sast/evento/lark/api/v2/value/V2.java b/src/main/java/fun/sast/evento/lark/api/value/V2.java similarity index 97% rename from src/main/java/fun/sast/evento/lark/api/v2/value/V2.java rename to src/main/java/fun/sast/evento/lark/api/value/V2.java index c531e06..4403a61 100644 --- a/src/main/java/fun/sast/evento/lark/api/v2/value/V2.java +++ b/src/main/java/fun/sast/evento/lark/api/value/V2.java @@ -1,4 +1,4 @@ -package fun.sast.evento.lark.api.v2.value; +package fun.sast.evento.lark.api.value; import fun.sast.evento.lark.domain.common.value.EventState; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/AttachmentService.java b/src/main/java/fun/sast/evento/lark/domain/event/service/AttachmentService.java index 0005e9c..8ea7a3f 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/AttachmentService.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/AttachmentService.java @@ -1,6 +1,6 @@ package fun.sast.evento.lark.domain.event.service; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Attachment; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/EventService.java b/src/main/java/fun/sast/evento/lark/domain/event/service/EventService.java index 613a985..c2f0e78 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/EventService.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/EventService.java @@ -1,6 +1,6 @@ package fun.sast.evento.lark.domain.event.service; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.common.value.EventState; import fun.sast.evento.lark.domain.common.value.Pagination; import fun.sast.evento.lark.domain.event.entity.Event; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/FeedbackService.java b/src/main/java/fun/sast/evento/lark/domain/event/service/FeedbackService.java index 0e5dde9..13d6d5f 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/FeedbackService.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/FeedbackService.java @@ -1,6 +1,6 @@ package fun.sast.evento.lark.domain.event.service; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.common.value.Pagination; import fun.sast.evento.lark.domain.event.entity.Feedback; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/SlideService.java b/src/main/java/fun/sast/evento/lark/domain/event/service/SlideService.java index 9643358..398af41 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/SlideService.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/SlideService.java @@ -1,6 +1,6 @@ package fun.sast.evento.lark.domain.event.service; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Slide; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/UserService.java b/src/main/java/fun/sast/evento/lark/domain/event/service/UserService.java index 03e27b5..7945fa6 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/UserService.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/UserService.java @@ -1,7 +1,7 @@ package fun.sast.evento.lark.domain.event.service; import fun.feellmoose.model.UserInfo; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.User; public interface UserService { diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/AttachmentServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/AttachmentServiceImpl.java index 7a9aa8c..cfb9050 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/AttachmentServiceImpl.java @@ -1,7 +1,7 @@ package fun.sast.evento.lark.domain.event.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Attachment; import fun.sast.evento.lark.domain.event.service.AttachmentService; import fun.sast.evento.lark.domain.event.service.EventService; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/EventServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/EventServiceImpl.java index 5c0e0cf..39d744e 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/EventServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/EventServiceImpl.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lark.oapi.service.calendar.v4.model.TimeInfo; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.common.value.EventState; import fun.sast.evento.lark.domain.common.value.Pagination; import fun.sast.evento.lark.domain.event.entity.Event; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/FeedbackServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/FeedbackServiceImpl.java index e1e5357..3730e57 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/FeedbackServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/FeedbackServiceImpl.java @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.common.value.Pagination; import fun.sast.evento.lark.domain.event.entity.Feedback; import fun.sast.evento.lark.domain.event.service.FeedbackService; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/SlideServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/SlideServiceImpl.java index 950573d..b56f6b8 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/SlideServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/SlideServiceImpl.java @@ -1,7 +1,7 @@ package fun.sast.evento.lark.domain.event.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.Slide; import fun.sast.evento.lark.domain.event.service.EventService; import fun.sast.evento.lark.domain.event.service.SlideService; diff --git a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/UserServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/UserServiceImpl.java index a8ff18e..73646d5 100644 --- a/src/main/java/fun/sast/evento/lark/domain/event/service/impl/UserServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/event/service/impl/UserServiceImpl.java @@ -2,7 +2,7 @@ import fun.feellmoose.model.UserInfo; import fun.sast.evento.lark.api.security.Permission; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.event.entity.User; import fun.sast.evento.lark.domain.event.service.UserService; import fun.sast.evento.lark.infrastructure.auth.JWTInterceptor; diff --git a/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkDepartmentService.java b/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkDepartmentService.java index 57d4c6b..50ac94e 100644 --- a/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkDepartmentService.java +++ b/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkDepartmentService.java @@ -1,6 +1,6 @@ package fun.sast.evento.lark.domain.lark.service; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.lark.value.LarkDepartment; import java.util.List; diff --git a/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkRoomService.java b/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkRoomService.java index 4dcc8a4..7e2e7a8 100644 --- a/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkRoomService.java +++ b/src/main/java/fun/sast/evento/lark/domain/lark/service/LarkRoomService.java @@ -1,6 +1,6 @@ package fun.sast.evento.lark.domain.lark.service; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.lark.value.LarkRoom; import java.time.LocalDateTime; diff --git a/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkDepartmentServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkDepartmentServiceImpl.java index 3d0bb70..3717eab 100644 --- a/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkDepartmentServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkDepartmentServiceImpl.java @@ -1,7 +1,7 @@ package fun.sast.evento.lark.domain.lark.service.impl; import com.lark.oapi.service.contact.v3.model.*; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.lark.service.LarkDepartmentService; import fun.sast.evento.lark.domain.lark.value.LarkDepartment; import fun.sast.evento.lark.infrastructure.error.BusinessException; diff --git a/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java index 5a8af3f..656831a 100644 --- a/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java @@ -8,7 +8,7 @@ import com.lark.oapi.service.vc.v1.model.GetRoomResp; import com.lark.oapi.service.vc.v1.model.ListRoomReq; import com.lark.oapi.service.vc.v1.model.ListRoomResp; -import fun.sast.evento.lark.api.v2.value.V2; +import fun.sast.evento.lark.api.value.V2; import fun.sast.evento.lark.domain.lark.service.LarkRoomService; import fun.sast.evento.lark.domain.lark.value.LarkRoom; import fun.sast.evento.lark.infrastructure.error.BusinessException; diff --git a/src/main/resources/sql/SQL.sql b/src/main/resources/sql/SQL.sql index 7e63526..7f70e91 100644 --- a/src/main/resources/sql/SQL.sql +++ b/src/main/resources/sql/SQL.sql @@ -63,7 +63,7 @@ CREATE TABLE `message` ); CREATE TABLE `permission` ( - 'user_id' VARCHAR(16) NOT NULL, - 'permission' INT, - PRIMARY KEY ('user_id') + `user_id` VARCHAR(16) NOT NULL, + `permission` INT, + PRIMARY KEY (`user_id`) );