Skip to content

S
sxgjjapp
Commit 61c05705 authored by 华润's avatar 华润
Browse files
Options

数据库连接

parent 28a41fc9
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 47 deletions
.idea/workspace.xml
View file @ 61c05705
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="59d91216-f841-4441-8dfd-41c9f37310c6" name="Default Changelist" comment="三峡综合服务平台新项目git代码部署推送，搭建"> <list default="true" id="59d91216-f841-4441-8dfd-41c9f37310c6" name="Default Changelist" comment="测试">
<change beforePath="$PROJECT_DIR$/../gjjapp/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/.idea/encodings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../gjjapp/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<change beforePath="$PROJECT_DIR$/../gjjapp/gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/tyfb/TyfbxwInfoImp.java" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/tyfb/TyfbxwInfoImp.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../gjjapp/gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/tyfb/TyfbxwInfoImp.java" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/tyfb/TyfbxwInfoImp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../gjjapp/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../gjjapp/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/pom.xml" afterDir="false" />
<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$/gjjapp-zhfwpt/gjjapp-zhfwpt-controller/src/main/java/com/changda/gjjapp/zhfwpt/hgqymd/controller/HgqymdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/gjjapp-zhfwpt/gjjapp-zhfwpt-controller/src/main/java/com/changda/gjjapp/zhfwpt/hgqymd/controller/HgqymdController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/gjjapp-web/src/main/resources/gjj.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gjjapp-web/src/main/resources/gjj.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../新建文件夹 (6)/hbzdmhxm.jar" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/../../新建文件夹 (6)/hbzdmhxm.jar" beforeDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<workItem from="1617261920322" duration="123000" /> <workItem from="1617261920322" duration="123000" />
<workItem from="1619144108053" duration="610000" /> <workItem from="1619144108053" duration="610000" />
<workItem from="1619146016972" duration="421000" /> <workItem from="1619146016972" duration="421000" />
<workItem from="1619146474603" duration="383000" /> <workItem from="1619146474603" duration="4208000" />
</task> </task>
<task id="LOCAL-00001" summary="222"> <task id="LOCAL-00001" summary="222">
<created>1617244899238</created> <created>1617244899238</created>
...@@ -479,7 +479,14 @@ ...@@ -479,7 +479,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1619146737136</updated> <updated>1619146737136</updated>
</task> </task>
<option name="localTasksCounter" value="7" /> <task id="LOCAL-00007" summary="测试">
<created>1619146933230</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1619146933230</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -501,93 +508,94 @@ ...@@ -501,93 +508,94 @@
<MESSAGE value="222" /> <MESSAGE value="222" />
<MESSAGE value="更新代码" /> <MESSAGE value="更新代码" />
<MESSAGE value="三峡综合服务平台新项目git代码部署推送，搭建" /> <MESSAGE value="三峡综合服务平台新项目git代码部署推送，搭建" />
<option name="LAST_COMMIT_MESSAGE" value="三峡综合服务平台新项目git代码部署推送，搭建" /> <MESSAGE value="测试" />
<option name="LAST_COMMIT_MESSAGE" value="测试" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1617247534844"> <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1619154522666">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1617247534844" /> <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1619154522666" />
<state x="740" y="260" key="FileChooserDialogImpl" timestamp="1619146148649"> <state x="740" y="260" key="FileChooserDialogImpl" timestamp="1619146148649">
<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="1619146148649" /> <state x="740" y="260" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1619146148649" />
<state width="1621" height="144" key="GridCell.Tab.0.bottom" timestamp="1619144656519"> <state width="1621" height="648" key="GridCell.Tab.0.bottom" timestamp="1619149964988">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656519" /> <state width="1621" height="648" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964988" />
<state width="1621" height="144" key="GridCell.Tab.0.center" timestamp="1619144656519"> <state width="1621" height="648" key="GridCell.Tab.0.center" timestamp="1619149964988">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656519" /> <state width="1621" height="648" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964988" />
<state width="1621" height="144" key="GridCell.Tab.0.left" timestamp="1619144656519"> <state width="1621" height="648" key="GridCell.Tab.0.left" timestamp="1619149964988">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656519" /> <state width="1621" height="648" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964988" />
<state width="1621" height="144" key="GridCell.Tab.0.right" timestamp="1619144656519"> <state width="1621" height="648" key="GridCell.Tab.0.right" timestamp="1619149964988">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656519" /> <state width="1621" height="648" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964988" />
<state width="1621" height="144" key="GridCell.Tab.1.bottom" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.1.bottom" timestamp="1619149964989">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964989" />
<state width="1621" height="144" key="GridCell.Tab.1.center" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.1.center" timestamp="1619149964988">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964988" />
<state width="1621" height="144" key="GridCell.Tab.1.left" timestamp="1619144656519"> <state width="1621" height="648" key="GridCell.Tab.1.left" timestamp="1619149964988">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656519" /> <state width="1621" height="648" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964988" />
<state width="1621" height="144" key="GridCell.Tab.1.right" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.1.right" timestamp="1619149964989">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964989" />
<state width="1621" height="144" key="GridCell.Tab.2.bottom" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.2.bottom" timestamp="1619149964745">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964745" />
<state width="1621" height="144" key="GridCell.Tab.2.center" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.2.center" timestamp="1619149964744">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964744" />
<state width="1621" height="144" key="GridCell.Tab.2.left" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.2.left" timestamp="1619149964744">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964744" />
<state width="1621" height="144" key="GridCell.Tab.2.right" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.2.right" timestamp="1619149964744">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964744" />
<state width="1621" height="144" key="GridCell.Tab.3.bottom" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.3.bottom" timestamp="1619149964745">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964745" />
<state width="1621" height="144" key="GridCell.Tab.3.center" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.3.center" timestamp="1619149964745">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964745" />
<state width="1621" height="144" key="GridCell.Tab.3.left" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.3.left" timestamp="1619149964745">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964745" />
<state width="1621" height="144" key="GridCell.Tab.3.right" timestamp="1619144656520"> <state width="1621" height="648" key="GridCell.Tab.3.right" timestamp="1619149964745">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1621" height="144" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619144656520" /> <state width="1621" height="648" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619149964745" />
<state x="440" y="94" key="SettingsEditor" timestamp="1619146068096"> <state x="440" y="94" key="SettingsEditor" timestamp="1619146068096">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="440" y="94" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1619146068096" /> <state x="440" y="94" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1619146068096" />
<state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1619146777008"> <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1619146935035">
<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="1619146777008" /> <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1619146935035" />
<state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1619146392868"> <state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1619146870574">
<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="1619146392868" /> <state x="632" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1619146870574" />
<state x="711" y="398" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1619146498710"> <state x="711" y="398" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1619146498710">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
......
gjjapp-web/src/main/resources/gjj.properties
View file @ 61c05705
...@@ -16,15 +16,15 @@ FileTemplatPath=D:\\JavaFileDir ...@@ -16,15 +16,15 @@ FileTemplatPath=D:\\JavaFileDir
jdbc.type=oracle jdbc.type=oracle
jdbc.driver=oracle.jdbc.driver.OracleDriver jdbc.driver=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.101.194:1521:zfgjj jdbc.url=jdbc:oracle:thin:@192.168.101.194:1521:zfgjj
jdbc.username=ZHFW80 jdbc.username=SXZHFW80
jdbc.password=ZHFW80 jdbc.password=SXZHFW80
jdbc.type.ss=oracle jdbc.type.ss=oracle
jdbc.driver.ss=oracle.jdbc.driver.OracleDriver jdbc.driver.ss=oracle.jdbc.driver.OracleDriver
jdbc.url.ss=jdbc:oracle:thin:@192.168.101.194:1521:zfgjj jdbc.url.ss=jdbc:oracle:thin:@192.168.101.194:1521:zfgjj
jdbc.username.ss=ZHFW80 jdbc.username.ss=SXZHFW80
jdbc.password.ss=ZHFW80 jdbc.password.ss=SXZHFW80
#jdbc.type=oracle #jdbc.type=oracle
#jdbc.driver=oracle.jdbc.driver.OracleDriver #jdbc.driver=oracle.jdbc.driver.OracleDriver
......
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