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
ca5545f8
Commit
ca5545f8
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test pom
parent
5affa9c3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
136 additions
and
35 deletions
+136
-35
workspace.xml
.idea/workspace.xml
+133
-32
pom.xml
pom.xml
+3
-3
No files found.
.idea/workspace.xml
View file @
ca5545f8
<?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=
"DELETED"
beforePath=
"$PROJECT_DIR$/src/main/java/util/RedisUtilNew.java"
afterPath=
""
/>
<list
default=
"true"
id=
"e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad"
name=
"Default"
comment=
"test pom"
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/pom.xml"
afterPath=
"$PROJECT_DIR$/pom.xml"
/>
</list>
...
...
@@ -24,8 +23,28 @@
<file
leaf-file-name=
"pom.xml"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"571"
>
<caret
line=
"106"
column=
"101"
lean-forward=
"false"
selection-start-line=
"106"
selection-start-column=
"101"
selection-end-line=
"106"
selection-end-column=
"101"
/>
<state
relative-caret-position=
"390"
>
<caret
line=
"39"
column=
"27"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"17"
selection-end-line=
"39"
selection-end-column=
"27"
/>
<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/applicationContext.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"411"
>
<caret
line=
"166"
column=
"0"
lean-forward=
"true"
selection-start-line=
"166"
selection-start-column=
"0"
selection-end-line=
"166"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"db.properties"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/db.properties"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"23"
>
<caret
line=
"1"
column=
"15"
lean-forward=
"false"
selection-start-line=
"1"
selection-start-column=
"15"
selection-end-line=
"1"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
...
...
@@ -111,6 +130,13 @@
<detection-done>
true
</detection-done>
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"MavenImportPreferences"
>
<option
name=
"importingSettings"
>
<MavenImportingSettings>
<option
name=
"importAutomatically"
value=
"true"
/>
</MavenImportingSettings>
</option>
</component>
<component
name=
"MavenProjectNavigator"
>
<treeState>
<PATH>
...
...
@@ -189,6 +215,70 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"External Libraries"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode"
/>
</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=
"External Libraries"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"< 1.8 >"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode"
/>
</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=
"External Libraries"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"< 1.8 >"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"deploy.jar"
/>
<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=
"External Libraries"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"< 1.8 >"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"deploy.jar"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"com"
/>
<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>
...
...
@@ -247,11 +337,7 @@
<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=
"util"
/>
<option
name=
"myItemId"
value=
"resources"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
...
...
@@ -347,7 +433,7 @@
<property
name=
"js.eslint.eslintPackage"
value=
""
/>
<property
name=
"js-jscs-nodeInterpreter"
value=
"C:\Program Files\nodejs\node.exe"
/>
<property
name=
"last_directory_selection"
value=
"$PROJECT_DIR$/src/main/java"
/>
<property
name=
"SearchEverywhereHistoryKey"
value=
"bysql	PSI	JAVA://tkio.service.impl.TkioAccountServiceImpl#URI_REPORT_BY_SQL"
/>
<property
name=
"SearchEverywhereHistoryKey"
value=
"
.update	PSI	JAVA://update
bysql	PSI	JAVA://tkio.service.impl.TkioAccountServiceImpl#URI_REPORT_BY_SQL"
/>
<property
name=
"project.structure.last.edited"
value=
"Modules"
/>
<property
name=
"project.structure.proportion"
value=
"0.15"
/>
<property
name=
"project.structure.side.proportion"
value=
"0.0"
/>
...
...
@@ -838,15 +924,22 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514873706284
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"8"
/>
<task
id=
"LOCAL-00008"
summary=
"test pom"
>
<created>
1514874005111
</created>
<option
name=
"number"
value=
"00008"
/>
<option
name=
"presentableId"
value=
"LOCAL-00008"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1514874005111
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"9"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"5
8887
000"
/>
<option
name=
"totallyTimeSpent"
value=
"5
9904
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"744"
extended-state=
"0"
/>
<editor
active=
"
fals
e"
/>
<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=
"7"
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=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -867,7 +960,7 @@
<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=
"4"
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.3289689"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"
true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"tru
e"
show_stripe_button=
"true"
weight=
"0.42880523"
sideWeight=
"0.5"
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=
"fals
e"
show_stripe_button=
"true"
weight=
"0.42880523"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Spring"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.5581015"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.2647504"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -969,14 +1062,6 @@
<option
name=
"FILTER_TARGETS"
value=
"false"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/dic/RoleTypeEnum.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"132"
>
<caret
line=
"6"
column=
"12"
lean-forward=
"false"
selection-start-line=
"6"
selection-start-column=
"12"
selection-end-line=
"6"
selection-end-column=
"12"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.java"
/>
<entry
file=
"file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"110"
>
...
...
@@ -1214,14 +1299,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/applicationContext.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"112"
>
<caret
line=
"165"
column=
"60"
lean-forward=
"false"
selection-start-line=
"165"
selection-start-column=
"60"
selection-end-line=
"165"
selection-end-column=
"60"
/>
<folding
/>
</state>
</provider>
</entry>
<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=
"997"
>
...
...
@@ -1301,10 +1378,34 @@
</state>
</provider>
</entry>
<entry
file=
"jar://$MAVEN_REPOSITORY$/dnsjava/dnsjava/2.1.8/dnsjava-2.1.8.jar!/update.class"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-2737"
>
<caret
line=
"35"
column=
"13"
lean-forward=
"false"
selection-start-line=
"35"
selection-start-column=
"13"
selection-end-line=
"35"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/main/resources/applicationContext.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"411"
>
<caret
line=
"166"
column=
"0"
lean-forward=
"true"
selection-start-line=
"166"
selection-start-column=
"0"
selection-end-line=
"166"
selection-end-column=
"0"
/>
<folding
/>
</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=
"23"
>
<caret
line=
"1"
column=
"15"
lean-forward=
"false"
selection-start-line=
"1"
selection-start-column=
"15"
selection-end-line=
"1"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pom.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
571
"
>
<caret
line=
"
106"
column=
"101"
lean-forward=
"false"
selection-start-line=
"106"
selection-start-column=
"101"
selection-end-line=
"106"
selection-end-column=
"101
"
/>
<state
relative-caret-position=
"
390
"
>
<caret
line=
"
39"
column=
"27"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"17"
selection-end-line=
"39"
selection-end-column=
"27
"
/>
<folding
/>
</state>
</provider>
...
...
This diff is collapsed.
Click to expand it.
pom.xml
View file @
ca5545f8
...
...
@@ -88,9 +88,9 @@
<!--数据源配置-->
<datasource.driver>
com.mysql.jdbc.Driver
</datasource.driver>
<!--//office-->
<d
atasource.url>
jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
</
datasource.url>
<d
atasource.username>
reyuntest
</
datasource.username>
<d
atasource.password>
reyuntest
</
datasource.password>
<d
efault.datasource.url>
jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
</default.
datasource.url>
<d
efault.datasource.username>
reyuntest
</default.
datasource.username>
<d
efault.datasource.password>
reyuntest
</default.
datasource.password>
<office.url>
jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8
</office.url>
<office.username>
reyuntest
</office.username>
...
...
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