浏览代码

数据库配置修改

guomengjiao 5 月之前
父节点
当前提交
eb6ec8c334
共有 3 个文件被更改,包括 12 次插入7 次删除
  1. 2 1
      .gitignore
  2. 6 2
      .idea/workspace.xml
  3. 4 4
      web/src/main/resources/config/application.yml

+ 2 - 1
.gitignore

@@ -9,4 +9,5 @@
 **/indexes/*
 **/target/*
 **/src/main/webapp/WEB-INF/classes/*
-**/src/main/webapp/userfiles/*
+**/src/main/webapp/userfiles/*
+**/workspace.xml

+ 6 - 2
.idea/workspace.xml

@@ -28,7 +28,10 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="" />
+    <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/resources/config/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/resources/config/application.yml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -423,7 +426,8 @@
       <workItem from="1733466729735" duration="4255000" />
       <workItem from="1734267867182" duration="132000" />
       <workItem from="1734268366747" duration="59000" />
-      <workItem from="1734579234738" duration="31000" />
+      <workItem from="1734579234738" duration="258000" />
+      <workItem from="1734579502121" duration="1272000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1676368709673</created>

+ 4 - 4
web/src/main/resources/config/application.yml

@@ -54,9 +54,9 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/bjfl_config?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  url: jdbc:mysql://192.168.37.132:3306/bjfl_config?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
   username: root
-  password: 111111
+  password: songlanyun
   testSql: SELECT 1
 
 #  # Oracle 数据库配置(若使用 12c,请修改 /modules/core/pom.xml 文件,打开 12c 依赖,去掉 11g 依赖)
@@ -159,9 +159,9 @@ jdbc:
   ds02:
     type: mysql
     driver: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/bjfl_portal?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
+    url: jdbc:mysql://192.168.37.132:3306/bjfl_portal?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
     username: root
-    password: 111111
+    password: songlanyun
     testSql: SELECT 1
     pool:
       init: 1