oracle连接

mjava-minjiaoyuan/pom.xml

@@ -25,21 +25,18 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>com.oracle.database.jdbc</groupId>-->
-        <!--            <artifactId>ojdbc8</artifactId>-->
-        <!--            <scope>runtime</scope>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.tomcat.embed</groupId>-->
-        <!--            <artifactId>tomcat-embed-jasper</artifactId>-->
-        <!--    </dependency>-->
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.smallbun.screw</groupId>
+            <artifactId>screw-core</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+
     </dependencies>
 
     <build>

mjava-minjiaoyuan/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
   servlet:
     context-path: /api
   tomcat:
-    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar,oraclepki.jar
+    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar   # oracle6 忽略依赖包警告
 
 # condition
 spel:
@@ -12,10 +12,9 @@ spel:
   multiSource: false       # 是否多数据源配置
 
 spring:
-  #  todo:
-  application: mjava
   # database
   datasource:
+    # ojdbc6 [更高版本不兼容] 打印 oracle.jdbc.driver.T4CConnection.getNetworkTimeout()I, 因为没实现这个jdbc标准的函数
     driver-class-name: oracle.jdbc.OracleDriver
     username: front_jszyxx_2023
     password: FrontU#JSZYxx#2023
@@ -25,7 +24,6 @@ spring:
       ddl-auto: none      # JPA对表没有任何操作
     show-sql: true
     database: oracle
-#    database-platform: org.hibernate.dialect.MySQL57Dialect
 
 # filepath
 file:

mjava-minjiaoyuan/target/classes/application-dev.yml

@@ -4,7 +4,7 @@ server:
   servlet:
     context-path: /api
   tomcat:
-    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar,oraclepki.jar
+    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar   # oracle6 忽略依赖包警告
 
 # condition
 spel:
@@ -12,10 +12,9 @@ spel:
   multiSource: false       # 是否多数据源配置
 
 spring:
-  #  todo:
-  application: mjava
   # database
   datasource:
+    # ojdbc6 [更高版本不兼容] 打印 oracle.jdbc.driver.T4CConnection.getNetworkTimeout()I, 因为没实现这个jdbc标准的函数
     driver-class-name: oracle.jdbc.OracleDriver
     username: front_jszyxx_2023
     password: FrontU#JSZYxx#2023
@@ -25,7 +24,6 @@ spring:
       ddl-auto: none      # JPA对表没有任何操作
     show-sql: true
     database: oracle
-#    database-platform: org.hibernate.dialect.MySQL57Dialect
 
 # filepath
 file:

mjava-rongzhi/src/main/java/com/malk/rongzhi/service/impl/RZServiceImpl.java

@@ -63,7 +63,7 @@ public class RZServiceImpl implements RZService {
         for (int i = 0; i < userIds.size(); i += 50) {
             int to = (i + 50) > userIds.size() ? userIds.size() : i + 50;
             // 考勤范围从当日 7.30 到次日 7.30
-//            String now = "2023-06-15";
+//            String now = "2023-06-20";
             String now = UtilDateTime.formatDate(new Date());
             String from = now + " 07:30:00";
             String end = now + " 23:59:59";

mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/controller/SHHWController.java

@@ -36,16 +36,21 @@ public class SHHWController {
 
         log.info("氚云http请求, code = {}, body = {}", code, JSON.toJSONString(data));
         switch (code) {
-            case "approve":
+            case "approve": {
                 String fileNames = htService.approveContract(data);
                 return McR.success(UtilMap.map("fileNames", fileNames));
+            }
             // 对象响应【氚云自定义字段，需要通过[]直接取值才有效，序列化后返回前端，仅会保留结构】
             case "types":
                 return McR.success(UtilMap.map("types", JSON.toJSONString(htClient.listContractType())));
-
             case "delete":
                 htService.deleteContract(data);
                 break;
+            case "file": {
+                // prd: 后补盖章附件
+                String fileNames = htService.addAttachments(data, null);
+                return McR.success(UtilMap.map("fileNames", fileNames));
+            }
             default:
                 McException.exceptionAccess("code 不合法");
                 break;

mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/service/HTService.java

@@ -11,6 +11,11 @@ public interface HTService {
      */
     String approveContract(Map<String, String> data);
 
+    /**
+     * 添加附件
+     */
+    String addAttachments(Map<String, String> data, String origionContractCode);
+
     /**
      * 批量删除 [删除附件, 全部条款, 合同主体]
      */

mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/service/impl/HTImplService.java

@@ -11,6 +11,7 @@ import com.malk.shanghaishiwei.server.HTConf;
 import com.malk.shanghaishiwei.service.HTClient;
 import com.malk.shanghaishiwei.service.HTService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +52,19 @@ public class HTImplService implements HTService {
             term.put("agreementType", HTConf.getAgreementType(term));
             htClient.addTermsContract(term);
         }
+        return addAttachments(data, origionContractCode);
+    }
+
+    /**
+     * 添加附件
+     */
+    @Override
+    public String addAttachments(Map<String, String> data, String origionContractCode) {
+        // prd: 非政采合同, 使用流水号
+        if (StringUtils.isBlank(origionContractCode)) {
+            Map bizObject = ((List<Map>) JSON.parse(data.get("bizObject"))).get(0);
+            origionContractCode = UtilMap.getString(bizObject, "origionContractCode", UtilMap.getString(bizObject, "SeqNo"));
+        }
         // 同步附件
         List<Map> attachments = (List<Map>) JSON.parse(data.get("attachments"));
         if (ObjectUtil.isNull(attachments)) {
@@ -68,7 +82,13 @@ public class HTImplService implements HTService {
             htClient.addAttachmentContract(body);
             fileNames.add(fileName); // 拼接与氚云记录, 服务删除逻辑
         }
-        return String.join("; ", fileNames);
+        // 兼容后补盖章附件
+        String updateNames = String.join("; ", fileNames);
+        String recordNames = data.get("fileNames");
+        if (StringUtils.isNotBlank(recordNames)) {
+            updateNames = recordNames + "; " + updateNames;
+        }
+        return updateNames;
     }
 
     /**

mjava-xintianlong/src/main/java/com/malk/xintianlong/controller/HSController.java

@@ -16,9 +16,9 @@ import com.malk.server.dingtalk.DDR_New;
 import com.malk.service.aliwork.YDClient;
 import com.malk.service.dingtalk.DDClient;
 import com.malk.service.dingtalk.DDClient_Workflow;
-import com.malk.xintianlong.repository.dao.HSApproveRecordDao;
-import com.malk.xintianlong.repository.dao.HSViewDao;
-import com.malk.xintianlong.repository.entity.HSApproveRecordPo;
+import com.malk.xintianlong.repository.dao.primary.HSApproveRecordDao;
+import com.malk.xintianlong.repository.dao.primary.HSViewDao;
+import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
 import com.malk.xintianlong.server.HSConf;
 import com.malk.xintianlong.service.HSService;
 import lombok.extern.slf4j.Slf4j;

mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/HSApproveRecordDao.java

@@ -1,6 +1,6 @@
-package com.malk.xintianlong.repository.dao;
+package com.malk.xintianlong.repository.dao.primary;
 
-import com.malk.xintianlong.repository.entity.HSApproveRecordPo;
+import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/HSViewDao.java

@@ -1,4 +1,4 @@
-package com.malk.xintianlong.repository.dao;
+package com.malk.xintianlong.repository.dao.primary;
 
 import com.malk.base.JpaMap;
 import org.springframework.data.domain.Page;

mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/entity/HSApproveRecordPo.java

@@ -1,4 +1,4 @@
-package com.malk.xintianlong.repository.entity;
+package com.malk.xintianlong.repository.entity.primary;
 
 import com.malk.base.BasePo;
 import lombok.AllArgsConstructor;

mjava-xintianlong/src/main/java/com/malk/xintianlong/schedule/HSScheduleTask.java

@@ -3,8 +3,8 @@ package com.malk.xintianlong.schedule;
 import com.malk.service.dingtalk.DDClient;
 import com.malk.service.dingtalk.DDClient_Event;
 import com.malk.service.dingtalk.DDClient_Workflow;
-import com.malk.xintianlong.repository.dao.HSApproveRecordDao;
-import com.malk.xintianlong.repository.entity.HSApproveRecordPo;
+import com.malk.xintianlong.repository.dao.primary.HSApproveRecordDao;
+import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
 import com.malk.xintianlong.service.HSService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

mjava-xintianlong/src/main/java/com/malk/xintianlong/service/impl/HSServiceImpl.java

@@ -6,8 +6,8 @@ import com.malk.Util.UtilHttp;
 import com.malk.Util.UtilMap;
 import com.malk.Util.UtilServlet;
 import com.malk.server.common.McException;
-import com.malk.xintianlong.repository.dao.HSApproveRecordDao;
-import com.malk.xintianlong.repository.entity.HSApproveRecordPo;
+import com.malk.xintianlong.repository.dao.primary.HSApproveRecordDao;
+import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
 import com.malk.xintianlong.server.HSConf;
 import com.malk.xintianlong.service.HSService;
 import lombok.extern.slf4j.Slf4j;

mjava-xintianlong/src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ server:
 # condition
 spel:
   scheduling: false        # 定时任务是否执行
-  multiSource: false       # 是否多数据源配置
+  multiSource: true        # 是否多数据源配置
 
 spring:
   # database
@@ -27,8 +27,16 @@ spring:
     url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
     username: dingding
     password: dd12345678
-    hikari:
-      connection-init-sql:  # SqlServer若设置类型不一致, 需关闭才可连接
+    # 灏宇
+    primary:
+      username: dingding
+      password: dd12345678
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
+    # 金塔
+    slave:
+      username: dingding
+      password: dd12345678
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4336;SelectMethod=cursor;DatabaseName=HSDyeingERP
   # JPA
   jpa:
     database: sql_server

mjava-xintianlong/src/main/resources/application-prod.yml

@@ -25,8 +25,6 @@ spring:
     url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
     username: dingding
     password: dd12345678
-    hikari:
-      connection-init-sql:  # SqlServer若设置类型不一致, 需关闭才可连接
     # JPA
     jpa:
       database: sql_server

mjava-xintianlong/target/classes/application-dev.yml

@@ -7,7 +7,7 @@ server:
 # condition
 spel:
   scheduling: false        # 定时任务是否执行
-  multiSource: false       # 是否多数据源配置
+  multiSource: true        # 是否多数据源配置
 
 spring:
   # database
@@ -27,8 +27,16 @@ spring:
     url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
     username: dingding
     password: dd12345678
-    hikari:
-      connection-init-sql:  # SqlServer若设置类型不一致, 需关闭才可连接
+    # 灏宇
+    primary:
+      username: dingding
+      password: dd12345678
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
+    # 金塔
+    slave:
+      username: dingding
+      password: dd12345678
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4336;SelectMethod=cursor;DatabaseName=HSDyeingERP
   # JPA
   jpa:
     database: sql_server

mjava-xintianlong/target/classes/application-prod.yml

@@ -25,8 +25,6 @@ spring:
     url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
     username: dingding
     password: dd12345678
-    hikari:
-      connection-init-sql:  # SqlServer若设置类型不一致, 需关闭才可连接
     # JPA
     jpa:
       database: sql_server

mjava-xintianlong/target/generated-sources/java/com/malk/xintianlong/repository/entity/QHSApproveRecordPo.java

@@ -2,6 +2,7 @@ package com.malk.xintianlong.repository.entity;
 
 import static com.querydsl.core.types.PathMetadataFactory.*;
 
+import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
 import com.querydsl.core.types.dsl.*;
 
 import com.querydsl.core.types.PathMetadata;

mjava/src/main/resources/application.yml

@@ -28,13 +28,12 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
-  #      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer若设置类型不一致, 需关闭才可连接
-  #      pool-name: DateHikariCP
-  #      minimum-idle: 0
-  #      maximum-pool-size: 10
-  #      idle-timeout: 30000
-  #      max-lifetime: 120000          # 小于数据库超时大于业务执行返回时间[hikari默认30m, mysql默认10m]
-  #      connection-timeout: 30000     # 数据库连接超时时间,默认30秒，即30000
+      pool-name: DateHikariCP
+      minimum-idle: 0
+      maximum-pool-size: 10
+      idle-timeout: 30000
+      max-lifetime: 120000          # 小于数据库超时大于业务执行返回时间[hikari默认30m, mysql默认10m]
+      connection-timeout: 30000     # 数据库连接超时时间,默认30秒，即30000
   # JPA
   jpa:
     hibernate:

mjava/src/test/resources/driver.yml

@@ -13,6 +13,9 @@ spring-1:
     username: root
     password: mu123
     url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    hikari:
+      # todo: 更新
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
   # JPA
   jpa:
     database: MYSQL
@@ -27,8 +30,6 @@ spring-2:
       url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=DingTalkApprove
       username: sa
       password: Sa123456
-      hikari:
-        connection-init-sql:  # SqlServer若设置类型不一致, 需关闭才可连接
     # JPA
     jpa:
       database: sql_server
@@ -36,10 +37,22 @@ spring-2:
         hibernate:
           default_schema: dbo
 
-
+# database
+spring-3:
+  # Oracle
+  datasource:
+    driver-class-name: oracle.jdbc.OracleDriver
+    username: front_jszyxx_2023
+    password: FrontU#JSZYxx#2023
+    url: jdbc:oracle:thin:@10.107.58.35:1521:jszyfzda
+  jpa:
+    hibernate:
+      ddl-auto: none      # JPA对表没有任何操作
+    show-sql: true
+    database: oracle
 
 # 其他配置
-spring-3:
+spring-0:
   jpa:
     hibernate:
       # 取消小驼峰到下划线映射

mjava/target/classes/META-INF/spring-configuration-metadata.json

@@ -35,11 +35,6 @@
       "type": "com.malk.server.common.FilePath$Path",
       "sourceType": "com.malk.server.common.FilePath$Path"
     },
-    {
-      "name": "file.path",
-      "type": "com.malk.server.common.FilePath$Path",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
     {
       "name": "file.source",
       "type": "com.malk.server.common.FilePath$Source",
@@ -50,11 +45,6 @@
       "type": "com.malk.server.common.FilePath$Source",
       "sourceType": "com.malk.server.common.FilePath$Source"
     },
-    {
-      "name": "file.source",
-      "type": "com.malk.server.common.FilePath$Source",
-      "sourceType": "com.malk.server.common.FilePath$Source"
-    },
     {
       "name": "fxiaoke",
       "type": "com.malk.server.fxiaoke.FXKConf",
@@ -179,16 +169,6 @@
       "type": "java.lang.String",
       "sourceType": "com.malk.server.common.FilePath$Path"
     },
-    {
-      "name": "file.path.file",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
-    {
-      "name": "file.path.image",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
     {
       "name": "file.path.image",
       "type": "java.lang.String",
@@ -199,16 +179,6 @@
       "type": "java.lang.String",
       "sourceType": "com.malk.server.common.FilePath$Path"
     },
-    {
-      "name": "file.path.tmp",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
-    {
-      "name": "file.source.fonts",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Source"
-    },
     {
       "name": "file.source.fonts",
       "type": "java.lang.String",

mjava/target/classes/application.yml

@@ -28,13 +28,12 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
-  #      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer若设置类型不一致, 需关闭才可连接
-  #      pool-name: DateHikariCP
-  #      minimum-idle: 0
-  #      maximum-pool-size: 10
-  #      idle-timeout: 30000
-  #      max-lifetime: 120000          # 小于数据库超时大于业务执行返回时间[hikari默认30m, mysql默认10m]
-  #      connection-timeout: 30000     # 数据库连接超时时间,默认30秒，即30000
+      pool-name: DateHikariCP
+      minimum-idle: 0
+      maximum-pool-size: 10
+      idle-timeout: 30000
+      max-lifetime: 120000          # 小于数据库超时大于业务执行返回时间[hikari默认30m, mysql默认10m]
+      connection-timeout: 30000     # 数据库连接超时时间,默认30秒，即30000
   # JPA
   jpa:
     hibernate:

mjava/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Jun 20 12:51:14 CST 2023
+#Thu Jun 22 22:58:52 CST 2023
 version=1.0-SNAPSHOT
 groupId=com.malk
 artifactId=mjava

mjava/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,136 @@
+com/malk/test/RESTFulTestController.class
+com/malk/Util/UtilImport$ExecuteLambda.class
+com/malk/server/aliwork/YDParam$Retrieve_Condition.class
+com/malk/service/fxiaoke/impl/FXKImplClient.class
+com/malk/server/h3yun/CYConf.class
+com/malk/service/dingtalk/DDClient_Storage.class
+com/malk/service/dingtalk/DDClient_Attendance.class
+com/malk/Util/UtilMc.class
+com/malk/Filter/RequestInterceptor.class
+com/malk/service/aliyun/impl/ALYInvoiceImpl.class
+com/malk/Util/UtilMath.class
+com/malk/server/aliwork/YDParam$Retrieve_FormInstId.class
+com/malk/Util/UtilImport$UtilImportBuilder.class
+com/malk/server/aliwork/YDParam$Delete.class
+com/malk/server/common/McException$McExceptionBuilder.class
+com/malk/Util/UtilDateTime.class
+com/malk/config/mutilSource/SlaveConfig.class
+com/malk/server/aliwork/YDR.class
+com/malk/service/dingtalk/impl/DDImplClient.class
+com/malk/repository/entity/primary/McTablePo$McTablePoBuilder.class
+com/malk/server/aliwork/YDConf.class
+com/malk/service/dingtalk/impl/DDImplClient_Storage.class
+com/malk/server/ekuaibao/EKBR.class
+com/malk/Util/UtilFile.class
+com/malk/repository/entity/primary/McTablePo.class
+com/malk/base/QBasePo.class
+com/malk/server/dingtalk/DDR_New.class
+com/malk/service/tencent/impl/TXYImplInvoice.class
+com/malk/server/tencent/TXYConf.class
+com/malk/server/h3yun/CYConf$ACTION_NAME.class
+com/malk/service/xbongbong/impl/XBBImplClient.class
+com/malk/test/McTestController$TModel.class
+com/malk/base/BaseDto.class
+com/malk/config/WebConfiguration.class
+com/malk/Util/UtilServlet.class
+com/malk/Util/UtilHttp.class
+com/malk/service/ekuaibao/impl/EKBClientImpl.class
+com/malk/server/common/McConf.class
+com/malk/Util/UtilString.class
+com/malk/Util/UtilVendor.class
+com/malk/server/aliwork/YDConf$FORM_OPERATION.class
+com/malk/delegate/impl/DDImplEvent_Delegate.class
+com/malk/service/dingtalk/impl/DDImplClient_Contacts.class
+com/malk/server/aliwork/YDParam$Create_Process.class
+com/malk/service/ekuaibao/EKBClient.class
+com/malk/service/dingtalk/DDClient_Workflow.class
+META-INF/spring-configuration-metadata.json
+com/malk/controller/DDCallbackController.class
+com/malk/Boot.class
+com/malk/test/dto/Async2Sync.class
+com/malk/Util/UtilExcel.class
+com/malk/base/BaseRepository.class
+com/malk/config/mutilSource/DataSourceConfig.class
+com/malk/service/dingtalk/DDService.class
+com/malk/server/common/FilePath$Path.class
+com/malk/server/dingtalk/DDConf.class
+com/malk/server/h3yun/CYR.class
+com/malk/Util/UtilExcel$UpdateCellStyle.class
+com/malk/Util/UtilExcel$UtilExcelBuilder.class
+com/malk/server/common/McPage.class
+com/malk/Filter/RequestFilter.class
+com/malk/service/fxiaoke/FXKClient.class
+com/malk/server/dingtalk/crypto/DingCallbackCrypto$Utils.class
+com/malk/service/h3yun/impl/CYImplClient.class
+com/malk/service/aliyun/ALYInvoice.class
+com/malk/service/aliwork/impl/YDClientImpl.class
+com/malk/server/common/McR.class
+com/malk/Util/UtilEnv.class
+com/malk/server/aliyun/ALYR.class
+com/malk/service/dingtalk/DDClient.class
+com/malk/repository/entity/mutual/McAuthorizationPo.class
+com/malk/server/aliwork/YDParam$Retrieve_Condition_Update.class
+com/malk/base/BasePo.class
+com/malk/schedule/McScheduleTask.class
+com/malk/server/common/McREnum.class
+com/malk/repository/entity/primary/QMcTablePo.class
+com/malk/service/aliwork/YDClient.class
+com/malk/core/AsyncConfig.class
+com/malk/service/dingtalk/DDClient_Contacts.class
+com/malk/delegate/DDEvent_Delegate.class
+com/malk/server/dingtalk/DDR.class
+com/malk/Filter/CatchException.class
+com/malk/server/common/VenR.class
+com/malk/Util/UtilConvert$ConvertData.class
+com/malk/server/fxiaoke/FXXR.class
+com/malk/server/aliwork/YDParam$Retrieve_ProcessInstanceIds.class
+com/malk/service/xbongbong/XBBClient.class
+com/malk/server/aliwork/YDParam$Update.class
+com/malk/Util/UtilList.class
+com/malk/test/McTestController.class
+com/malk/server/dingtalk/crypto/DingCallbackCrypto.class
+com/malk/Util/UtilMc$1Obj.class
+com/malk/Util/UtilImport.class
+com/malk/config/mutilSource/PrimaryConfig.class
+com/malk/server/fxiaoke/FXKConf.class
+com/malk/server/aliwork/YDParam$Update_ProcessInstanceId.class
+com/malk/base/BaseDao.class
+com/malk/service/dingtalk/impl/DDImplClient_Event.class
+com/malk/repository/entity/mutual/QMcAuthorizationPo.class
+com/malk/server/dingtalk/DDFormComponentDto$DDFormComponentDtoBuilder.class
+com/malk/server/dingtalk/crypto/DingCallbackCrypto$PKCS7Padding.class
+com/malk/server/aliwork/YDParam$Create.class
+com/malk/service/h3yun/CYClient.class
+com/malk/service/aliwork/impl/YDClientImpl$1.class
+com/malk/base/QJpaMap.class
+com/malk/service/dingtalk/DDClient_Event.class
+com/malk/server/aliwork/YDParam$Definition.class
+com/malk/server/aliwork/YDParam.class
+com/malk/service/dingtalk/impl/DDImplClient_Workflow.class
+com/malk/repository/dao/primary/McTableDao.class
+com/malk/server/aliwork/YDParam$Delete_ProcessInstanceId.class
+com/malk/service/dingtalk/impl/DDImplClient_Attendance.class
+com/malk/test/dto/User.class
+com/malk/config/JpaConfiguration.class
+com/malk/Util/UtilHttp$1.class
+com/malk/service/dingtalk/impl/DDImplService.class
+com/malk/server/dingtalk/DDFormComponentDto.class
+com/malk/service/aliwork/impl/YDServiceImpl.class
+com/malk/service/aliwork/YDService.class
+com/malk/server/common/McR$McRBuilder.class
+com/malk/base/JpaMap.class
+com/malk/server/aliwork/YDParam$Retrieve_ProcessInstanceId.class
+com/malk/Util/UtilMap.class
+com/malk/server/aliwork/YDConf$FORM_QUERY.class
+com/malk/Util/UtilToken.class
+com/malk/server/dingtalk/crypto/DingCallbackCrypto$DingTalkEncryptException.class
+com/malk/server/ekuaibao/EKBConf.class
+com/malk/server/common/FilePath$Source.class
+com/malk/service/tencent/TXYInvoice.class
+com/malk/Util/UtilHttp$METHOD.class
+com/malk/Util/UtilNumber.class
+com/malk/server/aliwork/YDParam$YDParamBuilder.class
+com/malk/Util/UtilConvert.class
+com/malk/server/common/FilePath.class
+com/malk/server/common/McException.class
+com/malk/repository/dao/mutual/McAuthorizationDao.class

mjava/target/test-classes/driver.yml

@@ -13,6 +13,9 @@ spring-1:
     username: root
     password: mu123
     url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    hikari:
+      # todo: 更新
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
   # JPA
   jpa:
     database: MYSQL
@@ -27,8 +30,6 @@ spring-2:
       url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=DingTalkApprove
       username: sa
       password: Sa123456
-      hikari:
-        connection-init-sql:  # SqlServer若设置类型不一致, 需关闭才可连接
     # JPA
     jpa:
       database: sql_server
@@ -36,10 +37,22 @@ spring-2:
         hibernate:
           default_schema: dbo
 
-
+# database
+spring-3:
+  # Oracle
+  datasource:
+    driver-class-name: oracle.jdbc.OracleDriver
+    username: front_jszyxx_2023
+    password: FrontU#JSZYxx#2023
+    url: jdbc:oracle:thin:@10.107.58.35:1521:jszyfzda
+  jpa:
+    hibernate:
+      ddl-auto: none      # JPA对表没有任何操作
+    show-sql: true
+    database: oracle
 
 # 其他配置
-spring-3:
+spring-0:
   jpa:
     hibernate:
       # 取消小驼峰到下划线映射

pom.xml

@@ -48,7 +48,7 @@
         <mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
         <mongo-java-driver.version>3.12.7</mongo-java-driver.version>
         <!--        <ojdbc6.version>11.2.0.4</ojdbc6.version>-->
-        <!-- jsp -->
+        <!-- jsp -->`
         <tomcat-embed-jasper.version>9.0.41</tomcat-embed-jasper.version>
         <jstl.version>1.2</jstl.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
@@ -61,7 +61,7 @@
         <!-- 网页转pdf -->
         <flying-saucer-pdf-itext5.version>9.0.3</flying-saucer-pdf-itext5.version>
         <!-- 不执行单元测试，也不编译测试类 -->
-        <skipTests>true</skipTests>
+        <skipTests>true</skipTests>`
         <!-- 不执行单元测试，但会编译测试类，并在target/test-classes目录下生成相应的class -->
         <maven.test.skip>true</maven.test.skip>
     </properties>