优化目录结构

src/main/java/com/egolm/film/api/admin/AdminLoginController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
 import com.egolm.film.api.admin.service.AdminTokenService;
-import com.egolm.film.common.Messages;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;
 

src/main/java/com/egolm/film/api/CommonApiController.java → src/main/java/com/egolm/film/api/common/CommonApiController.java

-package com.egolm.film.api;
+package com.egolm.film.api.common;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
-import com.egolm.film.common.CountryService;
-import com.egolm.film.common.LanguageService;
+import com.egolm.film.api.common.service.CountryService;
+import com.egolm.film.api.common.service.LanguageService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/egolm/film/common/CountryService.java → src/main/java/com/egolm/film/api/common/service/CountryService.java

-package com.egolm.film.common;
+package com.egolm.film.api.common.service;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/egolm/film/common/EmailService.java → src/main/java/com/egolm/film/api/common/service/EmailService.java

-package com.egolm.film.common;
+package com.egolm.film.api.common.service;
 
 public interface EmailService {
 

src/main/java/com/egolm/film/common/LanguageService.java → src/main/java/com/egolm/film/api/common/service/LanguageService.java

-package com.egolm.film.common;
+package com.egolm.film.api.common.service;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/egolm/film/common/Messages.java → src/main/java/com/egolm/film/api/common/service/Messages.java

-package com.egolm.film.common;
+package com.egolm.film.api.common.service;
 
 import java.util.Locale;
 

src/main/java/com/egolm/film/common/impl/CountryServiceImpl.java → src/main/java/com/egolm/film/api/common/service/impl/CountryServiceImpl.java

-package com.egolm.film.common.impl;
+package com.egolm.film.api.common.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.egolm.film.common.CountryService;
+import com.egolm.film.api.common.service.CountryService;
 
 @Service
 public class CountryServiceImpl implements CountryService {

src/main/java/com/egolm/film/common/impl/DefaultMessages.java → src/main/java/com/egolm/film/api/common/service/impl/DefaultMessages.java

-package com.egolm.film.common.impl;
+package com.egolm.film.api.common.service.impl;
 
 import java.util.Locale;
 
@@ -8,7 +8,7 @@ import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
-import com.egolm.film.common.Messages;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.config.XException;
 
 @Component

src/main/java/com/egolm/film/common/impl/EmailServiceImpl.java → src/main/java/com/egolm/film/api/common/service/impl/EmailServiceImpl.java

-package com.egolm.film.common.impl;
+package com.egolm.film.api.common.service.impl;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.egolm.common.MailUtil;
-import com.egolm.film.common.EmailService;
+import com.egolm.film.api.common.service.EmailService;
 
 @Service
 public class EmailServiceImpl implements EmailService {

src/main/java/com/egolm/film/common/impl/LanguageServiceImpl.java → src/main/java/com/egolm/film/api/common/service/impl/LanguageServiceImpl.java

-package com.egolm.film.common.impl;
+package com.egolm.film.api.common.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.egolm.film.common.LanguageService;
+import com.egolm.film.api.common.service.LanguageService;
 
 @Service
 public class LanguageServiceImpl implements LanguageService {

src/main/java/com/egolm/film/api/member/MemberInfoController.java

@@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.api.member.service.MemberService;
 import com.egolm.film.api.member.service.MemberTokenService;
 import com.egolm.film.bean.Fc_member;
-import com.egolm.film.common.Messages;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;
 

src/main/java/com/egolm/film/api/member/MemberLoginController.java

@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.api.member.service.MemberTokenService;
-import com.egolm.film.common.Messages;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;
 

src/main/java/com/egolm/film/api/member/MemberOpenApiController.java

@@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.egolm.common.MailUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.web.ServletUtil;
+import com.egolm.film.api.common.service.EmailService;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.api.member.service.MemberService;
 import com.egolm.film.bean.Fc_member;
-import com.egolm.film.common.EmailService;
-import com.egolm.film.common.Messages;
 import com.egolm.film.config.Common;
 import com.egolm.film.config.XException;
 import com.egolm.film.config.interceptor.LocaleSessionInterceptor;

src/main/java/com/egolm/film/api/member/service/impl/MemberServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.egolm.common.StringUtil;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.web.ServletUtil;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.api.member.service.MemberService;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.bean.Fc_member_film;
@@ -26,7 +27,6 @@ import com.egolm.film.bean.Fc_member_film_director;
 import com.egolm.film.bean.Fc_member_film_issuer;
 import com.egolm.film.bean.Fc_member_film_playactor;
 import com.egolm.film.bean.Fc_member_film_show;
-import com.egolm.film.common.Messages;
 import com.egolm.film.config.Common;
 import com.egolm.film.config.WebMvcConfig;
 import com.egolm.film.config.XException;

src/main/java/com/egolm/film/api/member/service/impl/MemberTokenServiceImpl.java

@@ -5,10 +5,10 @@ import javax.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.api.member.service.MemberService;
 import com.egolm.film.api.member.service.MemberTokenService;
 import com.egolm.film.bean.Fc_member;
-import com.egolm.film.common.Messages;
 import com.egolm.film.config.Common;
 import com.egolm.film.config.WebMvcConfig;
 import com.egolm.film.config.XException;

src/main/java/com/egolm/film/api/user/UserLoginController.java

@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
+import com.egolm.film.api.common.service.Messages;
 import com.egolm.film.api.user.service.UserTokenService;
-import com.egolm.film.common.Messages;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;