Browse Source

数据库更改为生产库

master
陈帅国 3 years ago
parent
commit
c53a88cd91
3 changed files with 52 additions and 44 deletions
  1. +48
    -40
      .idea/workspace.xml
  2. +2
    -2
      canyin-app/src/main/resources/application-dev.yml
  3. +2
    -2
      canyin-web/src/main/resources/application-dev.yml

+ 48
- 40
.idea/workspace.xml View File

@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a0a18c6e-2fd6-4502-81f5-2b813d5c7375" name="Default Changelist" comment="首次提交1">
<list default="true" id="a0a18c6e-2fd6-4502-81f5-2b813d5c7375" 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$/canyin-app/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/canyin-app/src/main/resources/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/canyin-web/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/canyin-web/src/main/resources/application-dev.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -153,11 +155,6 @@
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
<item name="Spring Boot" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
<item name="Spring Boot" type="7427dc5b:ServiceModel$ServiceGroupNode" />
<item name="Not Started" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
</expand>
<select />
</treeState>
@@ -182,6 +179,9 @@
<workItem from="1613976062962" duration="55000" />
<workItem from="1613976138893" duration="1861000" />
<workItem from="1613991497625" duration="748000" />
<workItem from="1615188161944" duration="2095000" />
<workItem from="1615201538147" duration="1707000" />
<workItem from="1615256233789" duration="715000" />
</task>
<task id="LOCAL-00001" summary="首次提交">
<created>1613968027880</created>
@@ -204,7 +204,14 @@
<option name="project" value="LOCAL" />
<updated>1613973128463</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="更换redis配置">
<created>1615188391821</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1615188391821</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -213,7 +220,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="首次提交" />
<MESSAGE value="首次提交1" />
<option name="LAST_COMMIT_MESSAGE" value="首次提交1" />
<MESSAGE value="更换redis配置" />
<option name="LAST_COMMIT_MESSAGE" value="更换redis配置" />
</component>
<component name="WindowStateProjectService">
<state x="361" y="71" key="#Project_Structure" timestamp="1611993964262">
@@ -224,66 +232,66 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1611990618963" />
<state x="288" y="12" key="CommitChangelistDialog2" timestamp="1613973151849">
<state x="288" y="12" key="CommitChangelistDialog2" timestamp="1615188383499">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="288" y="12" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1613973151849" />
<state x="63" y="71" key="DiffContextDialog" timestamp="1613973148755">
<state x="288" y="12" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1615188383499" />
<state x="63" y="71" key="DiffContextDialog" timestamp="1615188368521">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="63" y="71" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1613973148755" />
<state x="63" y="71" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1615188368521" />
<state x="549" y="153" key="FileChooserDialogImpl" timestamp="1613964467874">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="153" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1613964467874" />
<state width="1149" height="235" key="GridCell.Tab.0.bottom" timestamp="1613973573571">
<state width="1149" height="324" key="GridCell.Tab.0.bottom" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613973573571" />
<state width="1149" height="235" key="GridCell.Tab.0.center" timestamp="1613973573571">
<state width="1149" height="324" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.0.center" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613973573571" />
<state width="1149" height="235" key="GridCell.Tab.0.left" timestamp="1613973573571">
<state width="1149" height="324" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.0.left" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613973573571" />
<state width="1149" height="235" key="GridCell.Tab.0.right" timestamp="1613973573571">
<state width="1149" height="324" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.0.right" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613973573571" />
<state width="1149" height="235" key="GridCell.Tab.1.bottom" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.1.bottom" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="235" key="GridCell.Tab.1.center" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.1.center" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="235" key="GridCell.Tab.1.left" timestamp="1613973573571">
<state width="1149" height="324" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.1.left" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613973573571" />
<state width="1149" height="235" key="GridCell.Tab.1.right" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.1.right" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="235" key="GridCell.Tab.2.bottom" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.2.bottom" timestamp="1615205637158">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="235" key="GridCell.Tab.2.center" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1615205637158" />
<state width="1149" height="324" key="GridCell.Tab.2.center" timestamp="1615205637158">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="235" key="GridCell.Tab.2.left" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1615205637158" />
<state width="1149" height="324" key="GridCell.Tab.2.left" timestamp="1615205637157">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="235" key="GridCell.Tab.2.right" timestamp="1613973573572">
<state width="1149" height="324" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1615205637157" />
<state width="1149" height="324" key="GridCell.Tab.2.right" timestamp="1615205637158">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1149" height="235" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613973573572" />
<state width="1149" height="324" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1615205637158" />
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1611988968385">
<screen x="0" y="0" width="1536" height="824" />
</state>
@@ -292,14 +300,14 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="249" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1613975753911" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1613973134844">
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1615188401822">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1613973134844" />
<state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1615188355830">
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1615188401822" />
<state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1615259751534">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1615188355830" />
<state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1615259751534" />
<state x="447" y="150" width="782" height="590" key="find.popup" timestamp="1611993727670">
<screen x="0" y="0" width="1536" height="824" />
</state>


+ 2
- 2
canyin-app/src/main/resources/application-dev.yml View File

@@ -18,9 +18,9 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://39.96.239.105:3306/canyin?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
url: jdbc:mysql://rm-2zed15r90240x8036eo.mysql.rds.aliyuncs.com:3306/canyin?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
username: root
password: Qufang20190629
password: Qufang20191029
driverClassName: com.mysql.cj.jdbc.Driver
#初始化大小,最大,最小
initialSize: 5


+ 2
- 2
canyin-web/src/main/resources/application-dev.yml View File

@@ -18,9 +18,9 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://39.96.239.105:3306/canyin?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
url: jdbc:mysql://rm-2zed15r90240x8036eo.mysql.rds.aliyuncs.com:3306/canyin?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
username: root
password: Qufang20190629
password: Qufang20191029
driverClassName: com.mysql.cj.jdbc.Driver
#初始化大小,最大,最小
initialSize: 5


Loading…
Cancel
Save