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
9e50ac7b
Commit
9e50ac7b
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同
parent
97caee98
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
401 additions
and
584 deletions
+401
-584
workspace.xml
.idea/workspace.xml
+223
-581
UserController.java
src/main/java/common/controller/UserController.java
+9
-0
User.java
src/main/java/common/model/User.java
+13
-0
AuthRepository.java
src/main/java/common/repository/AuthRepository.java
+4
-0
UserRepository.java
src/main/java/common/repository/UserRepository.java
+22
-2
UserService.java
src/main/java/common/service/UserService.java
+6
-0
UserServiceImpl.java
src/main/java/common/service/impl/UserServiceImpl.java
+124
-1
No files found.
.idea/workspace.xml
View file @
9e50ac7b
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
""
>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/ContractChange.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java"
/>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
"合同"
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/model/User.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/model/User.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
afterPath=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -32,66 +29,34 @@
<component
name=
"ExecutionTargetManager"
SELECTED_TARGET=
"default_target"
/>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"
Contract
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/Contract
.java"
>
<file
leaf-file-name=
"
UserController
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/UserController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
459
"
>
<caret
line=
"
244"
column=
"35"
lean-forward=
"false"
selection-start-line=
"244"
selection-start-column=
"35"
selection-end-line=
"244"
selection-end-column=
"35
"
/>
<state
relative-caret-position=
"
3565
"
>
<caret
line=
"
179"
column=
"46"
lean-forward=
"false"
selection-start-line=
"179"
selection-start-column=
"46"
selection-end-line=
"179"
selection-end-column=
"46
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1496#1497#0"
expanded=
"true"
/>
<element
signature=
"e#1529#1530#0"
expanded=
"true"
/>
<element
signature=
"e#1581#1582#0"
expanded=
"true"
/>
<element
signature=
"e#1625#1626#0"
expanded=
"true"
/>
<element
signature=
"e#2489#2490#0"
expanded=
"true"
/>
<element
signature=
"e#2519#2520#0"
expanded=
"true"
/>
<element
signature=
"e#2638#2639#0"
expanded=
"true"
/>
<element
signature=
"e#2671#2672#0"
expanded=
"true"
/>
<element
signature=
"e#4154#4155#0"
expanded=
"true"
/>
<element
signature=
"e#4183#4184#0"
expanded=
"true"
/>
<element
signature=
"e#4227#4228#0"
expanded=
"true"
/>
<element
signature=
"e#4263#4264#0"
expanded=
"true"
/>
<element
signature=
"e#4296#4297#0"
expanded=
"true"
/>
<element
signature=
"e#4327#4328#0"
expanded=
"true"
/>
<element
signature=
"e#4373#4374#0"
expanded=
"true"
/>
<element
signature=
"e#4413#4414#0"
expanded=
"true"
/>
<element
signature=
"e#4445#4446#0"
expanded=
"true"
/>
<element
signature=
"e#4475#4476#0"
expanded=
"true"
/>
<element
signature=
"e#4519#4520#0"
expanded=
"true"
/>
<element
signature=
"e#4557#4558#0"
expanded=
"true"
/>
<element
signature=
"e#4607#4608#0"
expanded=
"true"
/>
<element
signature=
"e#4638#4639#0"
expanded=
"true"
/>
<element
signature=
"e#4686#4687#0"
expanded=
"true"
/>
<element
signature=
"e#4726#4727#0"
expanded=
"true"
/>
<element
signature=
"e#4781#4782#0"
expanded=
"true"
/>
<element
signature=
"e#4818#4819#0"
expanded=
"true"
/>
<element
signature=
"e#4878#4879#0"
expanded=
"true"
/>
<element
signature=
"e#4930#4931#0"
expanded=
"true"
/>
<element
signature=
"e#5000#5001#0"
expanded=
"true"
/>
<element
signature=
"e#5052#5053#0"
expanded=
"true"
/>
<element
signature=
"e#5096#5097#0"
expanded=
"true"
/>
<element
signature=
"e#7562#7563#0"
expanded=
"true"
/>
<element
signature=
"e#7629#7630#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
ContractRepository
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/ContractRepository
.java"
>
<file
leaf-file-name=
"
UserService
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
service/UserService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"366"
>
<caret
line=
"24"
column=
"23"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"13"
selection-end-line=
"24"
selection-end-column=
"23"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"759"
>
<caret
line=
"36"
column=
"0"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"0"
selection-end-line=
"36"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
ContractService.java"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/
ContractService
.java"
>
<file
leaf-file-name=
"
UserServiceImpl.java"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/
impl/UserServiceImpl
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"
39"
column=
"13"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"13"
selection-end-line=
"39
"
selection-end-column=
"13"
/>
<state
relative-caret-position=
"
23
"
>
<caret
line=
"
154"
column=
"13"
lean-forward=
"false"
selection-start-line=
"154"
selection-start-column=
"13"
selection-end-line=
"154
"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
...
...
@@ -99,20 +64,12 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"
ContractServiceImpl
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
service/impl/ContractServiceImpl
.java"
>
<file
leaf-file-name=
"
UserRepository
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
repository/UserRepository
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"153"
>
<caret
line=
"285"
column=
"106"
lean-forward=
"true"
selection-start-line=
"285"
selection-start-column=
"106"
selection-end-line=
"285"
selection-end-column=
"106"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1736#1737#0"
expanded=
"true"
/>
<element
signature=
"e#1791#1792#0"
expanded=
"true"
/>
<element
signature=
"e#2295#2296#0"
expanded=
"true"
/>
<element
signature=
"e#2349#2350#0"
expanded=
"true"
/>
<element
signature=
"e#2632#2633#0"
expanded=
"true"
/>
<element
signature=
"e#2681#2682#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"644"
>
<caret
line=
"34"
column=
"0"
lean-forward=
"false"
selection-start-line=
"34"
selection-start-column=
"0"
selection-end-line=
"35"
selection-end-column=
"40"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -120,26 +77,9 @@
<file
leaf-file-name=
"ContractController.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"320"
>
<caret
line=
"109"
column=
"89"
lean-forward=
"true"
selection-start-line=
"109"
selection-start-column=
"89"
selection-end-line=
"109"
selection-end-column=
"89"
/>
<folding>
<element
signature=
"e#1271#1272#0"
expanded=
"true"
/>
<element
signature=
"e#1328#1329#0"
expanded=
"true"
/>
<element
signature=
"e#2310#2311#0"
expanded=
"true"
/>
<element
signature=
"e#2367#2368#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ContractMoney.java"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"240"
>
<caret
line=
"13"
column=
"31"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"19"
selection-end-line=
"13"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"2208"
>
<caret
line=
"109"
column=
"89"
lean-forward=
"false"
selection-start-line=
"109"
selection-start-column=
"89"
selection-end-line=
"109"
selection-end-column=
"89"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -192,10 +132,6 @@
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/src/main/java/office/repository/BussinessManRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/dic/RoleEnum.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/persistence.properties"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/applicationContext.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/util/Constant.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/resources/redis.properties"
/>
...
...
@@ -204,8 +140,6 @@
<option
value=
"$PROJECT_DIR$/target/classes/spring/applicationContext.xml"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/SendEmailService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java"
/>
...
...
@@ -233,7 +167,6 @@
<option
value=
"$PROJECT_DIR$/src/main/java/util/DateUtil.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/Contract.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java"
/>
...
...
@@ -243,6 +176,13 @@
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/model/User.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/controller/UserController.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/UserService.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java"
/>
<option
value=
"$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
/>
</list>
</option>
</component>
...
...
@@ -337,7 +277,6 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"PackagesPane"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<PATH>
...
...
@@ -407,196 +346,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=
"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=
"tkio"
/>
<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=
"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=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
...
...
@@ -619,14 +368,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=
"common"
/>
<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>
...
...
@@ -653,44 +394,6 @@
<option
name=
"myItemId"
value=
"common"
/>
<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=
"common"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"repository"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
...
...
@@ -718,14 +421,15 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"
model
"
/>
<option
name=
"myItemId"
value=
"
controller
"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"PackagesPane"
/>
<pane
id=
"Scope"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -1210,7 +914,9 @@
<workItem
from=
"1515728204617"
duration=
"796000"
/>
<workItem
from=
"1515983952975"
duration=
"10545000"
/>
<workItem
from=
"1516096949113"
duration=
"5148000"
/>
<workItem
from=
"1516155511499"
duration=
"42877000"
/>
<workItem
from=
"1516155511499"
duration=
"43292000"
/>
<workItem
from=
"1516327450910"
duration=
"12490000"
/>
<workItem
from=
"1516586760731"
duration=
"1493000"
/>
</task>
<task
id=
"LOCAL-00003"
summary=
"Merge branch 'master' of git.minrow.com:reyun/manager # Conflicts: #	pom.xml #	target/classes/common.properties #	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst "
>
<created>
1514871143365
</created>
...
...
@@ -1534,15 +1240,22 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1516244162355
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"49"
/>
<task
id=
"LOCAL-00049"
summary=
"合同"
>
<created>
1516272512766
</created>
<option
name=
"number"
value=
"00049"
/>
<option
name=
"presentableId"
value=
"LOCAL-00049"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1516272512766
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"50"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"2
13655
000"
/>
<option
name=
"totallyTimeSpent"
value=
"2
28053
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"
6
"
/>
<editor
active=
"
fals
e"
/>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"
0
"
/>
<editor
active=
"
tru
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"
/>
...
...
@@ -1555,17 +1268,17 @@
<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.
45499182
"
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.
33387887
"
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=
"
true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"tru
e"
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.4
8608837
"
sideWeight=
"0.49319214"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"
false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"fals
e"
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.4
6644846
"
sideWeight=
"0.49319214"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Spring"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.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=
"
true"
show_stripe_button=
"true"
weight=
"0.2844175
4"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
false"
show_stripe_button=
"true"
weight=
"0.2889561
4"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Web"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"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"
/>
...
...
@@ -1586,6 +1299,49 @@
<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"
/>
</layout>
<layout-to-restore>
<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=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"11"
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"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.42389524"
sideWeight=
"0.50680786"
order=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Application Servers"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"12"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Maven Projects"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.46747354"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"JRebel Executor"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"13"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Properties"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Capture Tool"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"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=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Hierarchy"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"11"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Memory View"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Get Gist"
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=
"15"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
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=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"SonarQube"
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=
"16"
side_tool=
"false"
content_ui=
"tabs"
/>
<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.33387887"
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"
/>
<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=
"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.36988544"
sideWeight=
"0.49319214"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Spring"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.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"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.28895614"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Bean Validation"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980332"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Web"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"4"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"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=
"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>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
<option
name=
"processedProjectFiles"
value=
"true"
/>
...
...
@@ -1646,14 +1402,8 @@
<properties
/>
<option
name=
"timeStamp"
value=
"5"
/>
</line-breakpoint>
<line-breakpoint
enabled=
"true"
type=
"java-line"
>
<url>
file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java
</url>
<line>
48
</line>
<properties
/>
<option
name=
"timeStamp"
value=
"10"
/>
</line-breakpoint>
</breakpoints>
<option
name=
"time"
value=
"
15
"
/>
<option
name=
"time"
value=
"
23
"
/>
</breakpoint-manager>
<watches-manager
/>
</component>
...
...
@@ -1662,71 +1412,6 @@
<option
name=
"FILTER_TARGETS"
value=
"false"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"256"
>
<caret
line=
"161"
column=
"0"
lean-forward=
"true"
selection-start-line=
"161"
selection-start-column=
"0"
selection-end-line=
"161"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"23"
>
<caret
line=
"18"
column=
"22"
lean-forward=
"false"
selection-start-line=
"18"
selection-start-column=
"12"
selection-end-line=
"18"
selection-end-column=
"22"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"228"
>
<caret
line=
"38"
column=
"30"
lean-forward=
"false"
selection-start-line=
"38"
selection-start-column=
"30"
selection-end-line=
"38"
selection-end-column=
"30"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"597"
>
<caret
line=
"72"
column=
"58"
lean-forward=
"false"
selection-start-line=
"72"
selection-start-column=
"51"
selection-end-line=
"72"
selection-end-column=
"58"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"265"
>
<caret
line=
"151"
column=
"65"
lean-forward=
"false"
selection-start-line=
"151"
selection-start-column=
"55"
selection-end-line=
"151"
selection-end-column=
"65"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/AppService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"205"
>
<caret
line=
"15"
column=
"8"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"8"
selection-end-line=
"15"
selection-end-column=
"8"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"329"
>
<caret
line=
"46"
column=
"38"
lean-forward=
"true"
selection-start-line=
"46"
selection-start-column=
"38"
selection-end-line=
"46"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/mail.properties"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"23"
>
<caret
line=
"1"
column=
"17"
lean-forward=
"true"
selection-start-line=
"1"
selection-start-column=
"0"
selection-end-line=
"2"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/common.properties"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"16"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"16"
selection-end-line=
"0"
selection-end-column=
"16"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/db.properties"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -1766,7 +1451,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"274"
>
<caret
line=
"66"
column=
"0"
lean-forward=
"true"
selection-start-line=
"66"
selection-start-column=
"0"
selection-end-line=
"66"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1777,21 +1461,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"828"
>
<caret
line=
"53"
column=
"38"
lean-forward=
"false"
selection-start-line=
"53"
selection-start-column=
"38"
selection-end-line=
"53"
selection-end-column=
"38"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"12"
column=
"24"
lean-forward=
"false"
selection-start-line=
"12"
selection-start-column=
"24"
selection-end-line=
"12"
selection-end-column=
"24"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"115"
>
...
...
@@ -1803,7 +1472,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"713"
>
<caret
line=
"51"
column=
"43"
lean-forward=
"false"
selection-start-line=
"51"
selection-start-column=
"43"
selection-end-line=
"51"
selection-end-column=
"43"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1819,7 +1487,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"9"
column=
"0"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"0"
selection-end-line=
"9"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1827,7 +1494,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"138"
>
<caret
line=
"6"
column=
"0"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"0"
selection-end-line=
"6"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1842,25 +1508,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"182"
>
<caret
line=
"23"
column=
"21"
lean-forward=
"true"
selection-start-line=
"23"
selection-start-column=
"21"
selection-end-line=
"23"
selection-end-column=
"21"
/>
<folding>
<element
signature=
"imports"
expanded=
"false"
/>
<element
signature=
"e#354#355#0"
expanded=
"false"
/>
<element
signature=
"e#379#380#0"
expanded=
"false"
/>
<element
signature=
"e#413#414#0"
expanded=
"false"
/>
<element
signature=
"e#441#442#0"
expanded=
"false"
/>
<element
signature=
"e#472#473#0"
expanded=
"false"
/>
<element
signature=
"e#499#500#0"
expanded=
"false"
/>
<element
signature=
"e#539#540#0"
expanded=
"false"
/>
<element
signature=
"e#571#572#0"
expanded=
"false"
/>
<element
signature=
"e#608#609#0"
expanded=
"false"
/>
<element
signature=
"e#640#641#0"
expanded=
"false"
/>
<element
signature=
"e#691#692#0"
expanded=
"false"
/>
<element
signature=
"e#733#734#0"
expanded=
"false"
/>
<element
signature=
"e#764#765#0"
expanded=
"false"
/>
<element
signature=
"e#793#794#0"
expanded=
"false"
/>
<element
signature=
"e#835#836#0"
expanded=
"false"
/>
<element
signature=
"e#871#872#0"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -1868,7 +1515,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"90"
>
<caret
line=
"20"
column=
"25"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"25"
selection-end-line=
"20"
selection-end-column=
"25"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1879,19 +1525,10 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/User.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"276"
>
<caret
line=
"23"
column=
"0"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"0"
selection-end-line=
"26"
selection-end-column=
"28"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"115"
>
<caret
line=
"8"
column=
"74"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"74"
selection-end-line=
"8"
selection-end-column=
"74"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1899,21 +1536,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"368"
>
<caret
line=
"16"
column=
"19"
lean-forward=
"false"
selection-start-line=
"16"
selection-start-column=
"19"
selection-end-line=
"16"
selection-end-column=
"19"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#327#328#0"
expanded=
"true"
/>
<element
signature=
"e#352#353#0"
expanded=
"true"
/>
<element
signature=
"e#386#387#0"
expanded=
"true"
/>
<element
signature=
"e#414#415#0"
expanded=
"true"
/>
<element
signature=
"e#445#446#0"
expanded=
"true"
/>
<element
signature=
"e#472#473#0"
expanded=
"true"
/>
<element
signature=
"e#512#513#0"
expanded=
"true"
/>
<element
signature=
"e#544#545#0"
expanded=
"true"
/>
<element
signature=
"e#575#576#0"
expanded=
"true"
/>
<element
signature=
"e#602#603#0"
expanded=
"true"
/>
<element
signature=
"e#642#643#0"
expanded=
"true"
/>
<element
signature=
"e#674#675#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -1921,7 +1543,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"13"
column=
"0"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"0"
selection-end-line=
"14"
selection-end-column=
"29"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1929,7 +1550,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"368"
>
<caret
line=
"23"
column=
"33"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"33"
selection-end-line=
"23"
selection-end-column=
"33"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1937,7 +1557,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"220"
>
<caret
line=
"765"
column=
"33"
lean-forward=
"false"
selection-start-line=
"765"
selection-start-column=
"25"
selection-end-line=
"765"
selection-end-column=
"33"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1945,7 +1564,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"322"
>
<caret
line=
"23"
column=
"0"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"0"
selection-end-line=
"24"
selection-end-column=
"19"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1953,15 +1571,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"322"
>
<caret
line=
"18"
column=
"27"
lean-forward=
"true"
selection-start-line=
"18"
selection-start-column=
"27"
selection-end-line=
"18"
selection-end-column=
"27"
/>
<folding
/>
</state>
</provider>
</entry>
<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/JpaRepository.class"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
<caret
line=
"15"
column=
"12"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"12"
selection-end-line=
"15"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1969,9 +1578,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"205"
>
<caret
line=
"11"
column=
"30"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"30"
selection-end-line=
"11"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -1979,7 +1585,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
<caret
line=
"11"
column=
"83"
lean-forward=
"false"
selection-start-line=
"11"
selection-start-column=
"83"
selection-end-line=
"11"
selection-end-column=
"83"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1987,7 +1592,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"339"
>
<caret
line=
"69"
column=
"36"
lean-forward=
"true"
selection-start-line=
"69"
selection-start-column=
"36"
selection-end-line=
"69"
selection-end-column=
"36"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -1995,66 +1599,20 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"183"
>
<caret
line=
"2300"
column=
"28"
lean-forward=
"false"
selection-start-line=
"2300"
selection-start-column=
"28"
selection-end-line=
"2300"
selection-end-column=
"28"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"320"
>
<caret
line=
"28"
column=
"63"
lean-forward=
"false"
selection-start-line=
"28"
selection-start-column=
"63"
selection-end-line=
"28"
selection-end-column=
"63"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
459
"
>
<state
relative-caret-position=
"
3220
"
>
<caret
line=
"244"
column=
"35"
lean-forward=
"false"
selection-start-line=
"244"
selection-start-column=
"35"
selection-end-line=
"244"
selection-end-column=
"35"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1496#1497#0"
expanded=
"true"
/>
<element
signature=
"e#1529#1530#0"
expanded=
"true"
/>
<element
signature=
"e#1581#1582#0"
expanded=
"true"
/>
<element
signature=
"e#1625#1626#0"
expanded=
"true"
/>
<element
signature=
"e#2489#2490#0"
expanded=
"true"
/>
<element
signature=
"e#2519#2520#0"
expanded=
"true"
/>
<element
signature=
"e#2638#2639#0"
expanded=
"true"
/>
<element
signature=
"e#2671#2672#0"
expanded=
"true"
/>
<element
signature=
"e#4154#4155#0"
expanded=
"true"
/>
<element
signature=
"e#4183#4184#0"
expanded=
"true"
/>
<element
signature=
"e#4227#4228#0"
expanded=
"true"
/>
<element
signature=
"e#4263#4264#0"
expanded=
"true"
/>
<element
signature=
"e#4296#4297#0"
expanded=
"true"
/>
<element
signature=
"e#4327#4328#0"
expanded=
"true"
/>
<element
signature=
"e#4373#4374#0"
expanded=
"true"
/>
<element
signature=
"e#4413#4414#0"
expanded=
"true"
/>
<element
signature=
"e#4445#4446#0"
expanded=
"true"
/>
<element
signature=
"e#4475#4476#0"
expanded=
"true"
/>
<element
signature=
"e#4519#4520#0"
expanded=
"true"
/>
<element
signature=
"e#4557#4558#0"
expanded=
"true"
/>
<element
signature=
"e#4607#4608#0"
expanded=
"true"
/>
<element
signature=
"e#4638#4639#0"
expanded=
"true"
/>
<element
signature=
"e#4686#4687#0"
expanded=
"true"
/>
<element
signature=
"e#4726#4727#0"
expanded=
"true"
/>
<element
signature=
"e#4781#4782#0"
expanded=
"true"
/>
<element
signature=
"e#4818#4819#0"
expanded=
"true"
/>
<element
signature=
"e#4878#4879#0"
expanded=
"true"
/>
<element
signature=
"e#4930#4931#0"
expanded=
"true"
/>
<element
signature=
"e#5000#5001#0"
expanded=
"true"
/>
<element
signature=
"e#5052#5053#0"
expanded=
"true"
/>
<element
signature=
"e#5096#5097#0"
expanded=
"true"
/>
</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=
"3
66
"
>
<state
relative-caret-position=
"3
91
"
>
<caret
line=
"24"
column=
"23"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"13"
selection-end-line=
"24"
selection-end-column=
"23"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -2062,12 +1620,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"412"
>
<caret
line=
"143"
column=
"35"
lean-forward=
"false"
selection-start-line=
"143"
selection-start-column=
"35"
selection-end-line=
"143"
selection-end-column=
"35"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#2780#2781#0"
expanded=
"true"
/>
<element
signature=
"e#2832#2833#0"
expanded=
"true"
/>
<element
signature=
"e#2876#2877#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -2075,9 +1627,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"345"
>
<caret
line=
"15"
column=
"80"
lean-forward=
"true"
selection-start-line=
"15"
selection-start-column=
"80"
selection-end-line=
"15"
selection-end-column=
"80"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -2085,53 +1634,146 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
<caret
line=
"16"
column=
"79"
lean-forward=
"false"
selection-start-line=
"16"
selection-start-column=
"79"
selection-end-line=
"16"
selection-end-column=
"79"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
366
"
>
<state
relative-caret-position=
"
805
"
>
<caret
line=
"39"
column=
"13"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"13"
selection-end-line=
"39"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</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=
"6118"
>
<caret
line=
"285"
column=
"106"
lean-forward=
"false"
selection-start-line=
"285"
selection-start-column=
"106"
selection-end-line=
"285"
selection-end-column=
"106"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-289"
>
<caret
line=
"23"
column=
"13"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"13"
selection-end-line=
"23"
selection-end-column=
"13"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"13"
column=
"31"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"19"
selection-end-line=
"13"
selection-end-column=
"31"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"75"
column=
"0"
lean-forward=
"false"
selection-start-line=
"75"
selection-start-column=
"0"
selection-end-line=
"75"
selection-end-column=
"96"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/model/Account.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"17"
column=
"25"
lean-forward=
"true"
selection-start-line=
"17"
selection-start-column=
"25"
selection-end-line=
"17"
selection-end-column=
"25"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"12"
column=
"24"
lean-forward=
"false"
selection-start-line=
"12"
selection-start-column=
"24"
selection-end-line=
"12"
selection-end-column=
"24"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/model/User.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"174"
>
<caret
line=
"164"
column=
"18"
lean-forward=
"false"
selection-start-line=
"164"
selection-start-column=
"18"
selection-end-line=
"164"
selection-end-column=
"18"
/>
</state>
</provider>
</entry>
<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/JpaRepository.class"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"184"
>
<caret
line=
"15"
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/common/service/UserLogService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"13"
column=
"18"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"18"
selection-end-line=
"13"
selection-end-column=
"18"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"168"
>
<caret
line=
"23"
column=
"57"
lean-forward=
"true"
selection-start-line=
"23"
selection-start-column=
"57"
selection-end-line=
"23"
selection-end-column=
"57"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"171"
>
<caret
line=
"27"
column=
"50"
lean-forward=
"false"
selection-start-line=
"27"
selection-start-column=
"50"
selection-end-line=
"27"
selection-end-column=
"50"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"320"
>
<caret
line=
"109"
column=
"89"
lean-forward=
"true"
selection-start-line=
"109"
selection-start-column=
"89"
selection-end-line=
"109"
selection-end-column=
"89"
/>
<folding>
<element
signature=
"e#1271#1272#0"
expanded=
"true"
/>
<element
signature=
"e#1328#1329#0"
expanded=
"true"
/>
<element
signature=
"e#2310#2311#0"
expanded=
"true"
/>
<element
signature=
"e#2367#2368#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"2208"
>
<caret
line=
"109"
column=
"89"
lean-forward=
"false"
selection-start-line=
"109"
selection-start-column=
"89"
selection-end-line=
"109"
selection-end-column=
"89"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
service/impl/ContractServiceImpl
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
controller/UserController
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
153
"
>
<caret
line=
"
285"
column=
"106"
lean-forward=
"true"
selection-start-line=
"285"
selection-start-column=
"106"
selection-end-line=
"285"
selection-end-column=
"10
6"
/>
<state
relative-caret-position=
"
3565
"
>
<caret
line=
"
179"
column=
"46"
lean-forward=
"false"
selection-start-line=
"179"
selection-start-column=
"46"
selection-end-line=
"179"
selection-end-column=
"4
6"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<element
signature=
"e#1736#1737#0"
expanded=
"true"
/>
<element
signature=
"e#1791#1792#0"
expanded=
"true"
/>
<element
signature=
"e#2295#2296#0"
expanded=
"true"
/>
<element
signature=
"e#2349#2350#0"
expanded=
"true"
/>
<element
signature=
"e#2632#2633#0"
expanded=
"true"
/>
<element
signature=
"e#2681#2682#0"
expanded=
"true"
/>
<element
signature=
"e#7562#7563#0"
expanded=
"true"
/>
<element
signature=
"e#7629#7630#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
model/ContractMoney
.java"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/
service/UserService
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"240"
>
<caret
line=
"13"
column=
"31"
lean-forward=
"false"
selection-start-line=
"13"
selection-start-column=
"19"
selection-end-line=
"13"
selection-end-column=
"31"
/>
<state
relative-caret-position=
"759"
>
<caret
line=
"36"
column=
"0"
lean-forward=
"false"
selection-start-line=
"36"
selection-start-column=
"0"
selection-end-line=
"36"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<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=
"575"
>
<caret
line=
"29"
column=
"46"
lean-forward=
"true"
selection-start-line=
"29"
selection-start-column=
"46"
selection-end-line=
"29"
selection-end-column=
"46"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"644"
>
<caret
line=
"34"
column=
"0"
lean-forward=
"false"
selection-start-line=
"34"
selection-start-column=
"0"
selection-end-line=
"35"
selection-end-column=
"40"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"207"
>
<caret
line=
"16"
column=
"29"
lean-forward=
"false"
selection-start-line=
"16"
selection-start-column=
"15"
selection-end-line=
"16"
selection-end-column=
"29"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"23"
>
<caret
line=
"154"
column=
"13"
lean-forward=
"false"
selection-start-line=
"154"
selection-start-column=
"13"
selection-end-line=
"154"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/controller/UserController.java
View file @
9e50ac7b
...
...
@@ -172,4 +172,13 @@ public class UserController {
public
ResultModel
validCode
(
@RequestParam
String
email
,
@RequestParam
String
code
,
@RequestParam
String
pwd
)
{
return
ResultModel
.
OK
(
userService
.
validCode
(
email
,
code
,
pwd
));
}
@RequestMapping
(
value
=
"/find/{role}"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
findByRole
(
@PathVariable
Long
role
)
{
return
ResultModel
.
OK
(
userService
.
findbyRole
(
role
));
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/model/User.java
View file @
9e50ac7b
...
...
@@ -20,6 +20,7 @@ public class User {
private
String
roleTypeName
;
private
String
auth
;
private
Boolean
status
;
private
Long
parent
;
private
Long
modifyAccount
;
private
Long
createAccount
;
...
...
@@ -152,6 +153,14 @@ public class User {
this
.
roleName
=
roleName
;
}
public
Long
getParent
()
{
return
parent
;
}
public
void
setParent
(
Long
parent
)
{
this
.
parent
=
parent
;
}
@Override
public
String
toString
()
{
return
"User{"
+
...
...
@@ -160,8 +169,12 @@ public class User {
", password='"
+
password
+
'\''
+
", name='"
+
name
+
'\''
+
", role="
+
role
+
", roleName='"
+
roleName
+
'\''
+
", roleType="
+
roleType
+
", roleTypeName='"
+
roleTypeName
+
'\''
+
", auth='"
+
auth
+
'\''
+
", status="
+
status
+
", parent="
+
parent
+
", modifyAccount="
+
modifyAccount
+
", createAccount="
+
createAccount
+
", modifyTime="
+
modifyTime
+
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/repository/AuthRepository.java
View file @
9e50ac7b
...
...
@@ -2,6 +2,7 @@ package common.repository;
import
common.model.Auth
;
import
common.model.Menu
;
import
common.model.User
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -12,4 +13,7 @@ import java.util.List;
public
interface
AuthRepository
extends
JpaRepository
<
Auth
,
Long
>
{
Auth
findByUser
(
Long
user
);
@Query
(
value
=
"SELECT * from `auth` where user in ?1"
,
nativeQuery
=
true
)
List
<
Auth
>
findAllByUsers
(
List
<
Long
>
ids
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/repository/UserRepository.java
View file @
9e50ac7b
...
...
@@ -26,7 +26,27 @@ public interface UserRepository extends JpaRepository<User, Long> {
@Query
(
value
=
"select * from user where del_flag is not true and (role = 2 or role = 3)"
,
nativeQuery
=
true
)
List
<
User
>
findSales
();
@Query
(
value
=
"
select * from user where role = 2 or role = 3
"
,
nativeQuery
=
true
)
List
<
User
>
findAll
Sales
(
);
@Query
(
value
=
"
SELECT * from `user` where del_flag is not true and role = ?1 ORDER BY role_type
"
,
nativeQuery
=
true
)
List
<
User
>
findAll
ByRole
(
Long
role
);
@Query
(
value
=
"SELECT * from `user` where role = ?1 ORDER BY role_type"
,
nativeQuery
=
true
)
List
<
User
>
findAllUserByRole
(
Long
role
);
@Query
(
value
=
"SELECT * from `user` where del_flag is not true and parent = ?1"
,
nativeQuery
=
true
)
List
<
User
>
findAllByParent
(
Long
id
);
@Query
(
value
=
"SELECT * from `user` where parent = ?1"
,
nativeQuery
=
true
)
List
<
User
>
findByParent
(
Long
id
);
@Query
(
value
=
"SELECT * from `user` where del_flag is not true and id in ?1"
,
nativeQuery
=
true
)
List
<
User
>
findAllByIds
(
List
<
Long
>
ids
);
@Query
(
value
=
"SELECT * from `user` where id in ?1"
,
nativeQuery
=
true
)
List
<
User
>
findByIds
(
List
<
Long
>
ids
);
@Query
(
value
=
"SELECT * from `user` where del_flag is not true and parent in ?1"
,
nativeQuery
=
true
)
List
<
User
>
findAllByParents
(
List
<
Long
>
ids
);
@Query
(
value
=
"SELECT * from `user` where parent in ?1"
,
nativeQuery
=
true
)
List
<
User
>
findByParents
(
List
<
Long
>
ids
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/UserService.java
View file @
9e50ac7b
...
...
@@ -33,4 +33,10 @@ public interface UserService {
Boolean
sendCode
(
String
email
);
Boolean
validCode
(
String
email
,
String
code
,
String
pwd
);
List
<
User
>
findbyRole
(
Long
role
);
List
<
User
>
findSonsAlive
(
Long
user
);
List
<
User
>
findAllSons
(
Long
user
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/UserServiceImpl.java
View file @
9e50ac7b
...
...
@@ -9,6 +9,8 @@ import common.repository.UserRepository;
import
common.service.UserService
;
import
dic.RoleEnum
;
import
dic.RoleTypeEnum
;
import
net.sf.json.JSONArray
;
import
net.sf.json.JSONObject
;
import
office.service.BussinussManService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -101,7 +103,45 @@ public class UserServiceImpl implements UserService {
auth
.
setModifyAccount
(
login
.
getId
());
auth
.
setAuth
(
resource
.
getAuth
());
auth
.
setUser
(
save
.
getId
());
authRepository
.
save
(
auth
);
Auth
authSave
=
authRepository
.
save
(
auth
);
if
(
save
.
getRoleType
().
equals
(
RoleTypeEnum
.
COMMON
.
getKey
())){
JSONArray
rootArr
=
JSONArray
.
fromObject
(
authSave
.
getAuth
());
List
<
String
>
authList
=
new
ArrayList
<>();
if
(
ValidateUtil
.
isValid
(
rootArr
)){
for
(
int
i
=
0
;
i
<
rootArr
.
size
();
i
++)
{
JSONObject
obj
=
rootArr
.
getJSONObject
(
i
);
authList
.
add
(
obj
.
getString
(
"id"
));
}
}
List
<
User
>
userList
=
findSonsAlive
(
save
.
getId
());
if
(
ValidateUtil
.
isValid
(
userList
)){
List
<
Long
>
ids
=
new
ArrayList
<>();
for
(
User
u
:
userList
){
ids
.
add
(
u
.
getId
());
}
List
<
Auth
>
list
=
authRepository
.
findAllByUsers
(
ids
);
if
(
ValidateUtil
.
isValid
(
list
)){
List
<
Auth
>
authListSave
=
new
ArrayList
<>();
for
(
Auth
a
:
list
){
String
authStr
=
a
.
getAuth
();
JSONArray
arrSave
=
new
JSONArray
();
JSONArray
arr
=
JSONArray
.
fromObject
(
authStr
);
if
(
ValidateUtil
.
isValid
(
arr
)){
for
(
int
i
=
0
;
i
<
arr
.
size
();
i
++)
{
JSONObject
obj
=
arr
.
getJSONObject
(
i
);
if
(
authList
.
contains
(
obj
.
getString
(
"id"
))){
arrSave
.
add
(
obj
);
}
}
}
a
.
setAuth
(
arrSave
.
toString
());
authListSave
.
add
(
a
);
}
authRepository
.
save
(
authSave
);
}
}
}
return
save
;
}
...
...
@@ -120,6 +160,8 @@ public class UserServiceImpl implements UserService {
userList
=
userRepository
.
findList
();
}
else
if
(
RoleTypeEnum
.
MANAGER
.
getKey
().
equals
(
login
.
getRoleType
())){
userList
=
userRepository
.
findOneDepartment
(
login
.
getRole
());
}
else
{
userList
=
findSonsAlive
(
login
.
getId
());
}
if
(
ValidateUtil
.
isValid
(
userList
)){
for
(
User
u
:
userList
){
...
...
@@ -226,4 +268,85 @@ public class UserServiceImpl implements UserService {
}
return
false
;
}
@Override
public
List
<
User
>
findbyRole
(
Long
role
)
{
List
<
Auth
>
authList
=
authRepository
.
findAll
();
Map
<
Long
,
String
>
map
=
new
HashMap
<>();
if
(
ValidateUtil
.
isValid
(
authList
)){
for
(
Auth
a
:
authList
){
map
.
put
(
a
.
getUser
(),
a
.
getAuth
());
}
}
List
<
User
>
result
=
new
ArrayList
<>();
List
<
User
>
userList
=
userRepository
.
findAllByRole
(
role
);
if
(
ValidateUtil
.
isValid
(
userList
)){
for
(
User
u
:
userList
){
if
(
map
.
containsKey
(
u
.
getId
())){
u
.
setAuth
(
map
.
get
(
u
.
getId
()));
}
result
.
add
(
u
);
}
}
return
result
;
}
@Override
public
List
<
User
>
findSonsAlive
(
Long
user
)
{
List
<
User
>
result
=
new
ArrayList
<>();
User
one
=
userRepository
.
findOne
(
user
);
if
(
one
.
getRole
().
equals
(
RoleEnum
.
MANAGER
.
getKey
())){
List
<
User
>
list
=
userRepository
.
findList
();
if
(
ValidateUtil
.
isValid
(
list
)){
result
.
addAll
(
list
);
}
}
else
if
(
one
.
getRoleType
().
equals
(
RoleTypeEnum
.
MANAGER
.
getKey
())){
List
<
User
>
list
=
userRepository
.
findAllByRole
(
one
.
getRole
());
if
(
ValidateUtil
.
isValid
(
list
)){
result
.
addAll
(
list
);
}
}
else
{
List
<
User
>
list
=
userRepository
.
findAllByParent
(
user
);
while
(
ValidateUtil
.
isValid
(
list
)){
result
.
addAll
(
list
);
List
<
Long
>
ids
=
new
ArrayList
<>();
for
(
User
u
:
list
){
ids
.
add
(
u
.
getId
());
}
list
=
userRepository
.
findAllByParents
(
ids
);
}
}
return
result
;
}
@Override
public
List
<
User
>
findAllSons
(
Long
user
)
{
List
<
User
>
result
=
new
ArrayList
<>();
User
one
=
userRepository
.
findOne
(
user
);
if
(
one
.
getRole
().
equals
(
RoleEnum
.
MANAGER
.
getKey
())){
List
<
User
>
list
=
userRepository
.
findAll
();
if
(
ValidateUtil
.
isValid
(
list
)){
result
.
addAll
(
list
);
}
}
else
if
(
one
.
getRoleType
().
equals
(
RoleTypeEnum
.
MANAGER
.
getKey
())){
List
<
User
>
list
=
userRepository
.
findAllUserByRole
(
one
.
getRole
());
if
(
ValidateUtil
.
isValid
(
list
)){
result
.
addAll
(
list
);
}
}
else
{
List
<
User
>
list
=
userRepository
.
findByParent
(
user
);
while
(
ValidateUtil
.
isValid
(
list
)){
result
.
addAll
(
list
);
List
<
Long
>
ids
=
new
ArrayList
<>();
for
(
User
u
:
list
){
ids
.
add
(
u
.
getId
());
}
list
=
userRepository
.
findByParents
(
ids
);
}
}
return
result
;
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment