连接数据库

mjava-guyuan/pom.xml

@@ -28,7 +28,6 @@
         <dependency>
             <groupId>com.tencentcloudapi</groupId>
             <artifactId>tencentcloud-sdk-java</artifactId>
-            <version>3.1.322</version>
         </dependency>
     </dependencies>
 

mjava-minjiaoyuan/pom.xml

@@ -24,6 +24,22 @@
             <artifactId>mjava</artifactId>
             <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>
+
     </dependencies>
 
     <build>

mjava-minjiaoyuan/src/main/java/com/malk/minjiaoyuan/controller/TestControl.java

@@ -1,5 +1,6 @@
 package com.malk.minjiaoyuan.controller;
 
+import com.malk.minjiaoyuan.repository.dao.TSDao;
 import com.malk.minjiaoyuan.service.MJYService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
@@ -12,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -57,4 +59,12 @@ public class TestControl {
         YDParam ydParam = YDParam.builder().formUuid("FORM-AC666081555ANZAZ6D4IVCQLY5Y12P4ZSRTGLWD").formInstanceId(formInstanceId).tableFieldId("tableField_lgst1j3e").build();
         return this.ydService.queryDetails(ydParam);
     }
+
+    @Autowired
+    private TSDao tsDao;
+
+    @PostMapping("testOracle")
+    public McR testOracle() {
+        return McR.success(tsDao.queryTest(PageRequest.of(0, 10)));
+    }
 }

mjava-minjiaoyuan/src/main/java/com/malk/minjiaoyuan/repository/dao/TSDao.java

@@ -0,0 +1,23 @@
+package com.malk.minjiaoyuan.repository.dao;
+
+import com.malk.base.JpaMap;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+
+import javax.transaction.Transactional;
+import java.util.Map;
+
+/**
+ * 视图表查询 [通过Map实现, 无需定义实体, 主键设置Long即可]
+ */
+@Transactional
+public interface TSDao extends CrudRepository<JpaMap, Long> {
+    /**
+     * 查询教师
+     */
+//    @Query(value = "select * from frontdd_user_data", nativeQuery = true)
+    @Query(value = "select * from frontdd_organization_data", nativeQuery = true)
+    Page<Map> queryTest(Pageable pageable);
+}

mjava-minjiaoyuan/src/main/java/com/malk/minjiaoyuan/repository/entity/Teacher.java

@@ -0,0 +1,18 @@
+package com.malk.minjiaoyuan.repository.entity;
+
+
+import com.malk.base.BasePo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Table;
+
+@Table(name = "frontdd_user_data")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Teacher extends BasePo {
+
+    private String remark;
+}

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

@@ -3,6 +3,8 @@ server:
   port: 9001
   servlet:
     context-path: /api
+  tomcat:
+    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar,oraclepki.jar
 
 # condition
 spel:
@@ -10,18 +12,20 @@ spel:
   multiSource: false       # 是否多数据源配置
 
 spring:
+  #  todo:
+  application: mjava
   # database
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: mu123
-    url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    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: MYSQL
-    database-platform: org.hibernate.dialect.MySQL57Dialect
+    database: oracle
+#    database-platform: org.hibernate.dialect.MySQL57Dialect
 
 # filepath
 file:

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

@@ -3,6 +3,8 @@ server:
   port: 9001
   servlet:
     context-path: /api
+  tomcat:
+    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar,oraclepki.jar
 
 # condition
 spel:
@@ -10,18 +12,20 @@ spel:
   multiSource: false       # 是否多数据源配置
 
 spring:
+  #  todo:
+  application: mjava
   # database
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: mu123
-    url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    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: MYSQL
-    database-platform: org.hibernate.dialect.MySQL57Dialect
+    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-14";
+//            String now = "2023-06-15";
             String now = UtilDateTime.formatDate(new Date());
             String from = now + " 07:30:00";
             String end = now + " 23:59:59";

mjava-shijianguan/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Jun 14 11:14:32 CST 2023
-version=1.0-SNAPSHOT
-groupId=com.malk
-artifactId=mjava-shijianguan

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

@@ -1,2 +0,0 @@
-com/malk/rongzhi/controller/ShiJianGuanController.class
-com/malk/rongzhi/Boot.class

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

@@ -1,2 +0,0 @@
-/Users/malk/server/java-mcli-2/mjava-shijianguan/src/main/java/Boot.java
-/Users/malk/server/java-mcli-2/mjava-shijianguan/src/main/java/com.malk.shijianguan/controller/ShiJianGuanController.java

mjava-xintianlong/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Jun 14 05:57:04 CST 2023
-version=1.0-SNAPSHOT
-groupId=com.malk
-artifactId=mjava-xintianlong

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

@@ -1,13 +0,0 @@
-com/malk/xintianlong/service/HSService.class
-com/malk/xintianlong/repository/entity/HSApproveRecordPo.class
-com/malk/xintianlong/repository/dao/HSViewDao.class
-com/malk/xintianlong/controller/HSController.class
-com/malk/xintianlong/schedule/HSScheduleTask.class
-com/malk/xintianlong/server/HSConf.class
-com/malk/xintianlong/repository/dao/HSApproveRecordDao.class
-com/malk/xintianlong/delegate/DDDelegate.class
-com/malk/xintianlong/repository/entity/HSApproveRecordPo$HSApproveRecordPoBuilder.class
-com/malk/xintianlong/service/impl/HSServiceImpl.class
-com/malk/xintianlong/repository/entity/QHSApproveRecordPo.class
-com/malk/xintianlong/Boot.class
-com/malk/xintianlong/controller/DDController.class

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

@@ -1,12 +0,0 @@
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/entity/HSApproveRecordPo.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/schedule/HSScheduleTask.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/server/HSConf.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/target/generated-sources/java/com/malk/xintianlong/repository/entity/QHSApproveRecordPo.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/Boot.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/HSViewDao.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/HSApproveRecordDao.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/controller/HSController.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/delegate/DDDelegate.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/controller/DDController.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/service/impl/HSServiceImpl.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/service/HSService.java

mjava/src/main/java/com/malk/service/xbongbong/XBBClient.java

@@ -0,0 +1,4 @@
+package com.malk.service.xbongbong;
+
+public interface XBBClient {
+}

mjava/src/main/java/com/malk/service/xbongbong/impl/XBBImplClient.java

@@ -0,0 +1,11 @@
+package com.malk.service.xbongbong.impl;
+
+import com.malk.service.xbongbong.XBBClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class XBBImplClient implements XBBClient {
+    
+}

mjava/src/main/resources/application.yml

@@ -28,13 +28,13 @@ 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
+  #      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
   # JPA
   jpa:
     hibernate:

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

@@ -35,6 +35,11 @@
       "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",
@@ -45,6 +50,11 @@
       "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",
@@ -169,6 +179,16 @@
       "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",
@@ -179,6 +199,16 @@
       "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,13 @@ 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
+  #      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
   # JPA
   jpa:
     hibernate:

mjava/target/maven-archiver/pom.properties

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

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

@@ -1,134 +0,0 @@
-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/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/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/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -2,6 +2,7 @@
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/aliwork/YDR.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/ekuaibao/impl/EKBClientImpl.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/xbongbong/XBBClient.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilMc.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliwork/YDClient.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/delegate/DDEvent_Delegate.java
@@ -10,6 +11,7 @@
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/dao/slave/McTableDao.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/base/BaseDao.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/tencent/impl/TXYImplInvoice.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/xbongbong/impl/XBBImplClient.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/FilePath.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/tencent/TXYConf.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/VenR.java
@@ -72,6 +74,7 @@
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/McTestController.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/tencent/TXYInvoice.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient_Attendance.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilNumber.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/RESTFulTestController.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/dto/Async2Sync.java
 /Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/DDTestController.java

pom.xml

@@ -28,6 +28,7 @@
 
     <!-- 版本管理 Management -->
     <properties>
+        <!-- 公共依赖 -->
         <java-mcli.version>1.0.0</java-mcli.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -39,24 +40,26 @@
         <fastjson.version>1.2.83</fastjson.version>
         <commons-lang3.version>3.10</commons-lang3.version>
         <hutool-all.version>5.6.0</hutool-all.version>
-        <httpclient.version>4.5.2</httpclient.version>
-        <joda-time.version>2.9.4</joda-time.version>
-        <mysql-connector-java.version>8.0.22</mysql-connector-java.version>
         <spring-boot-starter-data-jpa.version>2.1.3.RELEASE</spring-boot-starter-data-jpa.version>
-        <flying-saucer-pdf-itext5.version>9.0.3</flying-saucer-pdf-itext5.version>
-        <mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
         <querydsl-apt.version>4.2.1</querydsl-apt.version>
         <querydsl-jpa.version>4.2.1</querydsl-jpa.version>
-        <easyexcel.version>2.2.7</easyexcel.version>
-        <flyway-core.version>6.1.0</flyway-core.version>
+        <!-- 数据库连接 -->
+        <mysql-connector-java.version>8.0.22</mysql-connector-java.version>
+        <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 -->
         <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>
         <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
+        <!-- 其他依赖 -->
         <java-jwt.version>3.4.0</java-jwt.version>
-        <java-jwt.version>3.4.0</java-jwt.version>
+        <easyexcel.version>2.2.7</easyexcel.version>
+        <!-- swagger3 -->
         <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
-        <mongo-java-driver.version>3.12.7</mongo-java-driver.version>
+        <!-- 网页转pdf -->
+        <flying-saucer-pdf-itext5.version>9.0.3</flying-saucer-pdf-itext5.version>
         <!-- 不执行单元测试，也不编译测试类 -->
         <skipTests>true</skipTests>
         <!-- 不执行单元测试，但会编译测试类，并在target/test-classes目录下生成相应的class -->
@@ -139,6 +142,13 @@
                 <version>${mongo-java-driver.version}</version>
             </dependency>
 
+            <!-- oracle 驱动-->
+            <!--            <dependency>-->
+            <!--                <groupId>com.oracle</groupId>-->
+            <!--                <artifactId>ojdbc6</artifactId>-->
+            <!--                <version>${ojdbc6.version}</version>-->
+            <!--            </dependency>-->
+
             <!-- data-jpa 数据库操作 -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -274,16 +284,6 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
-        <!-- 宜搭需要的依赖 -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-
         <!-- mySql 驱动 -->
         <dependency>
             <groupId>mysql</groupId>