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
938a335e
Commit
938a335e
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二版
parent
d40b99e5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
146 additions
and
147 deletions
+146
-147
workspace.xml
.idea/workspace.xml
+126
-127
pom.xml
pom.xml
+2
-2
AccountFlowRestrictServiceImpl.java
...ava/tkio/service/impl/AccountFlowRestrictServiceImpl.java
+1
-1
AccountTask.java
src/main/java/tkio/task/AccountTask.java
+16
-16
applicationContext-schedule.xml
src/main/resources/spring/applicationContext-schedule.xml
+1
-1
No files found.
.idea/workspace.xml
View file @
938a335e
...
...
@@ -3,11 +3,10 @@
<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/controller/ContractController.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/pom.xml"
afterPath=
"$PROJECT_DIR$/pom.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.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/spring/applicationContext-schedule.xml"
afterPath=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -28,16 +27,6 @@
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"TkioAccountController.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"368"
>
<caret
line=
"36"
column=
"57"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"57"
selection-end-line=
"36"
selection-end-column=
"57"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractController.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -48,71 +37,51 @@
</provider>
</entry>
</file>
<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=
"844"
>
<caret
line=
"44"
column=
"65"
lean-forward=
"false"
selection-start-line=
"44"
selection-start-column=
"65"
selection-end-line=
"44"
selection-end-column=
"65"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractService.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"206"
>
<caret
line=
"15"
column=
"21"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"21"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<file
leaf-file-name=
"pom.xml"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"3
06
"
>
<caret
line=
"
573"
column=
"16"
lean-forward=
"true"
selection-start-line=
"573"
selection-start-column=
"16"
selection-end-line=
"573"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"3
20
"
>
<caret
line=
"
71"
column=
"55"
lean-forward=
"true"
selection-start-line=
"71"
selection-start-column=
"55"
selection-end-line=
"71"
selection-end-column=
"55
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
UserService.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/common/service/UserService.java
"
>
<file
leaf-file-name=
"
applicationContext-schedule.xml"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/spring/applicationContext-schedule.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
398
"
>
<caret
line=
"
40"
column=
"15"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"15"
selection-end-line=
"40"
selection-end-column=
"15
"
/>
<state
relative-caret-position=
"
154
"
>
<caret
line=
"
14"
column=
"82"
lean-forward=
"true"
selection-start-line=
"14"
selection-start-column=
"82"
selection-end-line=
"14"
selection-end-column=
"82
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
ContractRepository
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/repository/ContractRepository
.java"
>
<file
leaf-file-name=
"
AccountTask
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountTask
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
252
"
>
<caret
line=
"
39"
column=
"54"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"13"
selection-end-line=
"39"
selection-end-column=
"54
"
/>
<state
relative-caret-position=
"
91
"
>
<caret
line=
"
79"
column=
"93"
lean-forward=
"false"
selection-start-line=
"79"
selection-start-column=
"93"
selection-end-line=
"79"
selection-end-column=
"93
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
TkioAccountService
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/
TkioAccountService
.java"
>
<file
leaf-file-name=
"
AccountFlowRestrictServiceImpl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/
impl/AccountFlowRestrictServiceImpl
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
94
"
>
<caret
line=
"1
3"
column=
"16"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"16"
selection-end-line=
"13"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"1
02
"
>
<caret
line=
"1
94"
column=
"19"
lean-forward=
"false"
selection-start-line=
"194"
selection-start-column=
"19"
selection-end-line=
"194"
selection-end-column=
"19
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
TkioAccountServiceImpl.java
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/tkio/service/impl/TkioAccountServiceImpl.java
"
>
<file
leaf-file-name=
"
common.properties
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/common.properties
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
344
"
>
<caret
line=
"
112"
column=
"58"
lean-forward=
"false"
selection-start-line=
"112"
selection-start-column=
"58"
selection-end-line=
"112"
selection-end-column=
"58
"
/>
<state
relative-caret-position=
"
0
"
>
<caret
line=
"
0"
column=
"16"
lean-forward=
"true"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"1"
selection-end-column=
"0
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -205,7 +174,6 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/IOAccount4Web.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/PressMoneyRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractIncrementRepository.java"
/>
...
...
@@ -215,9 +183,7 @@
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/Crowd.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/CrowdRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"
/>
...
...
@@ -226,12 +192,15 @@
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/IncrementFlowRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/Account.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
</list>
</option>
</component>
...
...
@@ -556,6 +525,36 @@
<option
name=
"myItemId"
value=
"tkio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"task"
/>
<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=
"tkio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
...
...
@@ -1176,14 +1175,7 @@
<workItem
from=
"1517902340876"
duration=
"6159000"
/>
<workItem
from=
"1522052551509"
duration=
"4324000"
/>
<workItem
from=
"1523843445576"
duration=
"7238000"
/>
<workItem
from=
"1523876594256"
duration=
"73571000"
/>
</task>
<task
id=
"LOCAL-00051"
summary=
"合同"
>
<created>
1516611136767
</created>
<option
name=
"number"
value=
"00051"
/>
<option
name=
"presentableId"
value=
"LOCAL-00051"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1516611136768
</updated>
<workItem
from=
"1523876594256"
duration=
"75800000"
/>
</task>
<task
id=
"LOCAL-00052"
summary=
"合同"
>
<created>
1516671393123
</created>
...
...
@@ -1521,11 +1513,18 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524209788379
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"100"
/>
<task
id=
"LOCAL-00100"
summary=
"二版 "
>
<created>
1524449063751
</created>
<option
name=
"number"
value=
"00100"
/>
<option
name=
"presentableId"
value=
"LOCAL-00100"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524449063751
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"101"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"46
0918
000"
/>
<option
name=
"totallyTimeSpent"
value=
"46
3147
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
...
...
@@ -1679,22 +1678,6 @@
<option
name=
"FILTER_TARGETS"
value=
"false"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/userio/service/IOSalesManService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"6"
column=
"10"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"10"
selection-end-line=
"6"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"253"
>
<caret
line=
"22"
column=
"85"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"75"
selection-end-line=
"22"
selection-end-column=
"85"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/SalesManService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
...
...
@@ -1834,14 +1817,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"252"
>
<caret
line=
"25"
column=
"41"
lean-forward=
"false"
selection-start-line=
"25"
selection-start-column=
"18"
selection-end-line=
"25"
selection-end-column=
"41"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
...
...
@@ -1870,30 +1845,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"12"
column=
"24"
lean-forward=
"false"
selection-start-line=
"12"
selection-start-column=
"24"
selection-end-line=
"12"
selection-end-column=
"24"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"815"
>
<caret
line=
"153"
column=
"72"
lean-forward=
"true"
selection-start-line=
"153"
selection-start-column=
"72"
selection-end-line=
"153"
selection-end-column=
"72"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"160"
>
<caret
line=
"79"
column=
"97"
lean-forward=
"false"
selection-start-line=
"79"
selection-start-column=
"97"
selection-end-line=
"79"
selection-end-column=
"97"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
...
...
@@ -1995,14 +1946,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"103"
column=
"62"
lean-forward=
"false"
selection-start-line=
"103"
selection-start-column=
"47"
selection-end-line=
"103"
selection-end-column=
"62"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"552"
>
...
...
@@ -2101,6 +2044,30 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"19"
column=
"18"
lean-forward=
"false"
selection-start-line=
"19"
selection-start-column=
"18"
selection-end-line=
"19"
selection-end-column=
"18"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/util/Constant.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"22"
column=
"66"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"66"
selection-end-line=
"22"
selection-end-column=
"66"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/common.properties"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"16"
lean-forward=
"true"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"1"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"260"
>
...
...
@@ -2109,10 +2076,42 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"320"
>
<caret
line=
"71"
column=
"55"
lean-forward=
"true"
selection-start-line=
"71"
selection-start-column=
"55"
selection-end-line=
"71"
selection-end-column=
"55"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"12"
column=
"24"
lean-forward=
"false"
selection-start-line=
"12"
selection-start-column=
"24"
selection-end-line=
"12"
selection-end-column=
"24"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"102"
>
<caret
line=
"194"
column=
"19"
lean-forward=
"false"
selection-start-line=
"194"
selection-start-column=
"19"
selection-end-line=
"194"
selection-end-column=
"19"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"91"
>
<caret
line=
"79"
column=
"93"
lean-forward=
"false"
selection-start-line=
"79"
selection-start-column=
"93"
selection-end-line=
"79"
selection-end-column=
"93"
/>
<folding
/>
</state>
</provider>
</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=
"
84
4"
>
<caret
line=
"
44"
column=
"65"
lean-forward=
"false"
selection-start-line=
"44"
selection-start-column=
"65"
selection-end-line=
"44"
selection-end-column=
"65
"
/>
<state
relative-caret-position=
"
15
4"
>
<caret
line=
"
14"
column=
"82"
lean-forward=
"true"
selection-start-line=
"14"
selection-start-column=
"82"
selection-end-line=
"14"
selection-end-column=
"82
"
/>
<folding
/>
</state>
</provider>
...
...
This diff is collapsed.
Click to expand it.
pom.xml
View file @
938a335e
...
...
@@ -69,7 +69,7 @@
<!-- 单位是分钟-->
<mail.valid_time>
3
</mail.valid_time>
<report.url>
http://1
72.31.1.122
:9010
</report.url>
<report.url>
http://1
0.3.20.41
:9010
</report.url>
<!--Redis setting-->
<redis.key.validtime>
120
</redis.key.validtime>
...
...
@@ -125,7 +125,7 @@
<!-- 单位是分钟-->
<mail.valid_time>
3
</mail.valid_time>
<report.url>
http://
172.31.23.181:8003
</report.url>
<report.url>
http://
localhost:9010
</report.url>
<!--Redis setting-->
<redis.key.validtime>
120
</redis.key.validtime>
<redis.ip.requesttimes>
5
</redis.ip.requesttimes>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java
View file @
938a335e
...
...
@@ -192,7 +192,7 @@ public class AccountFlowRestrictServiceImpl implements AccountFlowRestrictServic
}
//是否流量用尽
if
(
!
ioFlag
&&
!
trackFlag
){
if
(
trackFlag
){
accountRestrict4Web
.
setIOFlowNotified
(
false
);
}
else
{
accountRestrict4Web
.
setIOFlowNotified
(
true
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/tkio/task/AccountTask.java
View file @
938a335e
...
...
@@ -90,22 +90,22 @@ public class AccountTask {
account4Web
.
setTrackLimit
(
restrict4Web
.
getTrackLimit
());
account4Web
.
setIoStatus
(
restrict4Web
.
getAllowBehavior
());
account4Web
.
setTrackStatus
(
restrict4Web
.
getTrackFlowNotified
());
double
f
=
1.0
;
if
((
account4Web
.
getIo
().
doubleValue
()
!=
0
)
&&
(
null
!=
account4Web
.
getIoLimit
())){
if
(
account4Web
.
getIo
().
doubleValue
()
>
account4Web
.
getIoLimit
().
doubleValue
()){
account4Web
.
setIoStatus
(
false
);
account4Web
.
setStatus
(
"流量用尽"
);
}
else
{
account4Web
.
setIoStatus
(
true
);
}
}
else
{
account4Web
.
setIoStatus
(
true
);
}
if
(
account4Web
.
getIoLimit
().
doubleValue
()
==
-
1
){
account4Web
.
setIoStatus
(
true
);
account4Web
.
setStatus
(
"已激活"
);
}
//
double f = 1.0;
//
if((account4Web.getIo().doubleValue() != 0) && (null != account4Web.getIoLimit())){
//
if(account4Web.getIo().doubleValue() > account4Web.getIoLimit().doubleValue()){
//
account4Web.setIoStatus(false);
//
account4Web.setStatus("流量用尽");
//
}else{
//
account4Web.setIoStatus(true);
//
}
//
}else {
//
account4Web.setIoStatus(true);
//
}
//
if(account4Web.getIoLimit().doubleValue() == -1){
//
account4Web.setIoStatus(true);
//
account4Web.setStatus("已激活");
//
//
}
if
(
account4Web
.
getTrackLimit
().
doubleValue
()
==
-
1
){
account4Web
.
setTrackStatus
(
true
);
account4Web
.
setStatus
(
"已激活"
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/spring/applicationContext-schedule.xml
View file @
938a335e
...
...
@@ -12,7 +12,7 @@
<bean
id=
"tkioAccountTask"
class=
"tkio.task.AccountTask"
></bean>
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled
ref=
"tkioAccountTask"
method=
"task"
cron=
"0
10
10 * * ?"
/>
<task:scheduled
ref=
"tkioAccountTask"
method=
"task"
cron=
"0
45
10 * * ?"
/>
</task:scheduled-tasks>
<bean
id=
"tkioNoticeTask"
class=
"tkio.task.NoticeTask"
></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