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
26d8036d
Commit
26d8036d
authored
Jan 04, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pom
parent
dcd66421
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
20 deletions
+38
-20
workspace.xml
.idea/workspace.xml
+37
-19
pom.xml
pom.xml
+1
-1
No files found.
.idea/workspace.xml
View file @
26d8036d
...
...
@@ -3,8 +3,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
afterPath=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/pom.xml"
afterPath=
"$PROJECT_DIR$/pom.xml"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -25,7 +24,17 @@
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"applicationContext-schedule.xml"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"pom.xml"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"260"
>
<caret
line=
"119"
column=
"44"
lean-forward=
"false"
selection-start-line=
"119"
selection-start-column=
"44"
selection-end-line=
"119"
selection-end-column=
"44"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"applicationContext-schedule.xml"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"246"
>
...
...
@@ -38,8 +47,8 @@
<file
leaf-file-name=
"SyncAppDataTask.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
184
"
>
<caret
line=
"1
53"
column=
"24"
lean-forward=
"false"
selection-start-line=
"153"
selection-start-column=
"24"
selection-end-line=
"153"
selection-end-column=
"24
"
/>
<state
relative-caret-position=
"
368
"
>
<caret
line=
"1
61"
column=
"0"
lean-forward=
"true"
selection-start-line=
"161"
selection-start-column=
"0"
selection-end-line=
"161"
selection-end-column=
"0
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -129,9 +138,9 @@
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
</list>
</option>
</component>
...
...
@@ -991,7 +1000,7 @@
<workItem
from=
"1514942069837"
duration=
"3210000"
/>
<workItem
from=
"1514949451448"
duration=
"1759000"
/>
<workItem
from=
"1514965514914"
duration=
"4827000"
/>
<workItem
from=
"1515031568274"
duration=
"
1373
000"
/>
<workItem
from=
"1515031568274"
duration=
"
2365
000"
/>
</task>
<task
id=
"LOCAL-00003"
summary=
"Merge branch 'master' of git.minrow.com:reyun/manager # Conflicts: #	pom.xml #	target/classes/common.properties #	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst "
>
<created>
1514871143365
</created>
...
...
@@ -1105,11 +1114,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514974104697
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"19"
/>
<task
id=
"LOCAL-00019"
summary=
"pom"
>
<created>
1515032955423
</created>
<option
name=
"number"
value=
"00019"
/>
<option
name=
"presentableId"
value=
"LOCAL-00019"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1515032955423
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"20"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"8
3827
000"
/>
<option
name=
"totallyTimeSpent"
value=
"8
4819
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1163,7 +1179,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=
"7"
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=
"9"
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.
5155483"
sideWeight=
"0.50453
86"
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.
42389524"
sideWeight=
"0.506807
86"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Application Servers"
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=
"12"
side_tool=
"false"
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.46747354"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel Executor"
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=
"13"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1187,7 +1203,7 @@
<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=
"5"
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=
"14"
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.5155483"
sideWeight=
"0.49546143"
order=
"2"
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.
42389524"
sideWeight=
"0.4969743
"
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.
3584288"
sideWeight=
"0.49319214
"
order=
"9"
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.5581015"
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"
/>
...
...
@@ -1449,6 +1465,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"368"
>
<caret
line=
"16"
column=
"8"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"32"
selection-end-line=
"16"
selection-end-column=
"8"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1478,6 +1495,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"506"
>
<caret
line=
"22"
column=
"42"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"42"
selection-end-line=
"22"
selection-end-column=
"42"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1545,26 +1563,26 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
pom
.xml"
>
<entry
file=
"file://$PROJECT_DIR$/
src/main/resources/spring/applicationContext-schedule
.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
467
"
>
<caret
line=
"
119"
column=
"45"
lean-forward=
"false"
selection-start-line=
"119"
selection-start-column=
"45"
selection-end-line=
"119"
selection-end-column=
"45
"
/>
<state
relative-caret-position=
"
246
"
>
<caret
line=
"
35"
column=
"77"
lean-forward=
"false"
selection-start-line=
"35"
selection-start-column=
"77"
selection-end-line=
"35"
selection-end-column=
"77
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
184
"
>
<caret
line=
"1
53"
column=
"24"
lean-forward=
"false"
selection-start-line=
"153"
selection-start-column=
"24"
selection-end-line=
"153"
selection-end-column=
"24
"
/>
<state
relative-caret-position=
"
368
"
>
<caret
line=
"1
61"
column=
"0"
lean-forward=
"true"
selection-start-line=
"161"
selection-start-column=
"0"
selection-end-line=
"161"
selection-end-column=
"0
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
src/main/resources/spring/applicationContext-schedule
.xml"
>
<entry
file=
"file://$PROJECT_DIR$/
pom
.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
46
"
>
<caret
line=
"
35"
column=
"77"
lean-forward=
"false"
selection-start-line=
"35"
selection-start-column=
"77"
selection-end-line=
"35"
selection-end-column=
"77
"
/>
<state
relative-caret-position=
"2
60
"
>
<caret
line=
"
119"
column=
"44"
lean-forward=
"false"
selection-start-line=
"119"
selection-start-column=
"44"
selection-end-line=
"119"
selection-end-column=
"44
"
/>
<folding
/>
</state>
</provider>
...
...
pom.xml
View file @
26d8036d
...
...
@@ -117,7 +117,7 @@
<!-- 单位是分钟-->
<mail.valid_time>
3
</mail.valid_time>
<report.url>
http://172.31.
23.181:8003
</report.url>
<report.url>
http://172.31.
1.122:9010
</report.url>
<!--Redis setting-->
<redis.key.validtime>
120
</redis.key.validtime>
<redis.ip.requesttimes>
5
</redis.ip.requesttimes>
...
...
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