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
1116b574
Commit
1116b574
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sendemail
parent
86d67ecd
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
workspace.xml
.idea/workspace.xml
+14
-9
applicationContext-schedule.xml
src/main/resources/spring/applicationContext-schedule.xml
+1
-1
No files found.
.idea/workspace.xml
View file @
1116b574
...
...
@@ -3,8 +3,6 @@
<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/ReportCallable.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java"
/>
<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"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
...
...
@@ -59,8 +57,8 @@
<file
leaf-file-name=
"applicationContext-schedule.xml"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
276
"
>
<caret
line=
"24"
column=
"6
3"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"63"
selection-end-line=
"24"
selection-end-column=
"63
"
/>
<state
relative-caret-position=
"
69
"
>
<caret
line=
"24"
column=
"6
4"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"64"
selection-end-line=
"24"
selection-end-column=
"64
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -972,7 +970,7 @@
<workItem
from=
"1514949451448"
duration=
"1759000"
/>
<workItem
from=
"1514965514914"
duration=
"4827000"
/>
<workItem
from=
"1515031568274"
duration=
"15108000"
/>
<workItem
from=
"1515114726844"
duration=
"
8245
000"
/>
<workItem
from=
"1515114726844"
duration=
"
9323
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>
...
...
@@ -1163,11 +1161,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1515133725442
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"30"
/>
<task
id=
"LOCAL-00030"
summary=
"sendemail"
>
<created>
1515140461187
</created>
<option
name=
"number"
value=
"00030"
/>
<option
name=
"presentableId"
value=
"LOCAL-00030"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1515140461187
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"31"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"10
5807
000"
/>
<option
name=
"totallyTimeSpent"
value=
"10
6885
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1692,8 +1697,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
276
"
>
<caret
line=
"24"
column=
"6
3"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"63"
selection-end-line=
"24"
selection-end-column=
"63
"
/>
<state
relative-caret-position=
"
69
"
>
<caret
line=
"24"
column=
"6
4"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"64"
selection-end-line=
"24"
selection-end-column=
"64
"
/>
<folding
/>
</state>
</provider>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/spring/applicationContext-schedule.xml
View file @
1116b574
...
...
@@ -22,7 +22,7 @@
<bean
id=
"emailTask"
class=
"tkio.task.SendEmailTask"
></bean>
<task:scheduled-tasks>
<task:scheduled
ref=
"emailTask"
method=
"task"
cron=
"0
27
16 * * ?"
/>
<task:scheduled
ref=
"emailTask"
method=
"task"
cron=
"0
55
16 * * ?"
/>
</task:scheduled-tasks>
<bean
id=
"trackAccountTask"
class=
"track.task.AccountTask"
></bean>
...
...
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