重构

src/main/java/com/egolm/film/api/admin/service/AdminFirstService.java

-package com.egolm.film.api.admin.service;
-
-public interface AdminFirstService {
-
-}

src/main/java/com/egolm/film/api/admin/service/AdminAuthService.java → src/main/java/com/egolm/film/api/service/AdminAuthService.java

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

src/main/java/com/egolm/film/api/admin/service/AdminTokenService.java → src/main/java/com/egolm/film/api/service/AdminTokenService.java

-package com.egolm.film.api.admin.service;
-
-import com.egolm.film.api.TokenService;
+package com.egolm.film.api.service;
 
 public interface AdminTokenService extends TokenService {
 

src/main/java/com/egolm/film/api/admin/service/AdminUserService.java → src/main/java/com/egolm/film/api/service/AdminUserService.java

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

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

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

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

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

src/main/java/com/egolm/film/api/service/FilmService.java

+package com.egolm.film.api.service;
+
+public interface FilmService {
+
+	void copyFilm(Integer member_film_id, Integer adminid);
+
+}

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

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

src/main/java/com/egolm/film/api/member/service/MemberService.java → src/main/java/com/egolm/film/api/service/MemberService.java

-package com.egolm.film.api.member.service;
+package com.egolm.film.api.service;
 
 import java.util.List;
 import java.util.Map;
@@ -135,4 +135,8 @@ public interface MemberService {
 
 	List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, String film_type, String enroll_type, String film_country, Page page);
 
+	void pass(Integer member_film_id);
+
+	void reject(Integer member_film_id);
+
 }

src/main/java/com/egolm/film/api/member/service/MemberTokenService.java → src/main/java/com/egolm/film/api/service/MemberTokenService.java

-package com.egolm.film.api.member.service;
-
-import com.egolm.film.api.TokenService;
+package com.egolm.film.api.service;
 
 public interface MemberTokenService extends TokenService {
 

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

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

src/main/java/com/egolm/film/api/TokenService.java → src/main/java/com/egolm/film/api/service/TokenService.java

-package com.egolm.film.api;
+package com.egolm.film.api.service;
 
 import javax.servlet.http.HttpServletRequest;
 

src/main/java/com/egolm/film/api/user/service/UserReviewService.java → src/main/java/com/egolm/film/api/service/UserReviewService.java

+package com.egolm.film.api.service;
 //package com.egolm.film.api.user.service;
 //
 //import java.util.Date;

src/main/java/com/egolm/film/api/user/service/UserTokenService.java → src/main/java/com/egolm/film/api/service/UserTokenService.java

-package com.egolm.film.api.user.service;
-
-import com.egolm.film.api.TokenService;
+package com.egolm.film.api.service;
 
 public interface UserTokenService extends TokenService {
 

src/main/java/com/egolm/film/api/admin/service/impl/AdminAuthServiceImpl.java → src/main/java/com/egolm/film/api/service/impl/AdminAuthServiceImpl.java

-package com.egolm.film.api.admin.service.impl;
+package com.egolm.film.api.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.egolm.common.StringUtil;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
-import com.egolm.film.api.admin.service.AdminAuthService;
+import com.egolm.film.api.service.AdminAuthService;
 import com.egolm.film.bean.Fc_admin;
 import com.egolm.film.bean.Fc_admin_group;
 import com.egolm.film.bean.Fc_admin_group_filmtype;

src/main/java/com/egolm/film/api/admin/service/impl/AdminTokenServiceImpl.java → src/main/java/com/egolm/film/api/service/impl/AdminTokenServiceImpl.java

-package com.egolm.film.api.admin.service.impl;
+package com.egolm.film.api.service.impl;
 
 import java.util.Date;
 import java.util.List;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSON;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.web.ServletUtil;
-import com.egolm.film.api.admin.service.AdminTokenService;
+import com.egolm.film.api.service.AdminTokenService;
 import com.egolm.film.bean.Fc_admin;
 import com.egolm.film.config.WebMvcConfig;
 import com.egolm.film.config.XException;

src/main/java/com/egolm/film/api/admin/service/impl/AdminUserServiceImpl.java → src/main/java/com/egolm/film/api/service/impl/AdminUserServiceImpl.java

-package com.egolm.film.api.admin.service.impl;
+package com.egolm.film.api.service.impl;
 
 import java.util.List;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import com.egolm.common.StringUtil;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
-import com.egolm.film.api.admin.service.AdminUserService;
+import com.egolm.film.api.service.AdminUserService;
 import com.egolm.film.util.SqlWhere;
 
 @Service

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

-package com.egolm.film.api.common.service.impl;
+package com.egolm.film.api.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.api.common.service.CountryService;
+import com.egolm.film.api.service.CountryService;
 
 @Service
 public class CountryServiceImpl implements CountryService {

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

-package com.egolm.film.api.common.service.impl;
+package com.egolm.film.api.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.api.common.service.Messages;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.config.XException;
 
 @Component

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

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

src/main/java/com/egolm/film/api/admin/service/impl/AdminFirstServiceImpl.java → src/main/java/com/egolm/film/api/service/impl/FilmServiceImpl.java

-package com.egolm.film.api.admin.service.impl;
+package com.egolm.film.api.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.egolm.common.jdbc.JdbcTemplate;
-import com.egolm.film.api.admin.service.AdminFirstService;
+import com.egolm.film.api.service.FilmService;
 
 @Service
-public class AdminFirstServiceImpl implements AdminFirstService {
+public class FilmServiceImpl implements FilmService {
 
 	@Autowired
 	JdbcTemplate jdbcTemplate;
 
+	@Override
+	public void copyFilm(Integer member_film_id, Integer adminid) {
+		
+	}
+	
 }

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

-package com.egolm.film.api.common.service.impl;
+package com.egolm.film.api.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.api.common.service.LanguageService;
+import com.egolm.film.api.service.LanguageService;
 
 @Service
 public class LanguageServiceImpl implements LanguageService {

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

-package com.egolm.film.api.member.service.impl;
+package com.egolm.film.api.service.impl;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -19,8 +19,8 @@ import com.egolm.common.StringUtil;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 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.api.service.MemberService;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.bean.Fc_member_film;
 import com.egolm.film.bean.Fc_member_film_all;
@@ -503,4 +503,16 @@ public class MemberServiceImpl implements MemberService {
 		return jdbcTemplate.limit(sql, page, objs);
 	}
 
+	@Override
+	public void pass(Integer member_film_id) {
+		String sql = "update fc_member_film set apply_state = ? where id = ?";
+		jdbcTemplate.executeUpdate(sql, 2, member_film_id);
+	}
+
+	@Override
+	public void reject(Integer member_film_id) {
+		String sql = "update fc_member_film set apply_state = ? where id = ?";
+		jdbcTemplate.executeUpdate(sql, 3, member_film_id);
+	}
+
 }

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

-package com.egolm.film.api.member.service.impl;
+package com.egolm.film.api.service.impl;
 
 import java.util.Date;
 
@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSON;
 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.api.member.service.MemberTokenService;
+import com.egolm.film.api.service.MemberService;
+import com.egolm.film.api.service.MemberTokenService;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.config.WebMvcConfig;
 import com.egolm.film.config.XException;

src/main/java/com/egolm/film/api/user/service/impl/UserReviewServiceImpl.java → src/main/java/com/egolm/film/api/service/impl/UserReviewServiceImpl.java

+package com.egolm.film.api.service.impl;
 //package com.egolm.film.api.user.service.impl;
 //
 //import java.math.BigDecimal;

src/main/java/com/egolm/film/api/user/service/impl/UserTokenServiceImpl.java → src/main/java/com/egolm/film/api/service/impl/UserTokenServiceImpl.java

-package com.egolm.film.api.user.service.impl;
+package com.egolm.film.api.service.impl;
 
 import java.util.Date;
 
@@ -12,8 +12,8 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSON;
 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.user.service.UserTokenService;
+import com.egolm.film.api.service.Messages;
+import com.egolm.film.api.service.UserTokenService;
 import com.egolm.film.bean.Fc_user;
 import com.egolm.film.config.WebMvcConfig;
 import com.egolm.film.config.XException;

src/main/java/com/egolm/film/api/common/AliyunApiController.java → src/main/java/com/egolm/film/api/web/AliyunApiController.java

-package com.egolm.film.api.common;
+package com.egolm.film.api.web;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,7 +17,7 @@ import com.aliyuncs.vod.model.v20170321.GetVideoPlayAuthResponse;
 import com.aliyuncs.vod.model.v20170321.RefreshUploadVideoResponse;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
-import com.egolm.film.api.common.service.Messages;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.util.AliyunUtil;
 
 import io.swagger.annotations.Api;

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

-package com.egolm.film.api.common;
+package com.egolm.film.api.web;
 
 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.api.common.service.CountryService;
-import com.egolm.film.api.common.service.LanguageService;
+import com.egolm.film.api.service.CountryService;
+import com.egolm.film.api.service.LanguageService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/egolm/film/api/admin/AdminAuthController.java → src/main/java/com/egolm/film/api/web/admin/AdminAuthController.java

-package com.egolm.film.api.admin;
+package com.egolm.film.api.web.admin;
 
 import java.io.FileNotFoundException;
 import java.util.List;
@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
-import com.egolm.film.api.admin.service.AdminAuthService;
-import com.egolm.film.api.admin.service.AdminTokenService;
+import com.egolm.film.api.service.AdminAuthService;
+import com.egolm.film.api.service.AdminTokenService;
 import com.egolm.film.bean.Fc_admin;
 import com.egolm.film.bean.Fc_admin_group;
 import com.egolm.film.config.WebMvcConfig;

src/main/java/com/egolm/film/api/admin/AdminFirstController.java → src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java

-package com.egolm.film.api.admin;
+package com.egolm.film.api.web.admin;
 
 import java.util.List;
 import java.util.Map;
@@ -11,14 +11,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
-import com.egolm.film.api.admin.service.AdminFirstService;
-import com.egolm.film.api.admin.service.AdminTokenService;
-import com.egolm.film.api.member.service.MemberService;
+import com.egolm.film.api.service.AdminTokenService;
+import com.egolm.film.api.service.FilmService;
+import com.egolm.film.api.service.MemberService;
 import com.egolm.film.bean.Fc_member_film;
 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.model.LoginToken;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -36,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
 public class AdminFirstController {
 
 	@Autowired
-	AdminFirstService service;
+	FilmService service;
 	
 	@Autowired
 	MemberService memberService;
@@ -91,8 +92,10 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int", required=false, name="member_film_id", value="申报影片ID"),
 	})
 	public Object pass(Integer member_film_id) {
-//		LoginToken loginToken = tokenService.getToken();
-//		Integer adminid = (Integer)loginToken.getId();
+		LoginToken loginToken = tokenService.getToken();
+		Integer adminid = (Integer)loginToken.getId();
+		service.copyFilm(member_film_id, adminid);
+		memberService.pass(member_film_id);
 		return Rjx.jsonOk();
 	}
 	
@@ -103,6 +106,7 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int", required=false, name="member_film_id", value="申报影片ID"),
 	})
 	public Object reject(Integer member_film_id) {
+		memberService.reject(member_film_id);
 		return Rjx.jsonOk();
 	}
 	

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

-package com.egolm.film.api.admin;
+package com.egolm.film.api.web.admin;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -9,7 +9,7 @@ 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.admin.service.AdminTokenService;
+import com.egolm.film.api.service.AdminTokenService;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;
 

src/main/java/com/egolm/film/api/admin/AdminUserController.java → src/main/java/com/egolm/film/api/web/admin/AdminUserController.java

-package com.egolm.film.api.admin;
+package com.egolm.film.api.web.admin;
 
 import java.util.List;
 import java.util.Map;
@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
-import com.egolm.film.api.admin.service.AdminTokenService;
-import com.egolm.film.api.admin.service.AdminUserService;
+import com.egolm.film.api.service.AdminTokenService;
+import com.egolm.film.api.service.AdminUserService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/film/api/member/MemberApplyController.java → src/main/java/com/egolm/film/api/web/member/MemberApplyController.java

-package com.egolm.film.api.member;
+package com.egolm.film.api.web.member;
 
 import java.util.List;
 import java.util.Map;
@@ -12,8 +12,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.member.service.MemberService;
-import com.egolm.film.api.member.service.MemberTokenService;
+import com.egolm.film.api.service.MemberService;
+import com.egolm.film.api.service.MemberTokenService;
 import com.egolm.film.bean.Fc_member_film;
 import com.egolm.film.bean.Fc_member_film_all;
 import com.egolm.film.bean.Fc_member_film_director;

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

-package com.egolm.film.api.member;
+package com.egolm.film.api.web.member;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,9 +8,9 @@ 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.api.service.MemberService;
+import com.egolm.film.api.service.MemberTokenService;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;

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

-package com.egolm.film.api.member;
+package com.egolm.film.api.web.member;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -9,8 +9,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.api.service.MemberTokenService;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;
 

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

-package com.egolm.film.api.member;
+package com.egolm.film.api.web.member;
 
 import java.util.Locale;
 
@@ -17,9 +17,9 @@ 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.api.service.EmailService;
+import com.egolm.film.api.service.MemberService;
+import com.egolm.film.api.service.Messages;
 import com.egolm.film.bean.Fc_member;
 import com.egolm.film.config.XException;
 import com.egolm.film.config.interceptor.LocaleInterceptor;

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

-package com.egolm.film.api.user;
+package com.egolm.film.api.web.user;
 
 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.api.common.service.Messages;
-import com.egolm.film.api.user.service.UserTokenService;
+import com.egolm.film.api.service.Messages;
+import com.egolm.film.api.service.UserTokenService;
 import com.egolm.film.config.XException;
 import com.egolm.film.model.LoginToken;
 

src/main/java/com/egolm/film/api/user/UserReviewController.java → src/main/java/com/egolm/film/api/web/user/UserReviewController.java

+package com.egolm.film.api.web.user;
 //package com.egolm.film.api.user;
 //
 //import java.util.Date;

src/main/java/com/egolm/film/config/interceptor/AdminLoginInterceptor.java

@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import com.egolm.film.api.TokenService;
-import com.egolm.film.api.admin.service.AdminTokenService;
+import com.egolm.film.api.service.AdminTokenService;
+import com.egolm.film.api.service.TokenService;
 import com.egolm.film.config.XException;
 
 @Component

src/main/java/com/egolm/film/config/interceptor/MemberLoginInterceptor.java

@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import com.egolm.film.api.TokenService;
-import com.egolm.film.api.member.service.MemberTokenService;
+import com.egolm.film.api.service.MemberTokenService;
+import com.egolm.film.api.service.TokenService;
 import com.egolm.film.config.XException;
 
 @Component

src/main/java/com/egolm/film/config/interceptor/UserLoginInterceptor.java

@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import com.egolm.film.api.TokenService;
-import com.egolm.film.api.user.service.UserTokenService;
+import com.egolm.film.api.service.TokenService;
+import com.egolm.film.api.service.UserTokenService;
 import com.egolm.film.config.XException;
 
 @Component