Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
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
reyun
manager
Commits
d2fb06fe
Commit
d2fb06fe
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
notice
parent
60fbe959
master
…
0727_bugfix
1082_bugfix
1151_bugfix
1209_bugfix
1315_bugfix
1439_bugfix
1608_bugfix
1608_from_1619
1619_bugfix
1990_bugfix
20180328_sale
20180411
20180525_adi
20180530_bpu
2578_bugfix
2580_fix
31762_2_bugfix
31762_bugfix
31969_bugfix
32400_fix
32599_bugfix
649_bugfix
back_version
back_version2
bigfix_20201028
bugfix_1608_new
bugfix_1760
bugfix_master_1760
change_double
contract_rela
develper
feature_20180116_new
liushaowei
manager_new
master_mv
mobvista_master
month_flow
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
278 additions
and
156 deletions
+278
-156
workspace.xml
.idea/workspace.xml
+196
-120
NoticeController.java
src/main/java/common/controller/NoticeController.java
+3
-3
UserController.java
src/main/java/common/controller/UserController.java
+32
-14
NoticeRepository.java
src/main/java/common/repository/NoticeRepository.java
+2
-0
NoticeService.java
src/main/java/common/service/NoticeService.java
+1
-1
UserService.java
src/main/java/common/service/UserService.java
+3
-3
NoticeServiceImpl.java
src/main/java/common/service/impl/NoticeServiceImpl.java
+14
-4
UserServiceImpl.java
src/main/java/common/service/impl/UserServiceImpl.java
+16
-7
AuthorizationInterceptor.java
...n/java/security/interceptor/AuthorizationInterceptor.java
+4
-1
NoticeTask.java
src/main/java/tkio/task/NoticeTask.java
+1
-1
createdFiles.lst
...-compiler-plugin/compile/default-compile/createdFiles.lst
+3
-1
inputFiles.lst
...en-compiler-plugin/compile/default-compile/inputFiles.lst
+3
-1
No files found.
.idea/workspace.xml
View file @
d2fb06fe
...
...
@@ -2,20 +2,16 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
""
>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/Notice.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/target/classes/common/controller/UserLogController.class"
afterPath=
"$PROJECT_DIR$/target/classes/common/controller/UserLogController.class"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/misc.xml"
afterPath=
"$PROJECT_DIR$/.idea/misc.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/manage.iml"
afterPath=
"$PROJECT_DIR$/manage.iml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"
afterPath=
"$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
afterPath=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
afterPath=
"$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
afterPath=
"$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
/>
</list>
...
...
@@ -34,11 +30,24 @@
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"Notice
Repository
.java"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/NoticeRepository
.java"
>
<file
leaf-file-name=
"Notice
Controller
.java"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/NoticeController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"276"
>
<caret
line=
"12"
column=
"0"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"0"
selection-end-line=
"12"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"260"
>
<caret
line=
"40"
column=
"9"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"9"
selection-end-line=
"40"
selection-end-column=
"9"
/>
<folding>
<element
signature=
"e#1296#1297#0"
expanded=
"true"
/>
<element
signature=
"e#1359#1360#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"NoticeTask.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"367"
>
<caret
line=
"103"
column=
"41"
lean-forward=
"false"
selection-start-line=
"103"
selection-start-column=
"41"
selection-end-line=
"103"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
...
...
@@ -46,6 +55,36 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"NoticeService.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"253"
>
<caret
line=
"14"
column=
"12"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"12"
selection-end-line=
"14"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"NoticeServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"367"
>
<caret
line=
"39"
column=
"41"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"34"
selection-end-line=
"39"
selection-end-column=
"41"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"NoticeRepository.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"253"
>
<caret
line=
"16"
column=
"54"
lean-forward=
"false"
selection-start-line=
"16"
selection-start-column=
"54"
selection-end-line=
"16"
selection-end-column=
"54"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
...
...
@@ -101,20 +140,23 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/UserLogThread.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Test.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Notice.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
/>
</list>
</option>
</component>
...
...
@@ -444,6 +486,36 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"manager"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"manager"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"src"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"main"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"java"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"common"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"controller"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane
id=
"Scope"
/>
...
...
@@ -1022,11 +1094,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514373074713
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"3"
/>
<task
id=
"LOCAL-00003"
summary=
"notice"
>
<created>
1514450722428
</created>
<option
name=
"number"
value=
"00003"
/>
<option
name=
"presentableId"
value=
"LOCAL-00003"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514450722428
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"4"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
1136
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
8064
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -1043,7 +1122,7 @@
<layout>
<window_info
id=
"Palette"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Nl-Palette"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
33"
sideWeight=
"0.5
"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
5400982"
sideWeight=
"0.5030257
"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Properties"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Tool"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1059,11 +1138,11 @@
<window_info
id=
"Image Layers"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Java Enterprise"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Analysis"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
5400982"
sideWeight=
"0.5
"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
43371522"
sideWeight=
"0.4969743
"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3289689"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Spring"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
true"
show_stripe_button=
"true"
weight=
"0.34493193
"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
false"
show_stripe_button=
"true"
weight=
"0.29198185
"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Web"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Find"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1082,7 +1161,7 @@
<window_info
id=
"Nl-Palette"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
33"
sideWeight=
"0.5
"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
5400982"
sideWeight=
"0.5030257
"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Properties"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Tool"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1100,12 +1179,12 @@
<window_info
id=
"Java Enterprise"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Analysis"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Inspection"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"12"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
5400982"
sideWeight=
"0.5
"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
43371522"
sideWeight=
"0.4969743
"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3289689"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Spring"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"CheckStyle"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.
34493193
"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.
29198185
"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Web"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Find"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1140,7 +1219,8 @@
<component
name=
"VcsManagerConfiguration"
>
<MESSAGE
value=
"解决报错"
/>
<MESSAGE
value=
"track客户管理"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"track客户管理"
/>
<MESSAGE
value=
"notice"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"notice"
/>
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
...
...
@@ -1160,33 +1240,6 @@
<option
name=
"FILTER_TARGETS"
value=
"false"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/util/ResultModel.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1034"
>
<caret
line=
"47"
column=
"30"
lean-forward=
"false"
selection-start-line=
"47"
selection-start-column=
"30"
selection-end-line=
"47"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#969#970#0"
expanded=
"false"
/>
<element
signature=
"e#1038#1039#0"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/AppInfo.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"242"
>
<caret
line=
"103"
column=
"32"
lean-forward=
"false"
selection-start-line=
"103"
selection-start-column=
"32"
selection-end-line=
"103"
selection-end-column=
"32"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1320"
>
<caret
line=
"111"
column=
"49"
lean-forward=
"false"
selection-start-line=
"111"
selection-start-column=
"49"
selection-end-line=
"111"
selection-end-column=
"49"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/applicationContext.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"46"
>
...
...
@@ -1207,21 +1260,16 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"132"
>
<caret
line=
"6"
column=
"12"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"12"
selection-end-line=
"6"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.java"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"110"
>
<caret
line=
"11"
column=
"53"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"32"
selection-end-line=
"11"
selection-end-column=
"53"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/util/IP.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1232,13 +1280,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/UserService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"154"
>
<caret
line=
"10"
column=
"17"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"17"
selection-end-line=
"10"
selection-end-column=
"17"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/AppService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"198"
>
...
...
@@ -1340,14 +1381,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"483"
>
<caret
line=
"63"
column=
"21"
lean-forward=
"false"
selection-start-line=
"63"
selection-start-column=
"21"
selection-end-line=
"63"
selection-end-column=
"21"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/track/model/App.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"345"
>
...
...
@@ -1363,13 +1396,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-414"
>
<caret
line=
"20"
column=
"13"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"13"
selection-end-line=
"20"
selection-end-column=
"13"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/track/repository/TrackAccountRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"253"
>
...
...
@@ -1473,16 +1499,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"413"
>
<caret
line=
"105"
column=
"42"
lean-forward=
"false"
selection-start-line=
"105"
selection-start-column=
"42"
selection-end-line=
"105"
selection-end-column=
"42"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/.idea/compiler.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -1612,55 +1628,114 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/NoticeService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountTask
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"322"
>
<caret
line=
"14"
column=
"25"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"25"
selection-end-line=
"14"
selection-end-column=
"25"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"1242"
>
<caret
line=
"71"
column=
"66"
lean-forward=
"false"
selection-start-line=
"71"
selection-start-column=
"66"
selection-end-line=
"71"
selection-end-column=
"66"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
service/impl/NoticeServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/CodeRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"390"
>
<caret
line=
"31"
column=
"30"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"30"
selection-end-line=
"31"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"184"
>
<caret
line=
"15"
column=
"9"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"9"
selection-end-line=
"15"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/NoticeController
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/UserRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"552"
>
<caret
line=
"44"
column=
"58"
lean-forward=
"false"
selection-start-line=
"44"
selection-start-column=
"58"
selection-end-line=
"44"
selection-end-column=
"58"
/>
<folding>
<element
signature=
"e#1080#1081#0"
expanded=
"true"
/>
<element
signature=
"e#1150#1151#0"
expanded=
"true"
/>
<element
signature=
"e#1358#1359#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"184"
>
<caret
line=
"14"
column=
"9"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"9"
selection-end-line=
"14"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountTask
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/impl/UserServiceImpl
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1242"
>
<caret
line=
"71"
column=
"66"
lean-forward=
"false"
selection-start-line=
"71"
selection-start-column=
"66"
selection-end-line=
"71"
selection-end-column=
"66"
/>
<state
relative-caret-position=
"275"
>
<caret
line=
"100"
column=
"44"
lean-forward=
"true"
selection-start-line=
"100"
selection-start-column=
"44"
selection-end-line=
"100"
selection-end-column=
"44"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"585"
>
<caret
line=
"61"
column=
"13"
lean-forward=
"false"
selection-start-line=
"61"
selection-start-column=
"13"
selection-end-line=
"61"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/UserService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"183"
>
<caret
line=
"20"
column=
"9"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"9"
selection-end-line=
"20"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"76"
>
<caret
line=
"44"
column=
"57"
lean-forward=
"false"
selection-start-line=
"44"
selection-start-column=
"57"
selection-end-line=
"44"
selection-end-column=
"57"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"182"
>
<caret
line=
"63"
column=
"29"
lean-forward=
"true"
selection-start-line=
"63"
selection-start-column=
"29"
selection-end-line=
"63"
selection-end-column=
"29"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"367"
>
<caret
line=
"39"
column=
"41"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"34"
selection-end-line=
"39"
selection-end-column=
"41"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"276"
>
<caret
line=
"12"
column=
"0"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"0"
selection-end-line=
"12"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"253"
>
<caret
line=
"16"
column=
"54"
lean-forward=
"false"
selection-start-line=
"16"
selection-start-column=
"54"
selection-end-line=
"16"
selection-end-column=
"54"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/NoticeService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"253"
>
<caret
line=
"14"
column=
"12"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"12"
selection-end-line=
"14"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"367"
>
<caret
line=
"103"
column=
"41"
lean-forward=
"false"
selection-start-line=
"103"
selection-start-column=
"41"
selection-end-line=
"103"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"260"
>
<caret
line=
"40"
column=
"9"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"9"
selection-end-line=
"40"
selection-end-column=
"9"
/>
<folding>
<element
signature=
"e#1296#1297#0"
expanded=
"true"
/>
<element
signature=
"e#1359#1360#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/common/controller/NoticeController.java
View file @
d2fb06fe
...
...
@@ -40,10 +40,10 @@ public class NoticeController {
return
ResultModel
.
OK
(
noticeService
.
findAll
(
user
));
}
@RequestMapping
(
value
=
"read
/{id}
"
,
method
=
RequestMethod
.
PUT
)
@RequestMapping
(
value
=
"read"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
loginCheck
(
@
PathVariable
Long
id
)
{
return
ResultModel
.
OK
(
noticeService
.
read
(
id
));
public
ResultModel
loginCheck
(
@
CurrentAccount
User
user
)
{
return
ResultModel
.
OK
(
noticeService
.
read
(
user
));
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/controller/UserController.java
View file @
d2fb06fe
...
...
@@ -2,12 +2,14 @@ package common.controller;
import
common.model.Menu
;
import
common.model.User
;
import
common.repository.UserRepository
;
import
common.service.MenuService
;
import
common.service.UserService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
security.annotation.CurrentAccount
;
import
util.CipherUtil
;
import
util.ResultModel
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -17,11 +19,14 @@ import java.util.List;
* Created by mxq on 2017/12/21.
*/
@Controller
@RequestMapping
(
"user"
)
@RequestMapping
(
"
system/
user"
)
public
class
UserController
{
@Autowired
private
UserService
userService
;
@Autowired
UserRepository
userRepository
;
@RequestMapping
(
value
=
"/create"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
...
...
@@ -51,20 +56,32 @@ public class UserController {
return
ResultModel
.
OK
();
}
@RequestMapping
(
value
=
"/update/
{id}
"
,
method
=
RequestMethod
.
PUT
)
@RequestMapping
(
value
=
"/update/
name
"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updateName
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
name
,
@PathVariable
Long
id
)
{
userService
.
updateName
(
loginAccount
,
id
,
name
);
return
ResultModel
.
OK
();
public
ResultModel
updateName
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
name
)
{
User
login
=
userRepository
.
login
(
name
);
if
(
null
==
login
){
userService
.
updateName
(
loginAccount
,
name
);
return
ResultModel
.
OK
(
true
);
}
else
{
return
ResultModel
.
OK
(
false
);
}
}
@RequestMapping
(
value
=
"/update/
{id}/pw
d"
,
method
=
RequestMethod
.
PUT
)
@RequestMapping
(
value
=
"/update/
passwor
d"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updatePwd
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
pwd
,
@PathVariable
Long
id
)
{
userService
.
updatePwd
(
loginAccount
,
id
,
pwd
);
return
ResultModel
.
OK
();
public
ResultModel
updatePwd
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
pwd
,
@RequestParam
String
oldpwd
)
{
User
login
=
userRepository
.
login
(
loginAccount
.
getEmail
(),
CipherUtil
.
generatePassword
(
oldpwd
));
if
(
null
!=
login
){
userService
.
updatePwd
(
loginAccount
,
pwd
);
return
ResultModel
.
OK
(
true
);
}
else
{
return
ResultModel
.
OK
(
false
);
}
}
//忘记密码时,修改密码
@RequestMapping
(
value
=
"/update/pwd"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updatePwd
(
@RequestParam
String
email
,
@RequestParam
String
pwd
)
{
...
...
@@ -72,17 +89,18 @@ public class UserController {
return
ResultModel
.
OK
(
userService
.
updatePwd
(
email
,
pwd
));
}
@RequestMapping
(
value
=
"forget/"
,
method
=
RequestMethod
.
GET
)
//忘记密码时,发送验证码
@RequestMapping
(
value
=
"/code"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
sengCode
(
@RequestParam
String
email
)
{
return
ResultModel
.
OK
(
userService
.
sendCode
(
email
));
}
@RequestMapping
(
value
=
"valid/code"
,
method
=
RequestMethod
.
GET
)
//验证码验证
@RequestMapping
(
value
=
"/update/pwd"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
validCode
(
@RequestParam
String
email
,
@RequestParam
String
code
)
{
userService
.
validCode
(
email
,
code
);
return
ResultModel
.
OK
();
public
ResultModel
validCode
(
@RequestParam
String
email
,
@RequestParam
String
code
,
@RequestParam
String
pwd
)
{
return
ResultModel
.
OK
(
userService
.
validCode
(
email
,
code
,
pwd
));
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/repository/NoticeRepository.java
View file @
d2fb06fe
...
...
@@ -14,4 +14,6 @@ public interface NoticeRepository extends JpaRepository<Notice, Long> {
@Query
(
value
=
"select * from notice where user = ?1 and ds >= ?2"
,
nativeQuery
=
true
)
List
<
Notice
>
findall
(
Long
user
,
String
ds
);
@Query
(
value
=
"select * from notice where user = ?1"
,
nativeQuery
=
true
)
List
<
Notice
>
findall
(
Long
user
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/NoticeService.java
View file @
d2fb06fe
...
...
@@ -12,5 +12,5 @@ public interface NoticeService {
List
<
Notice
>
findAll
(
User
user
);
Notice
read
(
Long
id
);
Boolean
read
(
User
user
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/UserService.java
View file @
d2fb06fe
...
...
@@ -18,13 +18,13 @@ public interface UserService {
User
delete
(
User
login
,
Long
id
);
User
updateName
(
User
login
,
Long
id
,
String
name
);
User
updateName
(
User
login
,
String
name
);
User
updatePwd
(
User
login
,
Long
id
,
String
pwd
);
User
updatePwd
(
User
login
,
String
pwd
);
User
updatePwd
(
String
email
,
String
pwd
);
Boolean
sendCode
(
String
email
);
String
validCode
(
String
email
,
String
code
);
String
validCode
(
String
email
,
String
code
,
String
pwd
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/NoticeServiceImpl.java
View file @
d2fb06fe
...
...
@@ -7,7 +7,9 @@ import common.service.NoticeService;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
util.DateUtil
;
import
util.ValidateUtil
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -27,9 +29,17 @@ public class NoticeServiceImpl implements NoticeService {
}
@Override
public
Notice
read
(
Long
id
)
{
Notice
one
=
noticeRepository
.
findOne
(
id
);
one
.
setNotRead
(
false
);
return
noticeRepository
.
save
(
one
);
public
Boolean
read
(
User
user
)
{
List
<
Notice
>
noticeList
=
noticeRepository
.
findall
(
user
.
getId
());
if
(
ValidateUtil
.
isValid
(
noticeList
)){
List
<
Notice
>
notices
=
new
ArrayList
<>();
for
(
Notice
n
:
noticeList
){
n
.
setNotRead
(
false
);
notices
.
add
(
n
);
}
noticeRepository
.
save
(
notices
);
}
return
true
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/UserServiceImpl.java
View file @
d2fb06fe
...
...
@@ -94,8 +94,8 @@ public class UserServiceImpl implements UserService {
}
@Override
public
User
updateName
(
User
login
,
Long
id
,
String
name
)
{
User
one
=
userRepository
.
findOne
(
id
);
public
User
updateName
(
User
login
,
String
name
)
{
User
one
=
userRepository
.
findOne
(
login
.
getId
()
);
one
.
setName
(
name
);
one
.
setModifyTime
(
new
Date
());
one
.
setModifyAccount
(
login
.
getId
());
...
...
@@ -103,8 +103,8 @@ public class UserServiceImpl implements UserService {
}
@Override
public
User
updatePwd
(
User
login
,
Long
id
,
String
pwd
)
{
User
one
=
userRepository
.
findOne
(
id
);
public
User
updatePwd
(
User
login
,
String
pwd
)
{
User
one
=
userRepository
.
findOne
(
login
.
getId
()
);
one
.
setPassword
(
CipherUtil
.
generatePassword
(
pwd
));
one
.
setModifyTime
(
new
Date
());
one
.
setModifyAccount
(
login
.
getId
());
...
...
@@ -122,6 +122,10 @@ public class UserServiceImpl implements UserService {
@Override
public
Boolean
sendCode
(
String
email
)
{
User
user
=
userRepository
.
login
(
email
);
if
(
null
==
user
){
return
false
;
}
String
code
=
CharacterUtils
.
getRandomString
(
4
);
List
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
email
);
...
...
@@ -140,15 +144,20 @@ public class UserServiceImpl implements UserService {
}
@Override
public
String
validCode
(
String
email
,
String
code
)
{
Code
valid
=
codeRepository
.
findValid
(
email
,
new
Date
());
public
String
validCode
(
String
email
,
String
code
,
String
pwd
)
{
Calendar
beforeTime
=
Calendar
.
getInstance
();
beforeTime
.
add
(
Calendar
.
MINUTE
,
-
5
);
// 5分钟之前的时间
Date
beforeD
=
beforeTime
.
getTime
();
Code
valid
=
codeRepository
.
findValid
(
email
,
beforeD
);
if
(
null
!=
valid
){
boolean
b
=
valid
.
getCode
().
equals
(
code
);
if
(
b
){
updatePwd
(
email
,
pwd
);
return
"true"
;
}
return
"false"
;
}
return
"
invalid
"
;
return
"
false
"
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/security/interceptor/AuthorizationInterceptor.java
View file @
d2fb06fe
...
...
@@ -39,7 +39,10 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
public
boolean
preHandle
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
{
//放开登录
if
(
request
.
getRequestURL
().
indexOf
(
"login/login"
)
!=
-
1
){
if
(
request
.
getRequestURL
().
indexOf
(
"login/login"
)
!=
-
1
||
request
.
getRequestURL
().
indexOf
(
"update/pwd"
)
!=
-
1
||
request
.
getRequestURL
().
indexOf
(
"user/forget"
)
!=
-
1
||
request
.
getRequestURL
().
indexOf
(
"user/code"
)
!=
-
1
){
return
true
;
}
//从header中得到token
...
...
This diff is collapsed.
Click to expand it.
src/main/java/tkio/task/NoticeTask.java
View file @
d2fb06fe
...
...
@@ -101,7 +101,7 @@ public class NoticeTask {
Notice
notice
=
new
Notice
();
notice
.
setUser
(
id
);
notice
.
setPlatform
(
"tkio"
);
notice
.
setContent
(
"tkio有"
+
num
+
"个客户过期,请及时联系客户"
);
notice
.
setContent
(
"
今日
tkio有"
+
num
+
"个客户过期,请及时联系客户"
);
notice
.
setDs
(
today
);
notice
.
setNotRead
(
true
);
list
.
add
(
notice
);
...
...
This diff is collapsed.
Click to expand it.
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View file @
d2fb06fe
...
...
@@ -11,6 +11,7 @@ common\model\Auth.class
tkio\repository\AccountRepository.class
common\model\Menu.class
track\repository\TrackAppRepository.class
common\service\impl\NoticeServiceImpl.class
exception\GlobalExceptionAdvice.class
tkio\model\Campaign.class
security\RedisTokenManager.class
...
...
@@ -54,6 +55,7 @@ common\repository\MenuRepository.class
common\model\City.class
common\service\impl\AppServiceImpl.class
common\repository\ReminderRepository.class
common\controller\NoticeController.class
util\StringUtil.class
track\model\Channel.class
track\model\Campaign.class
...
...
@@ -75,7 +77,6 @@ tkio\service\AccountFlowRestrictService.class
util\UserLogThread.class
tkio\model\DataAuth.class
common\model\KeyValue.class
common\model\Test.class
common\repository\UserRepository.class
track\repository\TrackCampaignRepository.class
util\ResultModel.class
...
...
@@ -87,6 +88,7 @@ security\resolvers\LoginUserMethodArgumentsResolver.class
tkio\service\TkioAccountService.class
common\model\TrackAccount4Web.class
common\repository\NoticeRepository.class
common\service\NoticeService.class
common\model\RoleType.class
tkio\task\AccountTask.class
security\annotation\Authorization.class
...
...
This diff is collapsed.
Click to expand it.
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file @
d2fb06fe
...
...
@@ -34,6 +34,7 @@ E:\newgit\manager\src\main\java\security\AbstractTokenManager.java
E:\newgit\manager\src\main\java\util\CharacterUtils.java
E:\newgit\manager\src\main\java\common\repository\Account4WebRepository.java
E:\newgit\manager\src\main\java\track\model\Account.java
E:\newgit\manager\src\main\java\common\controller\NoticeController.java
E:\newgit\manager\src\main\java\tkio\repository\PackageTypeRepository.java
E:\newgit\manager\src\main\java\common\service\UserLogService.java
E:\newgit\manager\src\main\java\common\repository\MenuRepository.java
...
...
@@ -72,6 +73,7 @@ E:\newgit\manager\src\main\java\common\model\Email.java
E:\newgit\manager\src\main\java\common\repository\ReminderRepository.java
E:\newgit\manager\src\main\java\common\model\RoleType.java
E:\newgit\manager\src\main\java\exception\TipException.java
E:\newgit\manager\src\main\java\common\service\impl\NoticeServiceImpl.java
E:\newgit\manager\src\main\java\track\repository\TrackChannelRepository.java
E:\newgit\manager\src\main\java\tkio\model\App.java
E:\newgit\manager\src\main\java\track\model\Channel.java
...
...
@@ -81,7 +83,6 @@ E:\newgit\manager\src\main\java\security\TokenManager.java
E:\newgit\manager\src\main\java\common\repository\CodeRepository.java
E:\newgit\manager\src\main\java\dic\OperateObjectTypeEnum.java
E:\newgit\manager\src\main\java\util\HttpClientUtil.java
E:\newgit\manager\src\main\java\common\model\Test.java
E:\newgit\manager\src\main\java\tkio\model\Auth.java
E:\newgit\manager\src\main\java\common\repository\AppInfoRepository.java
E:\newgit\manager\src\main\java\track\model\App.java
...
...
@@ -117,5 +118,6 @@ E:\newgit\manager\src\main\java\common\model\City.java
E:\newgit\manager\src\main\java\common\model\AppCategory.java
E:\newgit\manager\src\main\java\common\model\Reminder.java
E:\newgit\manager\src\main\java\tkio\repository\SalesManLeaderRepository.java
E:\newgit\manager\src\main\java\common\service\NoticeService.java
E:\newgit\manager\src\main\java\tkio\model\IsNotified.java
E:\newgit\manager\src\main\java\util\IP.java
This diff is collapsed.
Click to expand it.
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