测试

Signed-off-by: EDZ <1>

pom.xml

@@ -285,7 +285,8 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <fork>true</fork>
+<!--                    <fork>true</fork>-->
+                    <includeSystemScope>true</includeSystemScope>
                 </configuration>
             </plugin>
             <!-- 跳过单元测试 -->

src/main/resources/application-pre.yml

@@ -4,13 +4,25 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     druid:
       master-data-source:
-        url: jdbc:mysql://127.0.0.1:3306/dp-lte-boot?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+        driverClassName: com.mysql.jdbc.Driver
+        url: jdbc:mysql://localhost:3306/jinmilong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
         username: root
         password: root
       slave-data-source:
-        url: jdbc:mysql://127.0.0.1:3306/dp-lte-boot?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-        username: root
-        password: root
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://192.168.0.9:1433;DatabaseName=UFDATA_998_2021
+        username: sa
+        password: Ks123456
+      last-data-source:
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://192.168.0.9:1433;DatabaseName=CRM_U8_System
+        username: sa
+        password: Ks123456
+      #      slave-data-source:
+      #        driverClassName: oracle.jdbc.driver.OracleDriver
+      #        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+      #        username: system
+      #        password: 1
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -32,7 +44,7 @@ spring:
         stat:
           log-slow-sql: true
           slow-sql-millis: 1000
-          merge-sql: true
+          merge-sql: false
         wall:
           config:
             multi-statement-allow: true

src/main/resources/application-sit.yml

@@ -6,7 +6,7 @@ spring:
         driverClassName: com.mysql.jdbc.Driver
         url: jdbc:mysql://127.0.0.1:3306/jinmilong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
         username: root
-        password: 123
+        password: root
       slave-data-source:
         driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
         url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=UFDATA_998_2021
@@ -19,8 +19,8 @@ spring:
         password: 123@qaz
 #      slave-data-source:
 #        driverClassName: oracle.jdbc.driver.OracleDriver
-#        url: jdbc:oracle:thin:@139.196.93.8:1521:gxhq
-#        username: icappx
+#        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+#        username: system
 #        password: 1
       initial-size: 10
       max-active: 100

src/main/resources/application.yml

@@ -23,7 +23,8 @@ jwt:
 spring:
   # 环境 sit:集成测试环境|pre:预生产环境|prd:生成环境
   profiles:
-    active: @spring.active@
+#    active: @spring.active@
+    active: sit
   mvc:
     static-path-pattern: /static/**
   # jackson时间格式化

src/main/resources/config.properties

@@ -1,5 +1,16 @@
 
 ################# U8接口参数 ####################
+
+##调用方id
+#from_account=JML2021
+##提供方id
+#to_account = JML2021
+##应用key
+#app_key=opa3616de88da543d8b
+##应用密钥
+#app_secret=ccbe14b95a4f48f994d9ce27d0263c6e
+
+###############测试参数
 #调用方id
 from_account=yuansh
 #提供方id
@@ -8,6 +19,7 @@ to_account = test_yuansh
 app_key=opa57a53c32fcc8c23f
 #应用密钥
 app_secret=a9b18c123335483a84f8cb183323ba01
+
 #获取token的url
 api_url_token_get=https://api.yonyouup.com/system/token?from_account={from_account}&app_key={app_key}&app_secret={app_secret}
 #获取trade_id 的url
@@ -20,40 +32,51 @@ api_url_result_get = https://api.yonyouup.com/result?requestid={requestid}
 baseURL=https://api.yonyouup.com/api/
 #审核人
 u_shenhe_userid=demo
-################# 钉钉接口参数 ####################
-
-##ding_appkey=dingg4komkiirlidfnag
-##ding_appsecret=WcrjxsKA8Jay95sbge_wF5njoK7f6WR7CYqpMswYbIZwv_45xLDq2ZDzjAMWCS0U
-#备用金申请process_code
-#byj_process_code=PROC-A561B73E-8282-4780-BB05-DCBA8125C45C
-#报销申请process_code
-#bx_process_code=PROC-BE874F70-C29B-4391-836F-BC5A1F57A4BB
-#销售订单
-##xsdd_process_code=PROC-9266388D-FC2A-4BBA-A91D-214F4AAC38B4
-#采购订单
-#cgdd_process_code=PROC-BFE32FF9-45C3-4EAD-A535-2E154F298663
-#付款申请单
-#fksqd_process_code=PROC-FBACFA27-53F9-4EF8-BAB4-B03CBC402BB4
-
-##########测试
-ding_appkey=dinghsdu3m2hbomabuki
-ding_appsecret=7tKfouLzpnVOjRhkIHBO4j5wAry-LgAV71wrWV7rNeyvEyKViajKfb4_G-RjeyC3
-#备用金申请process_code
+
+###################################################
+################# 钉钉 接口参数 ####################
+##应用id
+agentid=1313665313
+ding_appkey=dingg4komkiirlidfnag
+ding_appsecret=WcrjxsKA8Jay95sbge_wF5njoK7f6WR7CYqpMswYbIZwv_45xLDq2ZDzjAMWCS0U
+##备用金申请process_code
+byj_process_code=PROC-A561B73E-8282-4780-BB05-DCBA8125C45C
+##报销申请process_code
+bx_process_code=PROC-BE874F70-C29B-4391-836F-BC5A1F57A4BB
+##销售订单审核
+xsdd_process_code=PROC-9266388D-FC2A-4BBA-A91D-214F4AAC38B4
+##采购订单审核
+cgdd_process_code=PROC-BFE32FF9-45C3-4EAD-A535-2E154F298663
+##付款申请单
+fksqd_process_code=PROC-FBACFA27-53F9-4EF8-BAB4-B03CBC402BB4
+##审批发起人员
+userid=20264331162691
+##审批发起人部门
+deptid=412163022
+##钉钉审核人
+#shenhe_userid=
+shenhe_userid=20264331162691
+
+
+#########测试
+##应用id
+#agentid=1306561711L
+#ding_appkey=dinghsdu3m2hbomabuki
+#ding_appsecret=7tKfouLzpnVOjRhkIHBO4j5wAry-LgAV71wrWV7rNeyvEyKViajKfb4_G-RjeyC3
+##备用金申请process_code
 #byj_process_code=
-#报销申请process_code
+##报销申请process_code
 #bx_process_code=
-#销售订单
-xsdd_process_code=PROC-4B526252-017E-4531-91A0-4DEAC6883952
-#采购订单
-cgdd_process_code=PROC-971173C9-46DF-4FA8-BEBB-94D3477ADB97
-#付款申请单
-fksqd_process_code=PROC-D9555820-0053-4EC0-AB51-688E5545123C
-#应用id
-agentid=1306561711L
-#人员
-userid=manager5914
-#部门
-deptid=1L
-#钉钉审核人
-shenhe_userid=20264331162691
+##销售订单
+#xsdd_process_code=PROC-4B526252-017E-4531-91A0-4DEAC6883952
+##采购订单
+#cgdd_process_code=PROC-971173C9-46DF-4FA8-BEBB-94D3477ADB97
+##付款申请单
+#fksqd_process_code=PROC-D9555820-0053-4EC0-AB51-688E5545123C
+##审批发起人员
+#userid=manager5914
+##审批发起人部门
+#deptid=1L
+##钉钉审核人
+#shenhe_userid=20264331162691