feat: 适配oa接口

src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java

@@ -73,7 +73,7 @@ public class VisitMainController {
         for (VisitMain visit : list) {
             // 仅审批中数据进行补偿
             if(visit.getCheckState().equals(VisitMainConst.CheckState_0)){
-                visitMainService.runCompensate(visit.getId());
+                //visitMainService.runCompensate(visit.getId());
             }
         }
         return R.byPageHelperList(list);

src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java

@@ -266,6 +266,7 @@ public class WxUserServiceImpl extends ServiceImpl<WxUserMapper, WxUser> impleme
                 if(wxUser == null){
                     wxUser = new WxUser();
                     wxUser.setAppId(wxApp.getId());
+                    wxUser.setUserType(userType);
                     wxUser.setAppType(wxApp.getAppType());
                     wxUser.setNickName(auth2UserInfo.getNickname());
                     wxUser.setEmpName(auth2UserInfo.getNickname());

src/main/resources/application-dev.yml

@@ -1,11 +1,11 @@
 #项目配置
 project:
-  flow-dev: true
+  flowTest: true
   upload:
     #上传映射地址
     proxy-url: https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/jsl/
 
-api:
+apis:
   host:
     seeyon: 'http://127.0.0.1:7444'
 
@@ -31,12 +31,12 @@ spring:
       datasource:
         main:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.0.9:3306/jsl_cp_serve?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://192.168.0.9:3306/jsl_cp_serve?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
           username: kpjsl
           password: 123456
         crm:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
           username: kpjsl
           password: 123456
   redis:

src/main/resources/application-pro.yml

@@ -1,53 +1,14 @@
 #项目配置
 project:
-  #关闭权限
-  close-auth: 'false'
-  #true-请求端；false-接收端
-  bir-service: 'false'
-  #对应233服务的的cms
-  bir-service-url: 'http://59.37.164.96:7400'
-  #bir-service-url: 'http://127.0.0.1:7401'
-  web_url: 'http://192.168.0.9:6031'
-  host_url: 'http://192.168.0.9:7400'
-  pc-web-local: 'D:\Software\Nginx1.8\html\jslcrm3\'
-  apis:
-    #支付接口
-    cost-to-pay: 'http://59.37.164.96:2505/api/cms/api/add'
-    check-pay-status: 'http://59.37.164.96:2506/action/cms/cost/match'
-    # 核销生成报价单接口
-    diaodu-plan-order: ''
-    # 嘉士利接口，spu转换sku
-    spu-to-sku: 'http://59.37.164.96:2505/api/cms/order/matchInvCode'
-    # 政策同步
-    policy-sync-cate: 'http://192.168.10.18:9003/api/cms/saleCost/costPolicy/syncCate'
-    # 政策同步旧的
-    policy-sync-inv: 'http://192.168.10.18:9003/api/cms/saleCost/costPolicy/syncInv'
-  task: false
-  dev: false
-  seeyon:
-    enable: true
-    url: 'http://192.168.0.9:7444'
-    #请求致远OA的拓展服务（用于修改密码）
-    extApi: 'http://192.168.10.244:9003/'
-
+  flowTest: false
   upload:
     #上传映射地址
     proxy-url: https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/jsl/
-    #物理存储地址
-    logical-path: D:\\WebMapPath\\
-#腾讯云配置
-tencent:
-  sms:
-    secret-id: AKIDR3A5mVkSaXFUT3TABanPxc2MtkMu45wb
-    secret-key: iLkjeKzHwegQ4eE55xX9byXmBLxgwypV
-    sdkAppId: 1400174031
-    signName: 柒胜软件
-    templateId: 689207
-#天翼云配置
-tianyi:
-  sms:
-    appid: 'WIgWyCFn4DnHLtjKBIXBVyZbGevFg3J4'
-    appKey: 'bjfsZlF01OZPUzyiCLSFOrOOnfsZhYZJ'
+
+apis:
+  host:
+    seeyon: 'http://127.0.0.1:7445'
+
 aliyun:
   oss:
     bucket: qsjslservice
@@ -57,31 +18,29 @@ aliyun:
     prefix: jsl
 #服务配置
 server:
-  port: 7401
+  port: 7300
   servlet:
     context-path: /
+
 #SpringBoot相关
 spring:
   datasource:
     dynamic:
-      primary: crm_db #设置默认的数据源或者数据源组,默认值即为master
-      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      primary: main
+      strict: false
       datasource:
-        crm_db:
+        main:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://183.56.249.148:3306/jsl_cp_serve?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+          username: root
+          password: '@Jsl2282125'
+        crm:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://183.56.249.148:3306/jsl_cost_base?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://183.56.249.148:3306/jsl_cost_base?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
           username: root
           password: '@Jsl2282125'
-        qisheng:
-          url: jdbc:sqlserver://192.168.10.11:1433;DatabaseName=JSL_COST_QS
-          username: sa
-          password: JSL2282125
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   redis:
-    database: 2
+    database: 1
     host: 127.0.0.1
     port: 6379
     password:
-#工作流配置
-flowable:
-  database-schema-update: true

src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
       max-file-size: 100MB
       max-request-size: 160MB
   profiles:
-    active: dev
+    active: pro
   main:
     #easypoi启用覆盖
     allow-bean-definition-overriding: true