From 68e4e7512ef53a0c2a538e7184ba902f2f34600d Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Thu, 18 Jul 2024 15:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A0=83=E5=8D=9AOA=E5=AF=B9=E6=8E=A5=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A2=E9=93=B6=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dongj.yml  | 35 +++++++++++++++++++
 ....3__mdm_add_updateApi_and_enabledState.sql |  3 --
 .../frame/webapp/web/init/FlywayConfig.java   |  8 ++---
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 buildpackage/src/main/resources/application-dongj.yml
 delete mode 100644 buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql

diff --git a/buildpackage/src/main/resources/application-dongj.yml b/buildpackage/src/main/resources/application-dongj.yml
new file mode 100644
index 00000000..4d2e211a
--- /dev/null
+++ b/buildpackage/src/main/resources/application-dongj.yml
@@ -0,0 +1,35 @@
+#######################dev环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: warn
+  encodings: UTF-8
+  file:
+    #    日志保存路径
+    path: D:\yongansystem\log
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://115.239.174.22:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: 62e4295b615a30dbf3b8ee96f41c820b
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: D:\yongansystem\file
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826
+  #电子回单下载临时存放位置
+  elec_path: /Users/xiangerlin/Downloads/
+OA:
+  data_source_code: yc_oa
\ No newline at end of file
diff --git a/buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql b/buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql
deleted file mode 100644
index 393f0fdc..00000000
--- a/buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE mdm_module_distribute ADD COLUMN update_api VARCHAR(50) DEFAULT NULL COMMENT '修改接口';
-ALTER TABLE mdm_module_distribute ADD COLUMN enabled_state CHAR(1) DEFAULT NULL COMMENT '启用停用 0、停用1、启用';
-COMMIT;
\ No newline at end of file
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java
index 5d2fb22d..598e4032 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java
@@ -11,9 +11,9 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 
-//@Configuration
-//@RequiredArgsConstructor
-//@EnableTransactionManagement
+@Configuration
+@RequiredArgsConstructor
+@EnableTransactionManagement
 public class FlywayConfig {
 
     @Value("${spring.flyway.enabled}")
@@ -46,7 +46,7 @@ public class FlywayConfig {
     private DataSource dataSource;
 
 
-    //@PostConstruct
+    @PostConstruct
     public void migrateOrder() {
         String pwd = AESUtil.decrypt(password);
         DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;