Skip to content

R
renren-fast
Commit 9a948b87 authored by 华润's avatar 华润
Browse files
Options

修改切换数据库连接

parent 0ba73f9b
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 43 deletions
.idea/workspace.xml
View file @ 9a948b87
...@@ -10,12 +10,10 @@ ...@@ -10,12 +10,10 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4acbf346-4d79-4465-9b1e-e87a13e70092" name="Default Changelist" comment="giao"> <list default="true" id="4acbf346-4d79-4465-9b1e-e87a13e70092" name="Default Changelist" comment="修改配置文件">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/banner.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/banner.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/renren-fast.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/renren-fast.jar.original" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/renren-fast.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/renren-fast.jar.original" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -65,7 +63,7 @@ ...@@ -65,7 +63,7 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="MavenSettings" /> <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.General" />
</component> </component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
...@@ -112,7 +110,11 @@ ...@@ -112,7 +110,11 @@
<workItem from="1617174300951" duration="377000" /> <workItem from="1617174300951" duration="377000" />
<workItem from="1617176711578" duration="62000" /> <workItem from="1617176711578" duration="62000" />
<workItem from="1617261186266" duration="710000" /> <workItem from="1617261186266" duration="710000" />
<workItem from="1617268590418" duration="123000" /> <workItem from="1617268590418" duration="270000" />
<workItem from="1617323755979" duration="226000" />
<workItem from="1617774067759" duration="102000" />
<workItem from="1617784068944" duration="419000" />
<workItem from="1618391359678" duration="1017000" />
</task> </task>
<task id="LOCAL-00001" summary="删除没用的文件"> <task id="LOCAL-00001" summary="删除没用的文件">
<created>1616726371362</created> <created>1616726371362</created>
...@@ -142,7 +144,14 @@ ...@@ -142,7 +144,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1617261347066</updated> <updated>1617261347066</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="修改配置文件">
<created>1617268793155</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1617268793155</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -193,72 +202,73 @@ ...@@ -193,72 +202,73 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="删除没用的文件" /> <MESSAGE value="删除没用的文件" />
<MESSAGE value="giao" /> <MESSAGE value="giao" />
<option name="LAST_COMMIT_MESSAGE" value="giao" /> <MESSAGE value="修改配置文件" />
<option name="LAST_COMMIT_MESSAGE" value="修改配置文件" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="740" y="260" key="FileChooserDialogImpl" timestamp="1617174677049"> <state x="740" y="260" key="FileChooserDialogImpl" timestamp="1617174677049">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="740" y="260" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1617174677049" /> <state x="740" y="260" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1617174677049" />
<state width="1877" height="213" key="GridCell.Tab.0.bottom" timestamp="1617261898573"> <state width="1877" height="373" key="GridCell.Tab.0.bottom" timestamp="1618391988866">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="213" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898573" /> <state width="1877" height="373" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1618391988866" />
<state width="1877" height="213" key="GridCell.Tab.0.center" timestamp="1617261898572"> <state width="1877" height="373" key="GridCell.Tab.0.center" timestamp="1618391988866">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="213" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898572" /> <state width="1877" height="373" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1618391988866" />
<state width="1877" height="213" key="GridCell.Tab.0.left" timestamp="1617261898572"> <state width="1877" height="373" key="GridCell.Tab.0.left" timestamp="1618391988866">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="213" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898572" /> <state width="1877" height="373" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1618391988866" />
<state width="1877" height="213" key="GridCell.Tab.0.right" timestamp="1617261898573"> <state width="1877" height="373" key="GridCell.Tab.0.right" timestamp="1618391988866">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="213" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898573" /> <state width="1877" height="373" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1618391988866" />
<state width="1877" height="373" key="GridCell.Tab.1.bottom" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.1.bottom" timestamp="1617323984905">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984905" />
<state width="1877" height="373" key="GridCell.Tab.1.center" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.1.center" timestamp="1617323984904">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984904" />
<state width="1877" height="373" key="GridCell.Tab.1.left" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.1.left" timestamp="1617323984904">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984904" />
<state width="1877" height="373" key="GridCell.Tab.1.right" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.1.right" timestamp="1617323984904">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984904" />
<state width="1877" height="373" key="GridCell.Tab.2.bottom" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.2.bottom" timestamp="1617323984905">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984905" />
<state width="1877" height="373" key="GridCell.Tab.2.center" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.2.center" timestamp="1617323984905">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984905" />
<state width="1877" height="373" key="GridCell.Tab.2.left" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.2.left" timestamp="1617323984905">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984905" />
<state width="1877" height="373" key="GridCell.Tab.2.right" timestamp="1617261898569"> <state width="1877" height="373" key="GridCell.Tab.2.right" timestamp="1617323984905">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="373" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617261898569" /> <state width="1877" height="373" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617323984905" />
<state x="461" y="164" key="SettingsEditor" timestamp="1617261787477"> <state x="461" y="164" key="SettingsEditor" timestamp="1617774165448">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1617261787477" /> <state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1617774165448" />
<state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1617261363007"> <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1617268820913">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1617261363007" /> <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1617268820913" />
<state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1616726647994"> <state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1618392369984">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="632" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1616726647994" /> <state x="632" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1618392369984" />
</component> </component>
</project> </project>
\ No newline at end of file
src/main/resources/application-dev.yml
View file @ 9a948b87
...@@ -4,9 +4,9 @@ spring: ...@@ -4,9 +4,9 @@ spring:
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
druid: druid:
first: #数据源1 first: #数据源1
url: jdbc:mysql://192.168.101.145:3306/renren_fast4?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.101.213:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
username: root username: root
password: Cd@85617711 password: Cd85617711
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
......
target/classes/application-dev.yml
View file @ 9a948b87
...@@ -4,9 +4,9 @@ spring: ...@@ -4,9 +4,9 @@ spring:
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
druid: druid:
first: #数据源1 first: #数据源1
url: jdbc:mysql://192.168.101.145:3306/renren_fast4?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.101.213:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
username: root username: root
password: Cd@85617711 password: Cd85617711
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
......
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