Skip to content

Commit

Permalink
Merge pull request #37 from handong-app/fix/package
Browse files Browse the repository at this point in the history
📦️ Change rootProject.name and group
  • Loading branch information
Callein authored Oct 30, 2024
2 parents 55e4250 + a485c61 commit e28d292
Show file tree
Hide file tree
Showing 73 changed files with 168 additions and 205 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'com.thc'
group = 'app.handong'
version = '0.0.1-SNAPSHOT'

java {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = 'realspr'
rootProject.name = 'handong-feed'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr;
package app.handong.feed;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand All @@ -8,10 +8,10 @@
@EnableAsync
@SpringBootApplication
@EnableJpaAuditing
public class RealsprApplication {
public class FeedApplication {

public static void main(String[] args) {
SpringApplication.run(RealsprApplication.class, args);
SpringApplication.run(FeedApplication.class, args);
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr;
package app.handong.feed;

import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.config;
package app.handong.feed.config;

import com.google.auth.oauth2.GoogleCredentials;
import com.google.firebase.FirebaseApp;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.config;
package app.handong.feed.config;

import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
Expand All @@ -11,7 +11,7 @@
import javax.sql.DataSource;

@Configuration
@MapperScan(basePackages = {"com.thc.realspr.mapper"}, sqlSessionFactoryRef = "sqlSessionFactory")
@MapperScan(basePackages = {"app.handong.feed.mapper"}, sqlSessionFactoryRef = "sqlSessionFactory")
public class MybatisConfig {
@Bean(name = "sqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.config;
package app.handong.feed.config;


import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.thc.realspr.config;
package app.handong.feed.config;


import com.thc.realspr.interceptor.DefaultInterceptor;
import app.handong.feed.interceptor.DefaultInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.resource.PathResourceResolver;

@Configuration
public class WebMvcConfig implements WebMvcConfigurer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import com.thc.realspr.dto.TbmessageDto;
import com.thc.realspr.service.TbKaFeedService;
import app.handong.feed.dto.TbmessageDto;
import app.handong.feed.service.TbKaFeedService;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import com.thc.realspr.dto.TbadminDto;
import com.thc.realspr.service.TbadminService;
import app.handong.feed.dto.TbadminDto;
import app.handong.feed.service.TbadminService;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import com.thc.realspr.service.TbfeedService;
import com.thc.realspr.service.TbuserService;
import app.handong.feed.service.TbfeedService;
import org.springframework.web.bind.annotation.*;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import com.thc.realspr.dto.TbmessageDto;
import com.thc.realspr.dto.TbsubjectDto;
import com.thc.realspr.dto.UserInteractionDto;
import com.thc.realspr.service.TbKaFeedService;
import com.thc.realspr.service.TbsubjectService;
import app.handong.feed.dto.TbsubjectDto;
import app.handong.feed.service.TbsubjectService;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RequestMapping("/api/subject")
@RestController
public class TbsubjectController {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package com.thc.realspr.controller;

import com.thc.realspr.domain.Tbuser;
import com.thc.realspr.dto.GoogleLoginRequest;
import com.thc.realspr.dto.GoogleLoginResponse;
import com.thc.realspr.dto.TbuserDto;
import com.thc.realspr.service.GoogleAuthService;
import com.thc.realspr.service.TbuserService;
import com.thc.realspr.util.TokenFactory;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
package app.handong.feed.controller;

import app.handong.feed.dto.GoogleLoginRequest;
import app.handong.feed.dto.GoogleLoginResponse;
import app.handong.feed.service.GoogleAuthService;
import app.handong.feed.service.TbuserService;
import app.handong.feed.util.TokenFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.thc.realspr.controller;
package app.handong.feed.controller;

import com.thc.realspr.dto.UserInteractionDto;
import com.thc.realspr.service.UserInteractionService;
import app.handong.feed.dto.UserInteractionDto;
import app.handong.feed.service.UserInteractionService;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.controller.page;
package app.handong.feed.controller.page;

import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
Expand All @@ -11,8 +11,7 @@
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.gson.GsonFactory;
import com.thc.realspr.util.WebConnect;
import com.thc.realspr.exception.NoAuthorizationException;
import app.handong.feed.exception.NoAuthorizationException;

import java.util.Collections;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.domain;
package app.handong.feed.domain;

import jakarta.persistence.*;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.thc.realspr.domain;
package app.handong.feed.domain;

import com.thc.realspr.id.UserSubjectId;
import app.handong.feed.id.UserSubjectId;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import org.apache.catalina.User;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.thc.realspr.domain;
package app.handong.feed.domain;

import com.thc.realspr.id.UserSubjectId;
import app.handong.feed.id.UserSubjectId;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.thc.realspr.domain;
package app.handong.feed.domain;

import com.thc.realspr.id.UserPermId;
import com.thc.realspr.id.UserSubjectId;
import app.handong.feed.id.UserPermId;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.domain;
package app.handong.feed.domain;

import jakarta.persistence.*;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.thc.realspr.domain;
package app.handong.feed.domain;

import com.thc.realspr.dto.TbuserDto;
import app.handong.feed.dto.TbuserDto;
import jakarta.persistence.*;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.Setter;
import org.checkerframework.common.aliasing.qual.Unique;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;


import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;

public class GoogleLoginRequest {
private String credential;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;

public class GoogleLoginResponse {
private String token;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;


import com.thc.realspr.domain.Tbuser;
import app.handong.feed.domain.Tbuser;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.dto;
package app.handong.feed.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.exception;
package app.handong.feed.exception;

import lombok.NoArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.exception;
package app.handong.feed.exception;

import lombok.NoArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.exception;
package app.handong.feed.exception;

import lombok.NoArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.exception;
package app.handong.feed.exception;

import lombok.NoArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.exception;
package app.handong.feed.exception;

import lombok.NoArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.id;
package app.handong.feed.id;

import jakarta.persistence.Embeddable;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thc.realspr.id;
package app.handong.feed.id;

import jakarta.persistence.Embeddable;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.thc.realspr.interceptor;
package app.handong.feed.interceptor;


import com.thc.realspr.exception.NoAuthenticatedException;
import com.thc.realspr.exception.NoAuthorizationException;
import com.thc.realspr.util.TokenFactory;
import app.handong.feed.exception.NoAuthenticatedException;
import app.handong.feed.util.TokenFactory;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.thc.realspr.mapper;
package app.handong.feed.mapper;

import com.thc.realspr.dto.TbadminDto;
import app.handong.feed.dto.TbadminDto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.thc.realspr.mapper;
package app.handong.feed.mapper;

import com.thc.realspr.dto.TbmessageDto;
import app.handong.feed.dto.TbmessageDto;
import org.springframework.scheduling.annotation.Async;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.thc.realspr.mapper;
package app.handong.feed.mapper;

import com.thc.realspr.dto.TbsubjectDto;
import app.handong.feed.dto.TbsubjectDto;
import org.apache.ibatis.annotations.*;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.thc.realspr.mapper;
package app.handong.feed.mapper;

import com.thc.realspr.dto.TbuserDto;
import app.handong.feed.dto.TbuserDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

@Mapper
public interface TbuserMapper {
Expand Down
Loading

0 comments on commit e28d292

Please sign in to comment.