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
0e91d6b6
Commit
0e91d6b6
authored
May 30, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adi
parent
c5c1e13d
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
533 additions
and
667 deletions
+533
-667
workspace.xml
.idea/workspace.xml
+311
-613
pom.xml
pom.xml
+1
-1
ContractController.java
src/main/java/common/controller/ContractController.java
+14
-14
UserLog.java
src/main/java/common/model/UserLog.java
+9
-0
ContractService.java
src/main/java/common/service/ContractService.java
+1
-1
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+90
-16
AuthorizationInterceptor.java
...n/java/security/interceptor/AuthorizationInterceptor.java
+15
-5
HttpClientUtil.java
src/main/java/util/HttpClientUtil.java
+85
-16
NewUserLogThread.java
src/main/java/util/NewUserLogThread.java
+3
-1
UserLogThread.java
src/main/java/util/UserLogThread.java
+2
-0
rest-servlet.xml
src/main/resources/rest-servlet.xml
+1
-0
applicationContext.xml
src/main/resources/spring/applicationContext.xml
+1
-0
No files found.
.idea/workspace.xml
View file @
0e91d6b6
...
...
@@ -3,7 +3,17 @@
<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/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"
/>
<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/model/UserLog.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/UserLog.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/security/interceptor/AuthorizationInterceptor.java"
afterPath=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/util/HttpClientUtil.java"
afterPath=
"$PROJECT_DIR$/src/main/java/util/HttpClientUtil.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java"
afterPath=
"$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/util/UserLogThread.java"
afterPath=
"$PROJECT_DIR$/src/main/java/util/UserLogThread.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/resources/rest-servlet.xml"
afterPath=
"$PROJECT_DIR$/src/main/resources/rest-servlet.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"
afterPath=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -32,104 +42,105 @@
<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=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/spring/applicationContext-schedule.xml
"
>
<file
leaf-file-name=
"
ADIAccountService.java
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/adi/service/ADIAccountService.java
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
182
"
>
<caret
line=
"
56"
column=
"57"
lean-forward=
"false"
selection-start-line=
"56"
selection-start-column=
"57"
selection-end-line=
"56"
selection-end-column=
"57
"
/>
<state
relative-caret-position=
"
460
"
>
<caret
line=
"
24"
column=
"16"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"16"
selection-end-line=
"24"
selection-end-column=
"16
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
Account4Web
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/Account4Web
.java"
>
<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"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1610"
>
<caret
line=
"108"
column=
"16"
lean-forward=
"false"
selection-start-line=
"108"
selection-start-column=
"16"
selection-end-line=
"108"
selection-end-column=
"16"
/>
<folding>
<element
signature=
"e#2345#2346#0"
expanded=
"true"
/>
<element
signature=
"e#2381#2382#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"4393"
>
<caret
line=
"235"
column=
"22"
lean-forward=
"false"
selection-start-line=
"235"
selection-start-column=
"22"
selection-end-line=
"235"
selection-end-column=
"22"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
AccountServiceImpl.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/AccountServiceImpl
.java"
>
<file
leaf-file-name=
"
ContractController.java"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/controller/ContractController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
31
1"
>
<caret
line=
"
69"
column=
"23"
lean-forward=
"false"
selection-start-line=
"69"
selection-start-column=
"23"
selection-end-line=
"69"
selection-end-column=
"23
"
/>
<state
relative-caret-position=
"1
7
1"
>
<caret
line=
"
195"
column=
"45"
lean-forward=
"false"
selection-start-line=
"195"
selection-start-column=
"31"
selection-end-line=
"195"
selection-end-column=
"45
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"A
ccountCheck.java"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountCheck
.java"
>
<file
leaf-file-name=
"A
DISaleMap.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
office/model/ADISaleMap
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"114"
>
<caret
line=
"27"
column=
"18"
lean-forward=
"true"
selection-start-line=
"27"
selection-start-column=
"18"
selection-end-line=
"27"
selection-end-column=
"18"
/>
<folding
/>
<state
relative-caret-position=
"851"
>
<caret
line=
"57"
column=
"0"
lean-forward=
"false"
selection-start-line=
"57"
selection-start-column=
"0"
selection-end-line=
"57"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
applicationContext.xml
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/spring/applicationContext.xml
"
>
<file
leaf-file-name=
"
ADIAccountController.java
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/adi/controller/ADIAccountController.java
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
23
"
>
<caret
line=
"
236"
column=
"75"
lean-forward=
"false"
selection-start-line=
"236"
selection-start-column=
"75"
selection-end-line=
"236"
selection-end-column=
"75
"
/>
<state
relative-caret-position=
"
598
"
>
<caret
line=
"
39"
column=
"53"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"53"
selection-end-line=
"39"
selection-end-column=
"53
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
IncrementFlow
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/model/IncrementFlow
.java"
>
<file
leaf-file-name=
"
ADISaleMapRepository
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
office/repository/ADISaleMapRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"
14"
column=
"23"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"23"
selection-end-line=
"14"
selection-end-column=
"23
"
/>
<state
relative-caret-position=
"
161
"
>
<caret
line=
"
9"
column=
"15"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"15"
selection-end-line=
"9"
selection-end-column=
"15
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
Contrac
tServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/impl/Contrac
tServiceImpl.java"
>
<file
leaf-file-name=
"
ADIAccoun
tServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
adi/service/impl/ADIAccoun
tServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"11500"
>
<caret
line=
"534"
column=
"50"
lean-forward=
"false"
selection-start-line=
"534"
selection-start-column=
"50"
selection-end-line=
"534"
selection-end-column=
"50"
/>
<folding
/>
<state
relative-caret-position=
"3151"
>
<caret
line=
"172"
column=
"53"
lean-forward=
"false"
selection-start-line=
"172"
selection-start-column=
"53"
selection-end-line=
"172"
selection-end-column=
"53"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
pom.xml
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/
pom.xml
"
>
<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=
"
3772
"
>
<caret
line=
"1
64"
column=
"31"
lean-forward=
"false"
selection-start-line=
"164"
selection-start-column=
"31"
selection-end-line=
"164"
selection-end-column=
"31
"
/>
<state
relative-caret-position=
"
1978
"
>
<caret
line=
"1
00"
column=
"54"
lean-forward=
"false"
selection-start-line=
"100"
selection-start-column=
"54"
selection-end-line=
"100"
selection-end-column=
"54
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
AccountTask
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
task/AccountTask
.java"
>
<file
leaf-file-name=
"
TkioAccountService
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
service/TkioAccountService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
2369
"
>
<caret
line=
"
124"
column=
"38"
lean-forward=
"false"
selection-start-line=
"124"
selection-start-column=
"38"
selection-end-line=
"124"
selection-end-column=
"38
"
/>
<state
relative-caret-position=
"
621
"
>
<caret
line=
"
30"
column=
"15"
lean-forward=
"false"
selection-start-line=
"30"
selection-start-column=
"15"
selection-end-line=
"30"
selection-end-column=
"15
"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
AccountFlowRestric
tServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/
AccountFlowRestric
tServiceImpl.java"
>
<file
leaf-file-name=
"
TkioAccoun
tServiceImpl.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/
TkioAccoun
tServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
4255
"
>
<caret
line=
"
202"
column=
"47"
lean-forward=
"false"
selection-start-line=
"202"
selection-start-column=
"47"
selection-end-line=
"202"
selection-end-column=
"47
"
/>
<state
relative-caret-position=
"
7153
"
>
<caret
line=
"
346"
column=
"7"
lean-forward=
"false"
selection-start-line=
"346"
selection-start-column=
"7"
selection-end-line=
"346"
selection-end-column=
"45
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -147,14 +158,6 @@
</component>
<component
name=
"FindInProjectRecents"
>
<findStrings>
<find>
label
</find>
<find>
unit
</find>
<find>
http://internal-report-api-976419027.cn-north-1.elb.amazonaws.com.cn
</find>
<find>
reyun
</find>
<find>
\t
</find>
<find>
rebat
</find>
<find>
contractChangeRepository
</find>
<find>
contractMoneyRepository
</find>
<find>
System.out.println
</find>
<find>
sortString
</find>
<find>
isASC
</find>
...
...
@@ -177,6 +180,14 @@
<find>
IOLimit
</find>
<find>
IOFlowNotified
</find>
<find>
setStatus
</find>
<find>
setMediaList
</find>
<find>
io
</find>
<find>
status
</find>
<find>
constractStartTime
</find>
<find>
product
</find>
<find>
roduct
</find>
<find>
SaleEamil
</find>
<find>
pressMap
</find>
</findStrings>
<replaceStrings>
<replace
/>
...
...
@@ -198,21 +209,6 @@
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/repository/IOAppRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/repository/IOPackageTypeRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/contraller/IoAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/model/App.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/rest-servlet.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/ContractIncrement.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/SalesManService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/impl/SaleManServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/PressMoneyRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractIncrementRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/dic/RoleEnum.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/model/Crowd.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/CrowdRepository.java"
/>
...
...
@@ -224,12 +220,10 @@
<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$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/task/AccountCheck.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/repository/IOAccountRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/task/IOAccountCheck.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java"
/>
...
...
@@ -238,17 +232,34 @@
<option
value=
"$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/IOAccount4WebRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/HttpClientUtil.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/adi/service/impl/AccountIOServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/office/repository/ADISaleMapRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/rest-servlet.xml"
/>
<option
value=
"$PROJECT_DIR$/pom.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/adi/dic/StatusEnum.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/UserLog.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/UserLogThread.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/office/model/ADISaleMap.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java"
/>
</list>
</option>
</component>
...
...
@@ -313,6 +324,16 @@
<option
name=
"myItemType"
value=
"org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"myweb Maven Webapp"
/>
<option
name=
"myItemType"
value=
"org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
""
/>
<option
name=
"myItemType"
value=
"org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"Profiles"
/>
<option
name=
"myItemType"
value=
"org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProfilesNode"
/>
</PATH_ELEMENT>
...
...
@@ -344,6 +365,7 @@
</navigator>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"PackagesPane"
/>
<pane
id=
"ProjectPane"
>
<subPane>
...
...
@@ -392,192 +414,6 @@
<option
name=
"myItemId"
value=
"main"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"webapp"
/>
<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=
"webapp"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"WEB-INF"
/>
<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=
"resources"
/>
<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=
"resources"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"spring"
/>
<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=
"resources"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"logback"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"product"
/>
<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=
"resources"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"logback"
/>
<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>
<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=
"userio"
/>
<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>
...
...
@@ -600,134 +436,6 @@
<option
name=
"myItemId"
value=
"java"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"userio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"service"
/>
<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=
"userio"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"service"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"impl"
/>
<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=
"userio"
/>
<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=
"userio"
/>
<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>
<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_ELEMENT>
<option
name=
"myItemId"
value=
"task"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
...
...
@@ -781,39 +489,12 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"model"
/>
<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=
"myItemId"
value=
"controller"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane
id=
"Scratches"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -835,18 +516,18 @@
<recent
name=
"$PROJECT_DIR$/src/main/resources/spring"
/>
</key>
<key
name=
"CopyClassDialog.RECENTS_KEY"
>
<recent
name=
"office.repository"
/>
<recent
name=
"office.model"
/>
<recent
name=
"adi.controller"
/>
<recent
name=
"adi.model"
/>
<recent
name=
"userio.task"
/>
<recent
name=
"userio.service.impl"
/>
<recent
name=
"userio.service"
/>
<recent
name=
"tkio.repository"
/>
<recent
name=
"dic"
/>
</key>
<key
name=
"CopyFile.RECENT_KEYS"
>
<recent
name=
"E:\newgit\manager\src\main\java\adi"
/>
<recent
name=
"E:\newgit\manager\src\main\java\tkio\model"
/>
<recent
name=
"E:\newgit\manager\src\main\java\userio\repository"
/>
<recent
name=
"E:\newgit\manager\src\main\java\userio\model"
/>
<recent
name=
"E:\newgit\manager\src\main\resources\spring"
/>
<recent
name=
"E:\newgit\manager\src\main\resources"
/>
</key>
</component>
<component
name=
"RunManager"
selected=
"Maven.manager"
>
...
...
@@ -890,6 +571,26 @@
<envs
/>
<method
/>
</configuration>
<configuration
default=
"false"
name=
"ADIAccountServiceImpl"
type=
"Application"
factoryName=
"Application"
temporary=
"true"
nameIsGenerated=
"true"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
>
<pattern>
<option
name=
"PATTERN"
value=
"adi.service.impl.*"
/>
<option
name=
"ENABLED"
value=
"true"
/>
</pattern>
</extension>
<option
name=
"MAIN_CLASS_NAME"
value=
"adi.service.impl.ADIAccountServiceImpl"
/>
<option
name=
"VM_PARAMETERS"
/>
<option
name=
"PROGRAM_PARAMETERS"
/>
<option
name=
"WORKING_DIRECTORY"
value=
"$PROJECT_DIR$"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
<option
name=
"ENABLE_SWING_INSPECTOR"
value=
"false"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<module
name=
"manage"
/>
<envs
/>
<method
/>
</configuration>
<configuration
default=
"true"
type=
"#org.jetbrains.idea.devkit.run.PluginConfigurationType"
factoryName=
"Plugin"
>
<module
name=
""
/>
<option
name=
"VM_PARAMETERS"
value=
"-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea"
/>
...
...
@@ -1261,15 +962,17 @@
</MavenSettings>
<method
/>
</configuration>
<list
size=
"
3
"
>
<list
size=
"
4
"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"Maven.manager"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"Application.SyncAppDataTask"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"Application.AwsS3Util"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"Application.ADIAccountServiceImpl"
/>
</list>
<recent_temporary>
<list
size=
"2"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"Application.AwsS3Util"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"Application.SyncAppDataTask"
/>
<list
size=
"3"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"Application.ADIAccountServiceImpl"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"Application.AwsS3Util"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"Application.SyncAppDataTask"
/>
</list>
</recent_temporary>
</component>
...
...
@@ -1323,14 +1026,11 @@
<workItem
from=
"1525761676512"
duration=
"103000"
/>
<workItem
from=
"1525944281194"
duration=
"699000"
/>
<workItem
from=
"1526459695065"
duration=
"1911000"
/>
<workItem
from=
"1526609390549"
duration=
"37000"
/>
</task>
<task
id=
"LOCAL-00092"
summary=
"Merge remote-tracking branch 'remotes/origin/feature_20180116_new' * remotes/origin/feature_20180116_new: 客户表-1 app排序 # Conflicts: #	.idea/workspace.xml "
>
<created>
1521702947223
</created>
<option
name=
"number"
value=
"00092"
/>
<option
name=
"presentableId"
value=
"LOCAL-00092"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1521702947223
</updated>
<workItem
from=
"1526609390549"
duration=
"646000"
/>
<workItem
from=
"1527129294976"
duration=
"2321000"
/>
<workItem
from=
"1527215438651"
duration=
"11973000"
/>
<workItem
from=
"1527475560571"
duration=
"35245000"
/>
<workItem
from=
"1527665400857"
duration=
"6000"
/>
</task>
<task
id=
"LOCAL-00093"
summary=
"客户表 "
>
<created>
1522053490663
</created>
...
...
@@ -1668,15 +1368,22 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1524828673565
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"141"
/>
<task
id=
"LOCAL-00141"
summary=
"2 "
>
<created>
1526609434735
</created>
<option
name=
"number"
value=
"00141"
/>
<option
name=
"presentableId"
value=
"LOCAL-00141"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1526609434735
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"142"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"5
24043
000"
/>
<option
name=
"totallyTimeSpent"
value=
"5
74197
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"6"
/>
<editor
active=
"
tru
e"
/>
<editor
active=
"
fals
e"
/>
<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=
"8"
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=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1689,14 +1396,14 @@
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Ant Build"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"UI Designer"
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=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4
942717
"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4
3535188
"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
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=
"18"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"5"
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.
414075
3"
sideWeight=
"0.49016643"
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.
505728
3"
sideWeight=
"0.49016643"
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.3289689"
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=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.30635402"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -1741,7 +1448,7 @@
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Ant Build"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.24962178"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"UI Designer"
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=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4
942717
"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4
3535188
"
sideWeight=
"0.5"
order=
"10"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"TODO"
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=
"18"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Messages"
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=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<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=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1750,7 +1457,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.4140753
"
sideWeight=
"0.49016643"
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=
"
true"
show_stripe_button=
"true"
weight=
"0.1309329
"
sideWeight=
"0.49016643"
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.3289689"
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"
/>
...
...
@@ -1759,7 +1466,7 @@
<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=
"Gradle View"
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=
"17"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel"
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=
"5"
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.
3289689
"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
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.
5188216
"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Theme Preview"
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=
"Favorites"
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=
"true"
content_ui=
"tabs"
/>
</layout-to-restore>
...
...
@@ -1818,8 +1525,14 @@
<properties
/>
<option
name=
"timeStamp"
value=
"1"
/>
</line-breakpoint>
<line-breakpoint
enabled=
"true"
type=
"java-method"
>
<url>
file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java
</url>
<line>
21
</line>
<properties
class=
"common.service.ContractService"
method=
"findSetmeal"
/>
<option
name=
"timeStamp"
value=
"40"
/>
</line-breakpoint>
</breakpoints>
<option
name=
"time"
value=
"
40
"
/>
<option
name=
"time"
value=
"
56
"
/>
</breakpoint-manager>
<watches-manager
/>
</component>
...
...
@@ -1828,375 +1541,360 @@
<option
name=
"FILTER_TARGETS"
value=
"false"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"
file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java
"
>
<entry
file=
"
jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/XMLSchema.xsd
"
>
<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=
"-496"
>
<caret
line=
"1314"
column=
"23"
lean-forward=
"false"
selection-start-line=
"1314"
selection-start-column=
"23"
selection-end-line=
"1314"
selection-end-column=
"23"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/repository/IOAccountRepository
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/task/ContractTask
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
322
"
>
<caret
line=
"
22"
column=
"52"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"52"
selection-end-line=
"22"
selection-end-column=
"52
"
/>
<state
relative-caret-position=
"
136
"
>
<caret
line=
"
40"
column=
"16"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"16"
selection-end-line=
"40"
selection-end-column=
"16
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/task/IOAccountChec
k.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/SendEmailTas
k.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
412
"
>
<caret
line=
"
34"
column=
"47"
lean-forward=
"false"
selection-start-line=
"34"
selection-start-column=
"47"
selection-end-line=
"34"
selection-end-column=
"47
"
/>
<state
relative-caret-position=
"
-1773
"
>
<caret
line=
"
47"
column=
"16"
lean-forward=
"false"
selection-start-line=
"47"
selection-start-column=
"16"
selection-end-line=
"47"
selection-end-column=
"16
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/SaleManServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/repository/ContractRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
8
4"
>
<caret
line=
"
13"
column=
"13"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"13"
selection-end-line=
"13"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"1
9
4"
>
<caret
line=
"
33"
column=
"19"
lean-forward=
"false"
selection-start-line=
"33"
selection-start-column=
"19"
selection-end-line=
"33"
selection-end-column=
"19
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/SendEmailServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/model/Account4Web
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-71
"
>
<caret
line=
"1
8"
column=
"13"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"13"
selection-end-line=
"18"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"
1610
"
>
<caret
line=
"1
08"
column=
"16"
lean-forward=
"false"
selection-start-line=
"108"
selection-start-column=
"16"
selection-end-line=
"108"
selection-end-column=
"16
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
dic/ContractTypeEnum
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountCheck
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"
9"
column=
"24"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"15"
selection-end-line=
"9"
selection-end-column=
"24
"
/>
<state
relative-caret-position=
"
552
"
>
<caret
line=
"
37"
column=
"17"
lean-forward=
"true"
selection-start-line=
"37"
selection-start-column=
"17"
selection-end-line=
"37"
selection-end-column=
"17
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/repository/PackageTypeRepository
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/task/ContractSendEmailThread
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"8"
column=
"16"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"16"
selection-end-line=
"8"
selection-end-column=
"16"
/>
<state
relative-caret-position=
"56"
>
<caret
line=
"38"
column=
"11"
lean-forward=
"false"
selection-start-line=
"38"
selection-start-column=
"11"
selection-end-line=
"38"
selection-end-column=
"11"
/>
<folding>
<element
signature=
"e#1316#1317#0"
expanded=
"false"
/>
<element
signature=
"e#1356#1357#0"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
model/PackageType
.java"
>
<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=
"
2402
"
>
<caret
line=
"
134"
column=
"22"
lean-forward=
"false"
selection-start-line=
"134"
selection-start-column=
"22"
selection-end-line=
"134"
selection-end-column=
"22
"
/>
<state
relative-caret-position=
"
194
"
>
<caret
line=
"
224"
column=
"45"
lean-forward=
"false"
selection-start-line=
"224"
selection-start-column=
"45"
selection-end-line=
"224"
selection-end-column=
"45
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/repository/IncrementFlowRepository.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/adi/service/AccountIOService.java"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/adi/service/IOSalesManService.java"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/adi/service/impl/IOSaleManServiceImpl.java"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/adi/service/impl/AccountIOServiceImpl.java"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/util/HttpClientUtil.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
184
"
>
<caret
line=
"
14"
column=
"15"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"15"
selection-end-line=
"14"
selection-end-column=
"15
"
/>
<state
relative-caret-position=
"
407
"
>
<caret
line=
"
92"
column=
"34"
lean-forward=
"false"
selection-start-line=
"92"
selection-start-column=
"34"
selection-end-line=
"92"
selection-end-column=
"34
"
/>
</state>
</provider>
</entry>
<entry
file=
"
jar://E:/Java/jdk1.8.0_65/src.zip!/java/util/ResourceBundl
e.java"
>
<entry
file=
"
file://$PROJECT_DIR$/src/main/java/office/service/BussinussManServic
e.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
94
"
>
<caret
line=
"
405"
column=
"24"
lean-forward=
"false"
selection-start-line=
"405"
selection-start-column=
"24"
selection-end-line=
"405"
selection-end-column=
"24
"
/>
<state
relative-caret-position=
"1
15
"
>
<caret
line=
"
5"
column=
"17"
lean-forward=
"false"
selection-start-line=
"5"
selection-start-column=
"17"
selection-end-line=
"5"
selection-end-column=
"17
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
util/Constant
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
office/service/impl/BussinussManServiceImpl
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"22"
column=
"67"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"67"
selection-end-line=
"22"
selection-end-column=
"67"
/>
</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=
"18"
lean-forward=
"true"
selection-start-line=
"0"
selection-start-column=
"18"
selection-end-line=
"0"
selection-end-column=
"18"
/>
<caret
line=
"13"
column=
"0"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"0"
selection-end-line=
"14"
selection-end-column=
"50"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/UserController
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/PressMoney
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
63
"
>
<caret
line=
"
54"
column=
"27"
lean-forward=
"true"
selection-start-line=
"54"
selection-start-column=
"27"
selection-end-line=
"54"
selection-end-column=
"27
"
/>
<state
relative-caret-position=
"2
30
"
>
<caret
line=
"
13"
column=
"16"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"12"
selection-end-line=
"13"
selection-end-column=
"16
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/UserService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
office/repository/BussinessManRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
194
"
>
<caret
line=
"1
4"
column=
"9"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"9"
selection-end-line=
"14"
selection-end-column=
"9
"
/>
<state
relative-caret-position=
"
230
"
>
<caret
line=
"1
1"
column=
"23"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"23"
selection-end-line=
"11"
selection-end-column=
"23
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/service/impl/UserServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/AccountService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
171
"
>
<caret
line=
"1
12"
column=
"41"
lean-forward=
"false"
selection-start-line=
"112"
selection-start-column=
"41"
selection-end-line=
"112"
selection-end-column=
"41
"
/>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"1
0"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/model/SalesManLeader
.java"
>
<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=
"1
15
"
>
<caret
line=
"
7"
column=
"13"
lean-forward=
"false"
selection-start-line=
"7"
selection-start-column=
"13"
selection-end-line=
"7"
selection-end-column=
"13
"
/>
<state
relative-caret-position=
"1
94
"
>
<caret
line=
"
28"
column=
"39"
lean-forward=
"false"
selection-start-line=
"28"
selection-start-column=
"39"
selection-end-line=
"28"
selection-end-column=
"39
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/tkio/repository/SalesManLeaderRepository.java
"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
webapp/WEB-INF/web.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"115"
>
<caret
line=
"10"
column=
"87"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"80"
selection-end-line=
"10"
selection-end-column=
"87"
/>
<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>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/repository/IOSalesManLeaderRepository
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/model/IOAccount4Web
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
115
"
>
<caret
line=
"
10"
column=
"92"
lean-forward=
"true"
selection-start-line=
"10"
selection-start-column=
"92"
selection-end-line=
"10"
selection-end-column=
"92
"
/>
<state
relative-caret-position=
"
253
"
>
<caret
line=
"
27"
column=
"4"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"4"
selection-end-line=
"27"
selection-end-column=
"23
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/userio/task/IOAccountTask.java
"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/spring/applicationContext-schedule.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1449"
>
<caret
line=
"82"
column=
"16"
lean-forward=
"false"
selection-start-line=
"82"
selection-start-column=
"16"
selection-end-line=
"82"
selection-end-column=
"65"
/>
<state
relative-caret-position=
"-228"
>
<caret
line=
"40"
column=
"0"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"0"
selection-end-line=
"40"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/common/controller/ContractController.java
"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/spring/applicationContext.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"191"
>
<caret
line=
"217"
column=
"44"
lean-forward=
"false"
selection-start-line=
"217"
selection-start-column=
"44"
selection-end-line=
"217"
selection-end-column=
"44"
/>
<state
relative-caret-position=
"237"
>
<caret
line=
"22"
column=
"52"
lean-forward=
"true"
selection-start-line=
"22"
selection-start-column=
"52"
selection-end-line=
"22"
selection-end-column=
"52"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/
java/common/service/ContractService.java
"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/
resources/rest-servlet.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"183"
>
<caret
line=
"37"
column=
"18"
lean-forward=
"false"
selection-start-line=
"37"
selection-start-column=
"18"
selection-end-line=
"37"
selection-end-column=
"18"
/>
<state
relative-caret-position=
"207"
>
<caret
line=
"13"
column=
"52"
lean-forward=
"true"
selection-start-line=
"13"
selection-start-column=
"52"
selection-end-line=
"13"
selection-end-column=
"52"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-
commons/1.5.1.RELEASE/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/Crud
Repository.class"
>
<entry
file=
"jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-
jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/Jpa
Repository.class"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
<caret
line=
"1
3"
column=
"20"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"20"
selection-end-line=
"13"
selection-end-column=
"20
"
/>
<caret
line=
"1
5"
column=
"12"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"12
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/u
serio/service/IOAccountService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/u
til/DateUtil
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
183
"
>
<caret
line=
"1
3"
column=
"18"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"18"
selection-end-line=
"13"
selection-end-column=
"18
"
/>
<state
relative-caret-position=
"
206
"
>
<caret
line=
"1
93"
column=
"34"
lean-forward=
"false"
selection-start-line=
"193"
selection-start-column=
"26"
selection-end-line=
"193"
selection-end-column=
"34
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/model/IOAccount4Web
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
adi/dic/StatusEnum
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-299
"
>
<caret
line=
"
9"
column=
"13"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"13"
selection-end-line=
"9"
selection-end-column=
"13
"
/>
<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
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/service/impl/IOAccountServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
adi/dic/TypeEnum
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
183
"
>
<caret
line=
"
42"
column=
"16"
lean-forward=
"false"
selection-start-line=
"42"
selection-start-column=
"16"
selection-end-line=
"42"
selection-end-column=
"16
"
/>
<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
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/repository/IOAccount4WebRepository
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
adi/dic/PackageEnum
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"
19"
column=
"47"
lean-forward=
"false"
selection-start-line=
"19"
selection-start-column=
"47"
selection-end-line=
"19"
selection-end-column=
"47
"
/>
<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
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/service/AccountIOService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/model/UserLog
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"1
0"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12
"
/>
<state
relative-caret-position=
"
320
"
>
<caret
line=
"1
44"
column=
"33"
lean-forward=
"false"
selection-start-line=
"144"
selection-start-column=
"33"
selection-end-line=
"144"
selection-end-column=
"33
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/u
serio/service/impl/AccountIOServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/u
til/UserLogThread
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
309
"
>
<caret
line=
"
31"
column=
"47"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"37"
selection-end-line=
"31"
selection-end-column=
"47
"
/>
<state
relative-caret-position=
"
115
"
>
<caret
line=
"
43"
column=
"16"
lean-forward=
"false"
selection-start-line=
"43"
selection-start-column=
"16"
selection-end-line=
"43"
selection-end-column=
"16
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/model/Contract
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/controller/IoAccountController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
94
"
>
<caret
line=
"
216"
column=
"18"
lean-forward=
"false"
selection-start-line=
"216"
selection-start-column=
"18"
selection-end-line=
"216"
selection-end-column=
"18
"
/>
<state
relative-caret-position=
"1
709
"
>
<caret
line=
"
97"
column=
"36"
lean-forward=
"false"
selection-start-line=
"97"
selection-start-column=
"36"
selection-end-line=
"97"
selection-end-column=
"36
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/AccountService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
util/NewUserLogThread
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"10"
column=
"12"
lean-forward=
"false"
selection-start-line=
"10"
selection-start-column=
"12"
selection-end-line=
"10"
selection-end-column=
"12"
/>
<state
relative-caret-position=
"1127"
>
<caret
line=
"58"
column=
"0"
lean-forward=
"true"
selection-start-line=
"58"
selection-start-column=
"0"
selection-end-line=
"58"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
userio/controller/IoAccountController
.java"
>
<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=
"37"
column=
"123"
lean-forward=
"false"
selection-start-line=
"37"
selection-start-column=
"123"
selection-end-line=
"37"
selection-end-column=
"123"
/>
<state
relative-caret-position=
"194"
>
<caret
line=
"29"
column=
"13"
lean-forward=
"false"
selection-start-line=
"29"
selection-start-column=
"13"
selection-end-line=
"29"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/controller/LoginControll
er.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
adi/model/ADIUs
er.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-531
"
>
<caret
line=
"
27"
column=
"11"
lean-forward=
"true"
selection-start-line=
"27"
selection-start-column=
"11"
selection-end-line=
"27"
selection-end-column=
"11
"
/>
<state
relative-caret-position=
"
115
"
>
<caret
line=
"
49"
column=
"32"
lean-forward=
"false"
selection-start-line=
"49"
selection-start-column=
"32"
selection-end-line=
"49"
selection-end-column=
"32
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/controller/TkioAccountController
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
office/model/ADISaleMap
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"368"
>
<caret
line=
"31"
column=
"54"
lean-forward=
"false"
selection-start-line=
"31"
selection-start-column=
"54"
selection-end-line=
"31"
selection-end-column=
"54"
/>
<state
relative-caret-position=
"851"
>
<caret
line=
"57"
column=
"0"
lean-forward=
"false"
selection-start-line=
"57"
selection-start-column=
"0"
selection-end-line=
"57"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/TkioAccountService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
security/resolvers/LoginUserMethodArgumentsResolver
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
183
"
>
<caret
line=
"
11"
column=
"24"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"24"
selection-end-line=
"11"
selection-end-column=
"24
"
/>
<state
relative-caret-position=
"
364
"
>
<caret
line=
"
38"
column=
"0"
lean-forward=
"false"
selection-start-line=
"38"
selection-start-column=
"0"
selection-end-line=
"38"
selection-end-column=
"0
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/TkioAccountServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
office/model/BussinessMan
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"
92"
column=
"16"
lean-forward=
"false"
selection-start-line=
"92"
selection-start-column=
"16"
selection-end-line=
"92"
selection-end-column=
"72
"
/>
<state
relative-caret-position=
"
506
"
>
<caret
line=
"
26"
column=
"19"
lean-forward=
"true"
selection-start-line=
"26"
selection-start-column=
"19"
selection-end-line=
"26"
selection-end-column=
"19
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/repository/Account
Repository.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/repository/User
Repository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"2
2"
column=
"18"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"18"
selection-end-line=
"22"
selection-end-column=
"18
"
/>
<caret
line=
"2
6"
column=
"35"
lean-forward=
"false"
selection-start-line=
"26"
selection-start-column=
"35"
selection-end-line=
"26"
selection-end-column=
"35
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/AccountFlowRestrictService
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
security/interceptor/AuthorizationInterceptor
.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
"
/>
<state
relative-caret-position=
"
439
"
>
<caret
line=
"
54"
column=
"9"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"9"
selection-end-line=
"54"
selection-end-column=
"9
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java
"
>
<entry
file=
"file://$PROJECT_DIR$/
pom.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"4255"
>
<caret
line=
"202"
column=
"47"
lean-forward=
"false"
selection-start-line=
"202"
selection-start-column=
"47"
selection-end-line=
"202"
selection-end-column=
"47"
/>
<folding
/>
<state
relative-caret-position=
"161"
>
<caret
line=
"43"
column=
"57"
lean-forward=
"false"
selection-start-line=
"43"
selection-start-column=
"51"
selection-end-line=
"43"
selection-end-column=
"57"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/task/AccountTask
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/repository/PressMoneyRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2369"
>
<caret
line=
"124"
column=
"38"
lean-forward=
"false"
selection-start-line=
"124"
selection-start-column=
"38"
selection-end-line=
"124"
selection-end-column=
"38"
/>
<folding
/>
<state
relative-caret-position=
"161"
>
<caret
line=
"13"
column=
"90"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"20"
selection-end-line=
"13"
selection-end-column=
"90"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
model/IncrementFlow
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
controller/TkioAccountController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
207
"
>
<caret
line=
"1
4"
column=
"23"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"23"
selection-end-line=
"14"
selection-end-column=
"23
"
/>
<state
relative-caret-position=
"
1978
"
>
<caret
line=
"1
00"
column=
"54"
lean-forward=
"false"
selection-start-line=
"100"
selection-start-column=
"54"
selection-end-line=
"100"
selection-end-column=
"54
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
pom.xml
"
>
<entry
file=
"file://$PROJECT_DIR$/
src/main/java/office/repository/ADISaleMapRepository.java
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
3772
"
>
<caret
line=
"
164"
column=
"31"
lean-forward=
"false"
selection-start-line=
"164"
selection-start-column=
"31"
selection-end-line=
"164"
selection-end-column=
"31
"
/>
<state
relative-caret-position=
"
161
"
>
<caret
line=
"
9"
column=
"15"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"15"
selection-end-line=
"9"
selection-end-column=
"15
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"
jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/XMLSchema.xsd
"
>
<entry
file=
"
file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-496
"
>
<caret
line=
"
1314"
column=
"23"
lean-forward=
"false"
selection-start-line=
"1314"
selection-start-column=
"23"
selection-end-line=
"1314"
selection-end-column=
"2
3"
/>
<state
relative-caret-position=
"
598
"
>
<caret
line=
"
39"
column=
"53"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"53"
selection-end-line=
"39"
selection-end-column=
"5
3"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
common/task/ContractTask
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/TkioAccountService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
136
"
>
<caret
line=
"
40"
column=
"16"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"16"
selection-end-line=
"40"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"
621
"
>
<caret
line=
"
30"
column=
"15"
lean-forward=
"false"
selection-start-line=
"30"
selection-start-column=
"15"
selection-end-line=
"30"
selection-end-column=
"15
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
task/SendEmailTask
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/
service/impl/TkioAccountServiceImpl
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-177
3"
>
<caret
line=
"
47"
column=
"16"
lean-forward=
"false"
selection-start-line=
"47"
selection-start-column=
"16"
selection-end-line=
"47"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"
715
3"
>
<caret
line=
"
346"
column=
"7"
lean-forward=
"false"
selection-start-line=
"346"
selection-start-column=
"7"
selection-end-line=
"346"
selection-end-column=
"45
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"194"
>
<caret
line=
"33"
column=
"19"
lean-forward=
"false"
selection-start-line=
"33"
selection-start-column=
"19"
selection-end-line=
"33"
selection-end-column=
"19"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
1610
"
>
<caret
line=
"1
08"
column=
"16"
lean-forward=
"false"
selection-start-line=
"108"
selection-start-column=
"16"
selection-end-line=
"108"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"
3151
"
>
<caret
line=
"1
72"
column=
"53"
lean-forward=
"false"
selection-start-line=
"172"
selection-start-column=
"53"
selection-end-line=
"172"
selection-end-column=
"53
"
/>
<folding>
<element
signature=
"e#2345#2346#0"
expanded=
"true"
/>
<element
signature=
"e#2381#2382#0"
expanded=
"true"
/>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
tkio/service/impl/AccountServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/
adi/service/ADIAccountService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
1311
"
>
<caret
line=
"
69"
column=
"23"
lean-forward=
"false"
selection-start-line=
"69"
selection-start-column=
"23"
selection-end-line=
"69"
selection-end-column=
"23
"
/>
<state
relative-caret-position=
"
460
"
>
<caret
line=
"
24"
column=
"16"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"16"
selection-end-line=
"24"
selection-end-column=
"16
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
11500
"
>
<caret
line=
"
534"
column=
"50"
lean-forward=
"false"
selection-start-line=
"534"
selection-start-column=
"50"
selection-end-line=
"534"
selection-end-column=
"50
"
/>
<state
relative-caret-position=
"
4393
"
>
<caret
line=
"
235"
column=
"22"
lean-forward=
"false"
selection-start-line=
"235"
selection-start-column=
"22"
selection-end-line=
"235"
selection-end-column=
"22
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"23"
>
<caret
line=
"236"
column=
"75"
lean-forward=
"false"
selection-start-line=
"236"
selection-start-column=
"75"
selection-end-line=
"236"
selection-end-column=
"75"
/>
<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=
"182"
>
<caret
line=
"56"
column=
"57"
lean-forward=
"false"
selection-start-line=
"56"
selection-start-column=
"57"
selection-end-line=
"56"
selection-end-column=
"57"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
14
"
>
<caret
line=
"
27"
column=
"18"
lean-forward=
"true"
selection-start-line=
"27"
selection-start-column=
"18"
selection-end-line=
"27"
selection-end-column=
"18
"
/>
<state
relative-caret-position=
"1
71
"
>
<caret
line=
"
195"
column=
"45"
lean-forward=
"false"
selection-start-line=
"195"
selection-start-column=
"31"
selection-end-line=
"195"
selection-end-column=
"45
"
/>
<folding
/>
</state>
</provider>
...
...
pom.xml
View file @
0e91d6b6
...
...
@@ -827,7 +827,7 @@
<version>
${maven.jetty.version}
</version>
<configuration>
<httpConnector>
<port>
808
0
</port>
<port>
808
2
</port>
</httpConnector>
<webAppConfig>
<defaultsDescriptor>
src/main/resources/webdefault.xml
</defaultsDescriptor>
...
...
src/main/java/common/controller/ContractController.java
View file @
0e91d6b6
...
...
@@ -91,7 +91,7 @@ public class ContractController {
response
.
setHeader
(
"Content-Type"
,
"text/csv"
);
response
.
setContentType
(
"APPLICATION/OCTET-STREAM"
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
platform
,
"导出合同"
,
startDate
,
endDate
,
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
platform
,
"导出合同"
,
startDate
,
endDate
,
request
,
platform
);
userlog
.
start
();
//返回文件字符串
return
new
ResponseEntity
<
byte
[]>(
content
,
headers
,
HttpStatus
.
CREATED
);
...
...
@@ -128,7 +128,7 @@ public class ContractController {
response
.
setHeader
(
"Content-Type"
,
"text/csv"
);
response
.
setContentType
(
"APPLICATION/OCTET-STREAM"
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
platform
,
"导出收款开票"
,
startDate
,
endDate
,
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
platform
,
"导出收款开票"
,
startDate
,
endDate
,
request
,
platform
);
userlog
.
start
();
//返回文件字符串
return
new
ResponseEntity
<
byte
[]>(
content
,
headers
,
HttpStatus
.
CREATED
);
...
...
@@ -167,8 +167,8 @@ public class ContractController {
@RequestMapping
(
value
=
"find/pricelevel"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
findPricelevel
(
@CurrentAccount
User
loginAccount
)
{
return
ResultModel
.
OK
(
service
.
findSetmeal
());
public
ResultModel
findPricelevel
(
@CurrentAccount
User
loginAccount
,
@PathVariable
String
platform
)
{
return
ResultModel
.
OK
(
service
.
findSetmeal
(
platform
));
}
@RequestMapping
(
value
=
"find/increment"
,
method
=
RequestMethod
.
GET
)
...
...
@@ -193,9 +193,9 @@ public class ContractController {
@RequestMapping
(
value
=
"create"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
ResultModel
create
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Contract
contract
,
HttpServletRequest
request
)
{
public
ResultModel
create
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Contract
contract
,
HttpServletRequest
request
,
@PathVariable
String
platform
)
{
Contract
contract1
=
service
.
create
(
loginAccount
,
contract
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"新建合同"
,
""
,
contract1
.
toString
(),
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"新建合同"
,
""
,
contract1
.
toString
(),
request
,
platform
);
userlog
.
start
();
ContractSendEmailThread
email
=
new
ContractSendEmailThread
(
contract
);
...
...
@@ -205,27 +205,27 @@ public class ContractController {
@RequestMapping
(
value
=
"update"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
update
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Contract
contract
,
HttpServletRequest
request
)
{
public
ResultModel
update
(
@CurrentAccount
User
loginAccount
,
@RequestBody
Contract
contract
,
HttpServletRequest
request
,
@PathVariable
String
platform
)
{
Contract
contract1
=
service
.
update
(
loginAccount
,
contract
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"修改合同"
,
""
,
contract1
.
toString
(),
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"修改合同"
,
""
,
contract1
.
toString
(),
request
,
platform
);
userlog
.
start
();
return
ResultModel
.
OK
(
contract1
);
}
@RequestMapping
(
value
=
"pay"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
ResultModel
pay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
ContractMoney
contract
,
HttpServletRequest
request
)
{
public
ResultModel
pay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
ContractMoney
contract
,
HttpServletRequest
request
,
@PathVariable
String
platform
)
{
ContractMoney
contract1
=
service
.
pay
(
loginAccount
,
contract
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"收款开票"
,
""
,
contract1
.
toString
(),
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"收款开票"
,
""
,
contract1
.
toString
(),
request
,
platform
);
userlog
.
start
();
return
ResultModel
.
OK
(
contract1
);
}
@RequestMapping
(
value
=
"change"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
ResultModel
change
(
@CurrentAccount
User
loginAccount
,
@RequestBody
ContractChange
contract
,
HttpServletRequest
request
)
{
public
ResultModel
change
(
@CurrentAccount
User
loginAccount
,
@RequestBody
ContractChange
contract
,
HttpServletRequest
request
,
@PathVariable
String
platform
)
{
Contract
contract1
=
service
.
change
(
loginAccount
,
contract
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"修改套餐"
,
""
,
contract1
.
toString
(),
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"修改套餐"
,
""
,
contract1
.
toString
(),
request
,
platform
);
userlog
.
start
();
return
ResultModel
.
OK
(
contract1
);
}
...
...
@@ -246,9 +246,9 @@ public class ContractController {
@RequestMapping
(
value
=
"update/pay"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updatePay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
ContractMoney
contract
,
HttpServletRequest
request
)
{
public
ResultModel
updatePay
(
@CurrentAccount
User
loginAccount
,
@RequestBody
ContractMoney
contract
,
HttpServletRequest
request
,
@PathVariable
String
platform
)
{
Contract
contract1
=
service
.
updatePay
(
loginAccount
,
contract
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"修改收款开票"
,
""
,
service
.
updatePay
(
loginAccount
,
contract
).
toString
(),
request
);
NewUserLogThread
userlog
=
new
NewUserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
contract1
.
getContractCode
(),
"修改收款开票"
,
""
,
service
.
updatePay
(
loginAccount
,
contract
).
toString
(),
request
,
platform
);
userlog
.
start
();
return
ResultModel
.
OK
(
contract1
);
}
...
...
src/main/java/common/model/UserLog.java
View file @
0e91d6b6
...
...
@@ -24,6 +24,7 @@ public class UserLog
private
String
OldObject
;
private
String
newObject
;
private
Long
role
;
private
String
platfrom
;
@Id
@GeneratedValue
...
...
@@ -141,6 +142,14 @@ public class UserLog
this
.
role
=
role
;
}
public
String
getPlatfrom
()
{
return
platfrom
;
}
public
void
setPlatfrom
(
String
platfrom
)
{
this
.
platfrom
=
platfrom
;
}
@Override
public
String
toString
()
{
return
"UserLog{"
+
...
...
src/main/java/common/service/ContractService.java
View file @
0e91d6b6
...
...
@@ -19,7 +19,7 @@ public interface ContractService {
String
getContractCode
(
String
code
);
List
findSetmeal
();
List
findSetmeal
(
String
platform
);
//增值服务
List
<
ContractIncrement
>
findIncrement
();
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
0e91d6b6
package
common
.
service
.
impl
;
import
adi.dic.PackageEnum
;
import
adi.model.ADIUser
;
import
adi.service.ADIAccountService
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.api.ads.adwords.lib.AdWordsProductFrameworkModule
;
import
common.model.*
;
import
common.repository.*
;
...
...
@@ -9,6 +13,8 @@ import dic.ContractStatusEnum;
import
dic.ContractTypeEnum
;
import
dic.RoleEnum
;
import
dic.RoleTypeEnum
;
import
org.json.JSONException
;
import
org.json.JSONObject
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
tkio.model.Account
;
...
...
@@ -21,11 +27,15 @@ import tkio.service.AccountService;
import
tkio.service.TkioAccountService
;
import
userio.service.AccountIOService
;
import
userio.service.IOAccountService
;
import
util.DateUtil
;
import
util.ResultModel
;
import
util.ResultStatus
;
import
util.ValidateUtil
;
import
util.*
;
import
java.beans.BeanInfo
;
import
java.beans.IntrospectionException
;
import
java.beans.Introspector
;
import
java.beans.PropertyDescriptor
;
import
java.io.IOException
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.util.*
;
...
...
@@ -70,23 +80,33 @@ public class ContractServiceImpl implements ContractService{
UserService
userService
;
@Autowired
IncrementFlowRepository
incrementFlowRepository
;
@Autowired
ADIAccountService
adiAccountService
;
@Override
public
Map
<
String
,
Object
>
checkAccount
(
String
email
,
String
platfrom
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Account4Web
account4Web
=
null
;
IOAccount4Web
ioAccount4Web
=
null
;
ADIUser
adiUser
=
null
;
if
(
"tkio"
.
equals
(
platfrom
)){
account4Web
=
account4WebRepository
.
findByEmail
(
email
);
}
else
if
(
"io"
.
equals
(
platfrom
)){
ioAccount4Web
=
ioAccount4WebRepository
.
findByEmail
(
email
);
}
else
if
(
"adi"
.
equals
(
platfrom
)){
adiUser
=
adiAccountService
.
findOne
(
email
);
}
if
(
null
==
account4Web
&&
null
==
ioAccount4Web
){
if
(
null
==
account4Web
&&
null
==
ioAccount4Web
&&
null
==
adiUser
){
map
.
put
(
"result"
,
0
);
}
else
{
BigInteger
integer
=
contractRepository
.
countNumByEmail
(
email
,
platfrom
);
map
.
put
(
"result"
,
1
);
map
.
put
(
"company"
,
null
==
account4Web
?
ioAccount4Web
.
getCompany
()
:
account4Web
.
getCompany
());
if
(
platfrom
.
equals
(
"adi"
)){
map
.
put
(
"company"
,
adiUser
.
getCompany
());
}
else
{
map
.
put
(
"company"
,
null
==
account4Web
?
ioAccount4Web
.
getCompany
()
:
account4Web
.
getCompany
());
}
map
.
put
(
"num"
,
integer
.
intValue
());
Contract
contract
=
contractRepository
.
findByPlatformAndEmailLimitVaild
(
platfrom
,
email
);
if
(
null
==
contract
){
...
...
@@ -147,16 +167,30 @@ public class ContractServiceImpl implements ContractService{
}
@Override
public
List
findSetmeal
()
{
public
List
findSetmeal
(
String
platform
)
{
List
list
=
new
ArrayList
();
List
<
PackageType
>
packageTypeList
=
packageTypeRepository
.
findAll
();
for
(
PackageType
p
:
packageTypeList
){
p
.
setType
(
"main"
);
list
.
add
(
p
);
if
(
"adi"
.
equals
(
platform
)){
for
(
int
i
=
1
;
i
<
3
;
i
++)
{
Map
<
String
,
String
>
packageMap
=
new
HashMap
<>();
packageMap
.
put
(
"id"
,
i
+
""
);
if
(
i
==
1
){
packageMap
.
put
(
"packageName"
,
PackageEnum
.
PROBATION
.
getValue
());
}
else
{
packageMap
.
put
(
"packageName"
,
PackageEnum
.
FORMAL
.
getValue
());
}
list
.
add
(
packageMap
);
}
}
else
{
List
<
PackageType
>
packageTypeList
=
packageTypeRepository
.
findAll
();
for
(
PackageType
p
:
packageTypeList
){
p
.
setType
(
"main"
);
list
.
add
(
p
);
}
List
<
ContractIncrement
>
increments
=
contractIncrementRepository
.
findAll
();
list
.
addAll
(
increments
);
}
List
<
ContractIncrement
>
increments
=
contractIncrementRepository
.
findAll
();
list
.
addAll
(
increments
);
return
list
;
}
...
...
@@ -236,7 +270,13 @@ public class ContractServiceImpl implements ContractService{
resource
.
setDs
(
DateUtil
.
getBeforeDays
(
0
));
resource
.
setStatus
(
"wait"
);
}
Double
rebat
=
getRebat
(
resource
.
getProduct
(),
resource
.
getPriceLevel
().
intValue
(),
resource
.
getMoney
());
Double
rebat
=
null
;
if
(
null
!=
resource
.
getPriceLevel
()){
rebat
=
getRebat
(
resource
.
getProduct
(),
resource
.
getPriceLevel
().
intValue
(),
resource
.
getMoney
());
}
else
{
rebat
=
getRebat
(
resource
.
getProduct
(),
0
,
resource
.
getMoney
());
}
BigDecimal
bg
=
new
BigDecimal
(
rebat
);
double
f1
=
bg
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
).
doubleValue
();
resource
.
setRebate
(
f1
);
...
...
@@ -253,6 +293,9 @@ public class ContractServiceImpl implements ContractService{
if
(
resource
.
getPlatform
().
equals
(
"io"
)
&&
resource
.
getType
().
equals
(
"main"
)){
accountIOService
.
update
(
resource
);
}
if
(
resource
.
getPlatform
().
equals
(
"adi"
)){
adiAccountService
.
updateAccount
(
resource
);
}
if
(
resource
.
getType
().
equals
(
ContractTypeEnum
.
MAIN
.
getKey
())
||
(
resource
.
getType
().
equals
(
ContractTypeEnum
.
INCREMENT
.
getKey
())
&&
resource
.
getPriceLevel
().
equals
(
1L
))){
...
...
@@ -309,7 +352,7 @@ public class ContractServiceImpl implements ContractService{
}
boolean
newRebat
=
false
;
if
(
contract
.
getType
().
equals
(
ContractTypeEnum
.
MAIN
.
getKey
())){
if
(
contract
.
getType
().
equals
(
ContractTypeEnum
.
MAIN
.
getKey
())
&&
null
!=
resource
.
getPriceLevel
()
){
if
(!
resource
.
getPriceLevel
().
equals
(
contract
.
getPriceLevel
())){
cc
.
setContent
(
cc
.
getContent
()
+
" 套餐变更："
+
packageMap
.
get
(
contract
.
getPriceLevel
())
+
"-->"
+
packageMap
.
get
(
resource
.
getPriceLevel
()));
newRebat
=
true
;
...
...
@@ -344,6 +387,9 @@ public class ContractServiceImpl implements ContractService{
if
(
contract
.
getPlatform
().
equals
(
"io"
)
&&
resource
.
getType
().
equals
(
"main"
)){
accountIOService
.
update
(
contract
);
}
if
(
contract
.
getPlatform
().
equals
(
"adi"
)){
adiAccountService
.
updateAccount
(
contract
);
}
if
(
contract
.
getPlatform
().
equals
(
"tkio"
)){
if
(
contract
.
getPlatform
().
equals
(
"tkio"
))
{
...
...
@@ -673,4 +719,32 @@ public class ContractServiceImpl implements ContractService{
}
return
saleMap
;
}
public
static
Map
<
String
,
String
>
convertBean
(
Object
bean
)
throws
IntrospectionException
,
IllegalArgumentException
,
IllegalAccessException
,
InvocationTargetException
{
Class
type
=
bean
.
getClass
();
Map
<
String
,
String
>
returnMap
=
new
HashMap
<
String
,
String
>();
BeanInfo
beanInfo
=
Introspector
.
getBeanInfo
(
type
);
PropertyDescriptor
[]
propertyDescriptors
=
beanInfo
.
getPropertyDescriptors
();
for
(
int
i
=
0
;
i
<
propertyDescriptors
.
length
;
i
++)
{
PropertyDescriptor
descriptor
=
propertyDescriptors
[
i
];
String
propertyName
=
descriptor
.
getName
();
if
(!
propertyName
.
equals
(
"class"
))
{
Method
readMethod
=
descriptor
.
getReadMethod
();
Object
invoke
=
readMethod
.
invoke
(
bean
,
new
Object
[
0
]);
String
result
=
(
null
==
invoke
?
null
:
invoke
.
toString
());
if
(
result
!=
null
)
{
returnMap
.
put
(
propertyName
,
result
);
}
else
{
returnMap
.
put
(
propertyName
,
null
);
}
}
}
return
returnMap
;
}
}
src/main/java/security/interceptor/AuthorizationInterceptor.java
View file @
0e91d6b6
...
...
@@ -47,13 +47,23 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
public
boolean
preHandle
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
{
//放开登录
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
||
request
.
getRequestURL
().
indexOf
(
"contract/build"
)
!=
-
1
){
String
requestURL
=
request
.
getRequestURL
().
toString
();
if
(
requestURL
.
contains
(
"findSaleInfo"
)){
System
.
out
.
println
(
"-----"
+
requestURL
.
contains
(
"findSaleInfo"
));
return
true
;
}
System
.
out
.
println
(
"============="
+
requestURL
);
System
.
out
.
println
(
requestURL
.
indexOf
(
"accountmng/findSaleInfo"
));
if
(
requestURL
.
indexOf
(
"login/login"
)
!=
-
1
||
requestURL
.
indexOf
(
"update/pwd"
)
!=
-
1
||
requestURL
.
indexOf
(
"user/forget"
)
!=
-
1
||
requestURL
.
indexOf
(
"user/code"
)
!=
-
1
||
requestURL
.
indexOf
(
"contract/build"
)
!=
-
1
||
requestURL
.
indexOf
(
"accountmng/findSaleInfo"
)
!=
-
1
){
return
true
;
}
//从header中得到token
String
token
=
request
.
getHeader
(
httpHeaderName
);
//token = StringUtil.isEmpty(token) ? getCookieToken(request.getCookies(), "TOKEN") : token;
...
...
src/main/java/util/HttpClientUtil.java
View file @
0e91d6b6
...
...
@@ -9,9 +9,7 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.*
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
...
...
@@ -289,13 +287,56 @@ public class HttpClientUtil {
return
result
;
}
public
static
String
doHttpPostRequest
(
String
url
,
String
ip
,
Map
<
String
,
String
>
params
,
String
cookie
)
{
long
start
=
System
.
currentTimeMillis
();
// public static String doHttpPostRequest(String url, String ip, Map<String, String> params, String cookie) {
// long start = System.currentTimeMillis();
// HttpClient httpClient = new HttpClient(httpConnectionManager);
// httpClient.getHttpConnectionManager().getParams()
// .setConnectionTimeout(300000);
// httpClient.getHttpConnectionManager().getParams().setSoTimeout(300000);
// resetRequestHeader(httpClient, ip, cookie);
// PostMethod method = new PostMethod(url);
// List<NameValuePair> list = new ArrayList<NameValuePair>();
//
// for (String key : params.keySet()) {
// NameValuePair pair = new NameValuePair(key, params.get(key));
// list.add(pair);
// }
// method.setRequestBody(list.toArray(new NameValuePair[list.size()]));
// String response = null;
// try {
// int status = httpClient.executeMethod(method);
// response = method.getResponseBodyAsString();
// } catch (IOException e) {
// log.error("执行HTTP Post请求" + url + "时，发生异常！", e);
// } finally {
// method.releaseConnection();
// }
// long end = System.currentTimeMillis();
// log.debug("---------------http's time to get data from report-------------------");
// log.debug(start-end + "ms");
// log.debug("---------------------------------------------------------------------");
// return response;
// }
public
static
String
doHttpPostRequest
(
String
url
,
String
ip
,
Map
<
String
,
String
>
params
,
String
code
)
{
return
doHttpPostRequest
(
url
,
ip
,
params
,
"ISO-8859-1"
,
code
);
}
/**
* Http post请求，获取结果.
*
* @param url
* @param ip
* @return
*/
public
static
String
doHttpPostRequest
(
String
url
,
String
ip
,
Map
<
String
,
String
>
params
,
String
readCharsetName
,
String
writeCharsetName
)
{
HttpClient
httpClient
=
new
HttpClient
(
httpConnectionManager
);
httpClient
.
getHttpConnectionManager
().
getParams
()
.
setConnectionTimeout
(
300000
);
httpClient
.
getHttpConnectionManager
().
getParams
().
setSoTimeout
(
300000
);
resetRequestHeader
(
httpClient
,
ip
,
cookie
);
resetRequestHeader
(
httpClient
,
ip
);
PostMethod
method
=
new
PostMethod
(
url
);
List
<
NameValuePair
>
list
=
new
ArrayList
<
NameValuePair
>();
...
...
@@ -303,20 +344,48 @@ public class HttpClientUtil {
NameValuePair
pair
=
new
NameValuePair
(
key
,
params
.
get
(
key
));
list
.
add
(
pair
);
}
method
.
setRequestBody
(
list
.
toArray
(
new
NameValuePair
[
list
.
size
()]));
NameValuePair
[]
body
=
new
NameValuePair
[
list
.
size
()];
body
=
list
.
toArray
(
body
);
method
.
setRequestBody
(
body
);
return
executeMethod
(
httpClient
,
method
,
readCharsetName
,
writeCharsetName
);
}
private
static
String
executeMethod
(
HttpClient
httpClient
,
HttpMethod
method
,
String
readCharsetName
,
String
writeCharsetName
)
{
String
response
=
null
;
try
{
int
status
=
httpClient
.
executeMethod
(
method
);
response
=
method
.
getResponseBodyAsString
();
}
catch
(
IOException
e
)
{
log
.
error
(
"执行HTTP Post请求"
+
url
+
"时，发生异常！"
,
e
);
}
finally
{
httpClient
.
executeMethod
(
method
);
}
catch
(
IOException
e
)
{
// try {
// logger.error("执行HTTP请求" + method.getURI().toString() + "时，发生异常！", e);
// }
// catch (URIException e1) {
// logger.error("URIException", e1);
// }
}
finally
{
if
(
method
.
getStatusCode
()
==
HttpStatus
.
SC_OK
)
{
StringBuffer
stringBuffer
=
new
StringBuffer
();
try
{
BufferedReader
reader
=
new
BufferedReader
(
new
InputStreamReader
(
method
.
getResponseBodyAsStream
(),
readCharsetName
));
String
str
=
""
;
while
((
str
=
reader
.
readLine
())
!=
null
)
{
stringBuffer
.
append
(
new
String
(
str
.
getBytes
(
readCharsetName
),
writeCharsetName
));
}
}
catch
(
IOException
e
)
{
// try {
// //logger.error("执行HTTP响应结果" + method.getURI().toString() + "时，发生异常！", e);
// }
// catch (URIException e1) {
// //logger.error("URIException", e1);
// }
}
response
=
stringBuffer
.
toString
();
}
method
.
releaseConnection
();
}
long
end
=
System
.
currentTimeMillis
();
log
.
debug
(
"---------------http's time to get data from report-------------------"
);
log
.
debug
(
start
-
end
+
"ms"
);
log
.
debug
(
"---------------------------------------------------------------------"
);
return
response
;
}
}
src/main/java/util/NewUserLogThread.java
View file @
0e91d6b6
...
...
@@ -38,13 +38,14 @@ public class NewUserLogThread
private
String
newObject
;
//为了获取ip及解析地点
private
HttpServletRequest
request
;
private
String
platform
;
/**
* 传入内容为对象
* UserLogThread userlog = new UserLogThread("zxy@reyun.com", "zxy", OperateObjectTypeEnum.CUSTOMER.getKey(), "app", "查看app", request);
* userlog.start();
*/
public
NewUserLogThread
(
String
operaAccount
,
String
accountName
,
String
operateObjectType
,
String
operateObject
,
String
operateType
,
String
oldObject
,
String
newObject
,
HttpServletRequest
request
)
{
public
NewUserLogThread
(
String
operaAccount
,
String
accountName
,
String
operateObjectType
,
String
operateObject
,
String
operateType
,
String
oldObject
,
String
newObject
,
HttpServletRequest
request
,
String
platform
)
{
this
.
operaAccount
=
operaAccount
;
this
.
accountName
=
accountName
;
this
.
operateObjectType
=
operateObjectType
;
...
...
@@ -70,6 +71,7 @@ public class NewUserLogThread
audit
.
setOperateType
(
this
.
operateType
);
audit
.
setOldObject
(
this
.
oldObject
);
audit
.
setNewObject
(
this
.
newObject
);
audit
.
setPlatfrom
(
this
.
platform
);
User
user
=
userRepository
.
findByEmail
(
this
.
operaAccount
);
audit
.
setRole
(
user
.
getRole
());
...
...
src/main/java/util/UserLogThread.java
View file @
0e91d6b6
...
...
@@ -34,6 +34,8 @@ public class UserLogThread
private
Long
role
;
private
String
platfrom
;
/**
* 传入内容为对象
* UserLogThread userlog = new UserLogThread("zxy@reyun.com", "zxy", OperateObjectTypeEnum.CUSTOMER.getKey(), "app", "查看app", request);
...
...
src/main/resources/rest-servlet.xml
View file @
0e91d6b6
...
...
@@ -11,6 +11,7 @@
<context:component-scan
base-package=
"track.controller"
/>
<context:component-scan
base-package=
"tkio.controller"
/>
<context:component-scan
base-package=
"userio.controller"
/>
<context:component-scan
base-package=
"adi.controller"
/>
<mvc:annotation-driven>
<mvc:argument-resolvers>
...
...
src/main/resources/spring/applicationContext.xml
View file @
0e91d6b6
...
...
@@ -23,6 +23,7 @@
<context:component-scan
base-package=
"office"
/>
<context:component-scan
base-package=
"dmp"
/>
<context:component-scan
base-package=
"security"
/>
<context:component-scan
base-package=
"adi"
/>
<context:property-placeholder
location=
"classpath:persistence.properties,classpath:redis.properties"
/>
...
...
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
