瀏覽代碼

数据库调整

linhuili 3 年之前
父節點
當前提交
9004fc0f13

+ 15 - 5
revit-algorithm/build.gradle

@@ -86,13 +86,23 @@ dependencies {
 //    compile group: "com.sybotan", name: "sybotan-service-mybatis", version: SYBOTAN_SERVICE_VERSION
 
     // 带隐性数据库接口
-    compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
+    //compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
+    //compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
+    //compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
+    //compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
     compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
+    //compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
+   // compile group: "com.persagy", name: "persagy-kotlin-mysql", version: PERSAGY_KOTLIN_VERSION
+
+
+    compile group: "com.persagy", name: "persagy-kotlin-base", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-database", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-mybatis", version: PERSAGY_KOTLIN_VERSION
     compile group: "com.persagy", name: "persagy-kotlin-mysql", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-service-base", version: PERSAGY_SERVICE_VERSION
+    compile group: "com.persagy", name: "persagy-service-mybatis", version: PERSAGY_SERVICE_VERSION
+    compile group: "com.persagy", name: "persagy-service-mysql", version: PERSAGY_SERVICE_VERSION
+
 
     // 生成uuid
     // https://mvnrepository.com/artifact/com.fasterxml.uuid/java-uuid-generator

+ 8 - 0
revit-algorithm/src/main/resources-dev/application.yml

@@ -22,6 +22,14 @@ spring:
     username:                           root
     password:                           zVmW58LaAtjIKbb
 
+  second_datasource:
+    name:                               revit-algorithm
+    type:                               com.alibaba.druid.pool.DruidDataSource
+    driver-class-name:                  com.mysql.cj.jdbc.Driver
+    url:                                jdbc:mysql://rm-2ze20ntn5y9ljsx147o.mysql.rds.aliyuncs.com:3306/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
+    username:                           root
+    password:                           zVmW58LaAtjIKbb
+
   jackson:
     date-format:                        yyyy-MM-dd HH:mm:ss
     time-zone:                          Asia/Shanghai

+ 8 - 1
revit-algorithm/src/main/resources-prod/application.yml

@@ -15,12 +15,19 @@ spring:
     default-domain:                     revit-algorithm
 
   datasource:
-    name:                               message-center
+    name:                               revit
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  com.mysql.cj.jdbc.Driver
     url:                                jdbc:mysql://rm-2ze20ntn5y9ljsx147o.mysql.rds.aliyuncs.com:3306/revit?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
     username:                           root
     password:                           zVmW58LaAtjIKbb
+  second-datasource:
+    name:                               revit_calc
+    type:                               com.alibaba.druid.pool.DruidDataSource
+    driver-class-name:                  com.mysql.cj.jdbc.Driver
+    url:                                jdbc:mysql://rm-2ze20ntn5y9ljsx147o.mysql.rds.aliyuncs.com:3306/revit_calc?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8
+    username:                           root
+    password:                           zVmW58LaAtjIKbb
 
   jackson:
     date-format:                        yyyy-MM-dd HH:mm:ss

+ 17 - 7
scheduler/build.gradle

@@ -82,14 +82,24 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Sybotan依赖
-    compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
-    compile group: "com.persagy", name: "persagy-service-mysql", version: PERSAGY_SERVICE_VERSION
+   // compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
+   // compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
+    //compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
+    //compile group: "cn.sagacloud", name: "saga-kotlin-postgresql", version: SAGA_KOTLIN_VERSION
+     compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
+    //compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
+    //compile group: "com.persagy", name: "persagy-service-mysql", version: PERSAGY_SERVICE_VERSION
+    //compile group: "com.persagy", name: "persagy-kotlin-mysql", version: PERSAGY_KOTLIN_VERSION
+
+
+    compile group: "com.persagy", name: "persagy-kotlin-base", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-database", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-kotlin-mybatis", version: PERSAGY_KOTLIN_VERSION
     compile group: "com.persagy", name: "persagy-kotlin-mysql", version: PERSAGY_KOTLIN_VERSION
+    compile group: "com.persagy", name: "persagy-service-base", version: PERSAGY_SERVICE_VERSION
+    compile group: "com.persagy", name: "persagy-service-mybatis", version: PERSAGY_SERVICE_VERSION
+    compile group: "com.persagy", name: "persagy-service-mysql", version: PERSAGY_SERVICE_VERSION
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // 数据中心依赖  
     compile project(":data-core")

+ 1 - 1
scheduler/src/main/resources-dev/application.yml

@@ -36,7 +36,7 @@ spring:
     default-domain:                     scheduler
 
   datasource:
-    name: labsl
+    name: scheduler_str
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://rm-2ze20ntn5y9ljsx147o.mysql.rds.aliyuncs.com:3306/scheduler_str?allowMultiQueries=true&serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=UTF-8