Skip to content

M
manager
Commit 7f5e60bc by manxiaoqiang
Options

二版

parent a08a2dd8
Showing with 38 additions and 40 deletions
.idea/workspace.xml
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/model/Account.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/model/Account.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -81,8 +79,8 @@ ...@@ -81,8 +79,8 @@
<file leaf-file-name="logback.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="logback.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184"> <state relative-caret-position="253">
<caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" /> <caret line="11" column="42" lean-forward="true" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -91,8 +89,8 @@ ...@@ -91,8 +89,8 @@
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="true"> <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-23"> <state relative-caret-position="1035">
<caret line="107" column="85" lean-forward="false" selection-start-line="107" selection-start-column="85" selection-end-line="107" selection-end-column="85" /> <caret line="120" column="61" lean-forward="true" selection-start-line="120" selection-start-column="61" selection-end-line="120" selection-end-column="61" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1178,14 +1176,7 @@ ...@@ -1178,14 +1176,7 @@
<workItem from="1517902340876" duration="6159000" /> <workItem from="1517902340876" duration="6159000" />
<workItem from="1522052551509" duration="4324000" /> <workItem from="1522052551509" duration="4324000" />
<workItem from="1523843445576" duration="7238000" /> <workItem from="1523843445576" duration="7238000" />
<workItem from="1523876594256" duration="61685000" /> <workItem from="1523876594256" duration="63713000" />
</task>
<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> </task>
<task id="LOCAL-00050" summary="合同"> <task id="LOCAL-00050" summary="合同">
<created>1516592276562</created> <created>1516592276562</created>
...@@ -1523,11 +1514,18 @@ ...@@ -1523,11 +1514,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1524189027662</updated> <updated>1524189027662</updated>
</task> </task>
<option name="localTasksCounter" value="98" /> <task id="LOCAL-00098" summary="二版&#10;&#10;&#10;">
<created>1524206069453</created>
<option name="number" value="00098" />
<option name="presentableId" value="LOCAL-00098" />
<option name="project" value="LOCAL" />
<updated>1524206069453</updated>
</task>
<option name="localTasksCounter" value="99" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="449032000" /> <option name="totallyTimeSpent" value="451060000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
...@@ -2108,16 +2106,16 @@ ...@@ -2108,16 +2106,16 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184"> <state relative-caret-position="253">
<caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" /> <caret line="11" column="42" lean-forward="true" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-23"> <state relative-caret-position="1035">
<caret line="107" column="85" lean-forward="false" selection-start-line="107" selection-start-column="85" selection-end-line="107" selection-end-column="85" /> <caret line="120" column="61" lean-forward="true" selection-start-line="120" selection-start-column="61" selection-end-line="120" selection-end-column="61" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
pom.xml
...@@ -93,29 +93,29 @@ ...@@ -93,29 +93,29 @@
<!--数据源配置--> <!--数据源配置-->
<datasource.driver>com.mysql.jdbc.Driver</datasource.driver> <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
<!--//office--> <!--//office-->
<default.datasource.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</default.datasource.url> <default.datasource.url>jdbc:mysql://10.3.20.32:3306/manager?characterEncoding=utf-8</default.datasource.url>
<default.datasource.username>reyun</default.datasource.username> <default.datasource.username>root</default.datasource.username>
<default.datasource.password>reyun123</default.datasource.password> <default.datasource.password>reyun.123</default.datasource.password>
<office.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8</office.url> <office.url>jdbc:mysql://10.3.20.32:3306/office?characterEncoding=utf-8</office.url>
<office.username>reyun</office.username> <office.username>root</office.username>
<office.password>reyun123</office.password> <office.password>reyun.123</office.password>
<tkio.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/trackingio_test?characterEncoding=utf-8</tkio.url> <tkio.url>jdbc:mysql://10.3.20.32:3306/trackingio_test?characterEncoding=utf-8</tkio.url>
<tkio.username>reyun</tkio.username> <tkio.username>root</tkio.username>
<tkio.password>reyun123</tkio.password> <tkio.password>reyun.123</tkio.password>
<track.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/track_test?characterEncoding=utf-8</track.url> <track.url>jdbc:mysql://10.3.20.32:3306/track_test?characterEncoding=utf-8</track.url>
<track.username>reyun</track.username> <track.username>root</track.username>
<track.password>reyun123</track.password> <track.password>reyun.123</track.password>
<dmp.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</dmp.url> <dmp.url>jdbc:mysql://10.3.20.32:3306/manager?characterEncoding=utf-8</dmp.url>
<dmp.username>reyun</dmp.username> <dmp.username>root</dmp.username>
<dmp.password>reyun123</dmp.password> <dmp.password>reyun.123</dmp.password>
<io.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8</io.url> <io.url>jdbc:mysql://10.3.20.32:3306/userio?characterEncoding=utf-8</io.url>
<io.username>reyun</io.username> <io.username>root</io.username>
<io.password>reyun123</io.password> <io.password>reyun.123</io.password>
<mail.host>smtp.exmail.qq.com</mail.host> <mail.host>smtp.exmail.qq.com</mail.host>
<mail.username>manxiaoqiang@reyun.com</mail.username> <mail.username>manxiaoqiang@reyun.com</mail.username>
...@@ -131,10 +131,10 @@ ...@@ -131,10 +131,10 @@
<redis.ip.requesttimes>5</redis.ip.requesttimes> <redis.ip.requesttimes>5</redis.ip.requesttimes>
<redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes> <redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes>
<redis.surl.host>172.31.23.181</redis.surl.host> <redis.surl.host>10.3.20.33</redis.surl.host>
<redis.surl.port>6379</redis.surl.port> <redis.surl.port>6379</redis.surl.port>
<redis.event.host>172.31.23.181</redis.event.host> <redis.event.host>10.3.20.33</redis.event.host>
<redis.event.port>6379</redis.event.port> <redis.event.port>6379</redis.event.port>
<redis.event.database>13</redis.event.database> <redis.event.database>13</redis.event.database>
<!--Redis setting//end--> <!--Redis setting//end-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment