Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sentinel
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曲欣亮
sentinel
Commits
5cc1da7f
Commit
5cc1da7f
authored
Oct 25, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整结构
parent
de3a68e1
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
28 additions
and
22 deletions
+28
-22
TokenService.java
src/main/java/com/egolm/film/api/TokenService.java
+1
-1
AdminLoginController.java
...n/java/com/egolm/film/api/admin/AdminLoginController.java
+2
-2
AdminTokenService.java
...a/com/egolm/film/api/admin/service/AdminTokenService.java
+3
-1
AdminTokenServiceImpl.java
...lm/film/api/admin/service/impl/AdminTokenServiceImpl.java
+2
-2
MemberApplyController.java
...java/com/egolm/film/api/member/MemberApplyController.java
+1
-1
MemberInfoController.java
.../java/com/egolm/film/api/member/MemberInfoController.java
+1
-1
MemberLoginController.java
...java/com/egolm/film/api/member/MemberLoginController.java
+2
-2
MemberOpenApiController.java
...va/com/egolm/film/api/member/MemberOpenApiController.java
+1
-1
MemberTokenService.java
...com/egolm/film/api/member/service/MemberTokenService.java
+3
-1
MemberTokenServiceImpl.java
.../film/api/member/service/impl/MemberTokenServiceImpl.java
+2
-2
UserLoginController.java
...ain/java/com/egolm/film/api/user/UserLoginController.java
+2
-2
UserTokenService.java
...ava/com/egolm/film/api/user/service/UserTokenService.java
+3
-1
UserTokenServiceImpl.java
...golm/film/api/user/service/impl/UserTokenServiceImpl.java
+2
-2
AdminLoginInterceptor.java
.../egolm/film/config/interceptor/AdminLoginInterceptor.java
+1
-1
MemberLoginInterceptor.java
...egolm/film/config/interceptor/MemberLoginInterceptor.java
+1
-1
UserLoginInterceptor.java
...m/egolm/film/config/interceptor/UserLoginInterceptor.java
+1
-1
No files found.
src/main/java/com/egolm/film/
login/service
/TokenService.java
→
src/main/java/com/egolm/film/
api
/TokenService.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
.
service
;
package
com
.
egolm
.
film
.
api
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
...
...
src/main/java/com/egolm/film/
log
in/AdminLoginController.java
→
src/main/java/com/egolm/film/
api/adm
in/AdminLoginController.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
log
in
;
package
com
.
egolm
.
film
.
api
.
adm
in
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
...
@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.film.api.admin.service.AdminTokenService
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.AdminTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
...
src/main/java/com/egolm/film/
log
in/service/AdminTokenService.java
→
src/main/java/com/egolm/film/
api/adm
in/service/AdminTokenService.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
.
service
;
package
com
.
egolm
.
film
.
api
.
admin
.
service
;
import
com.egolm.film.api.TokenService
;
public
interface
AdminTokenService
extends
TokenService
{
public
interface
AdminTokenService
extends
TokenService
{
...
...
src/main/java/com/egolm/film/
log
in/service/impl/AdminTokenServiceImpl.java
→
src/main/java/com/egolm/film/
api/adm
in/service/impl/AdminTokenServiceImpl.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
log
in
.
service
.
impl
;
package
com
.
egolm
.
film
.
api
.
adm
in
.
service
.
impl
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
...
@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
import
com.egolm.common.StringUtil
;
import
com.egolm.common.StringUtil
;
import
com.egolm.common.jdbc.JdbcTemplate
;
import
com.egolm.common.jdbc.JdbcTemplate
;
import
com.egolm.film.api.admin.service.AdminTokenService
;
import
com.egolm.film.config.WebMvcConfig
;
import
com.egolm.film.config.WebMvcConfig
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.AdminTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
@Service
@Service
...
...
src/main/java/com/egolm/film/api/member/MemberApplyController.java
View file @
5cc1da7f
...
@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
...
@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.film.api.member.service.MemberService
;
import
com.egolm.film.api.member.service.MemberService
;
import
com.egolm.film.api.member.service.MemberTokenService
;
import
com.egolm.film.bean.Fc_member_film
;
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_all
;
import
com.egolm.film.bean.Fc_member_film_director
;
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_issuer
;
import
com.egolm.film.bean.Fc_member_film_playactor
;
import
com.egolm.film.bean.Fc_member_film_playactor
;
import
com.egolm.film.bean.Fc_member_film_show
;
import
com.egolm.film.bean.Fc_member_film_show
;
import
com.egolm.film.login.service.MemberTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
...
src/main/java/com/egolm/film/api/member/MemberInfoController.java
View file @
5cc1da7f
...
@@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
...
@@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.film.api.member.service.MemberService
;
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.bean.Fc_member
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.MemberTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
...
src/main/java/com/egolm/film/
login
/MemberLoginController.java
→
src/main/java/com/egolm/film/
api/member
/MemberLoginController.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
;
package
com
.
egolm
.
film
.
api
.
member
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
...
@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.film.api.member.service.MemberTokenService
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.MemberTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
...
src/main/java/com/egolm/film/api/MemberOpenApiController.java
→
src/main/java/com/egolm/film/api/
member/
MemberOpenApiController.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
api
;
package
com
.
egolm
.
film
.
api
.
member
;
import
java.util.Locale
;
import
java.util.Locale
;
...
...
src/main/java/com/egolm/film/
login
/service/MemberTokenService.java
→
src/main/java/com/egolm/film/
api/member
/service/MemberTokenService.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
.
service
;
package
com
.
egolm
.
film
.
api
.
member
.
service
;
import
com.egolm.film.api.TokenService
;
public
interface
MemberTokenService
extends
TokenService
{
public
interface
MemberTokenService
extends
TokenService
{
...
...
src/main/java/com/egolm/film/
login
/service/impl/MemberTokenServiceImpl.java
→
src/main/java/com/egolm/film/
api/member
/service/impl/MemberTokenServiceImpl.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
.
service
.
impl
;
package
com
.
egolm
.
film
.
api
.
member
.
service
.
impl
;
import
javax.servlet.http.HttpSession
;
import
javax.servlet.http.HttpSession
;
...
@@ -6,12 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -6,12 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.egolm.film.api.member.service.MemberService
;
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.bean.Fc_member
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.config.Common
;
import
com.egolm.film.config.Common
;
import
com.egolm.film.config.WebMvcConfig
;
import
com.egolm.film.config.WebMvcConfig
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.MemberTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
@Service
@Service
...
...
src/main/java/com/egolm/film/
login
/UserLoginController.java
→
src/main/java/com/egolm/film/
api/user
/UserLoginController.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
;
package
com
.
egolm
.
film
.
api
.
user
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
...
@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.common.bean.Rjx
;
import
com.egolm.film.api.user.service.UserTokenService
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.common.Messages
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.UserTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
...
src/main/java/com/egolm/film/
login
/service/UserTokenService.java
→
src/main/java/com/egolm/film/
api/user
/service/UserTokenService.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
.
service
;
package
com
.
egolm
.
film
.
api
.
user
.
service
;
import
com.egolm.film.api.TokenService
;
public
interface
UserTokenService
extends
TokenService
{
public
interface
UserTokenService
extends
TokenService
{
...
...
src/main/java/com/egolm/film/
login
/service/impl/UserTokenServiceImpl.java
→
src/main/java/com/egolm/film/
api/user
/service/impl/UserTokenServiceImpl.java
View file @
5cc1da7f
package
com
.
egolm
.
film
.
login
.
service
.
impl
;
package
com
.
egolm
.
film
.
api
.
user
.
service
.
impl
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
...
@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
import
com.egolm.common.StringUtil
;
import
com.egolm.common.StringUtil
;
import
com.egolm.common.jdbc.JdbcTemplate
;
import
com.egolm.common.jdbc.JdbcTemplate
;
import
com.egolm.film.api.user.service.UserTokenService
;
import
com.egolm.film.config.WebMvcConfig
;
import
com.egolm.film.config.WebMvcConfig
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.UserTokenService
;
import
com.egolm.film.model.LoginToken
;
import
com.egolm.film.model.LoginToken
;
@Service
@Service
...
...
src/main/java/com/egolm/film/config/interceptor/AdminLoginInterceptor.java
View file @
5cc1da7f
...
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
com.egolm.film.api.admin.service.AdminTokenService
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.AdminTokenService
;
@Component
@Component
public
class
AdminLoginInterceptor
extends
HandlerInterceptorAdapter
{
public
class
AdminLoginInterceptor
extends
HandlerInterceptorAdapter
{
...
...
src/main/java/com/egolm/film/config/interceptor/MemberLoginInterceptor.java
View file @
5cc1da7f
...
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
com.egolm.film.api.member.service.MemberTokenService
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.MemberTokenService
;
@Component
@Component
public
class
MemberLoginInterceptor
extends
HandlerInterceptorAdapter
{
public
class
MemberLoginInterceptor
extends
HandlerInterceptorAdapter
{
...
...
src/main/java/com/egolm/film/config/interceptor/UserLoginInterceptor.java
View file @
5cc1da7f
...
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
org.springframework.web.servlet.handler.HandlerInterceptorAdapter
;
import
com.egolm.film.api.user.service.UserTokenService
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.config.XException
;
import
com.egolm.film.login.service.UserTokenService
;
@Component
@Component
public
class
UserLoginInterceptor
extends
HandlerInterceptorAdapter
{
public
class
UserLoginInterceptor
extends
HandlerInterceptorAdapter
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment