Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 79c1cc71dfcf2ac2a96433439507e582b7bf23e2

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/resources/application-test.yml

 ruoyi-admin/lib/lkl-java-sdk-1.0.7.jar

Binary files differ

 ruoyi-admin/pom.xml

@@ -16,6 +16,15 @@
    </description>

    <dependencies>

        <dependency>
            <groupId>com.lkl.laop.sdk</groupId>
            <artifactId>lkl-laop-java-sdk</artifactId>
            <version>1.0.x</version>
            <systemPath>${project.basedir}/lib/lkl-java-sdk-1.0.7.jar</systemPath>
            <scope>system</scope>
        </dependency>

        <dependency>
            <groupId>com.aliyun.oss</groupId>
            <artifactId>aliyun-sdk-oss</artifactId>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.api;


import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -12,6 +13,7 @@
import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpSupplierWarehousingService;
import com.ruoyi.system.vo.*;
import com.ruoyi.web.core.config.LakalaAlipayConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
@@ -53,6 +55,11 @@
    @ApiOperation(value = "供应商获取库存分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
        V3LabsTransPreorderRequest request = new V3LabsTransPreorderRequest();
        request.setLklAppId(LakalaAlipayConfig.appId);
        request.setMerchantNo(LakalaAlipayConfig.MerchantNo);
        request.setTermNo(LakalaAlipayConfig.TermNo);

        SysUser user = tokenService.getLoginUser().getUser();
        return R.ok(erpSupplierWarehousingService.pageList(query,user));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/LakalaAlipayConfig.java

New file
@@ -0,0 +1,163 @@
package com.ruoyi.web.core.config;

import com.lkl.laop.sdk.Config2;
import com.lkl.laop.sdk.LKLSDK;
import com.lkl.laop.sdk.exception.SDKException;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

@Component
@ConfigurationProperties(prefix = "lakala")
public class LakalaAlipayConfig {
 
    public static  String MerchantNo;
 
    public static  String TermNo;
 
    public static  String NotifyUrl;
 
 
 
    public static  String subAppId; // 微信商户appId
 
    public static  String appId; // 拉卡拉appId
 
    public static  String serialNo; // 你的证书序列号
 
    /**
     * 拉卡拉支付平台密钥
     */
    public static String priKeyStr;
    /**
     * 拉卡拉支付平台证书
     */
 
    public static String lklCerStr;
 
    /**
     * 拉卡拉支付平台证书2(用于拉卡拉通知验签)
     */
 
    public static String lklNotifyCerStr;
 
    /**
     * 拉卡拉报文加密对称性密钥
     */
    public static  String sm4Key;
    /**
     *     服务地址
     */
    public static  String serverUrl;
 
    public static String getMerchantNo() {
        return MerchantNo;
    }
 
    public  void setMerchantNo(String merchantNo) {
        MerchantNo = merchantNo;
    }
 
    public static String getTermNo() {
        return TermNo;
    }
 
    public  void setTermNo(String termNo) {
        TermNo = termNo;
    }
 
    public static String getNotifyUrl() {
        return NotifyUrl;
    }
 
    public  void setNotifyUrl(String notifyUrl) {
        NotifyUrl = notifyUrl;
    }
 
    public static String getAppId() {
        return appId;
    }
 
    public  void setAppId(String appId) {
        LakalaAlipayConfig.appId = appId;
    }
 
    public static String getSubAppId() {
        return subAppId;
    }
 
    public void setSubAppId(String subAppId) {
        LakalaAlipayConfig.subAppId = subAppId;
    }
    public static String getSerialNo() {
        return serialNo;
    }
 
    public  void setSerialNo(String serialNo) {
        LakalaAlipayConfig.serialNo = serialNo;
    }
 
    public static String getPriKeyStr() {
        return priKeyStr;
    }
 
    public  void setPriKeyStr(String priKeyStr) {
        LakalaAlipayConfig.priKeyStr = priKeyStr;
    }
 
    public static String getLklCerStr() {
        return lklCerStr;
    }
 
    public  void setLklCerStr(String lklCerStr) {
        LakalaAlipayConfig.lklCerStr = lklCerStr;
    }
 
    public static String getLklNotifyCerStr() {
        return lklNotifyCerStr;
    }
 
    public  void setLklNotifyCerStr(String lklNotifyCerStr) {
        LakalaAlipayConfig.lklNotifyCerStr = lklNotifyCerStr;
    }
 
    public static String getSm4Key() {
        return sm4Key;
    }
 
    public  void setSm4Key(String sm4Key) {
        LakalaAlipayConfig.sm4Key = sm4Key;
    }
 
    public static String getServerUrl() {
        return serverUrl;
    }
 
    public  void setServerUrl(String serverUrl) {
        LakalaAlipayConfig.serverUrl = serverUrl;
    }
 
    private static volatile boolean init = false;
 
    /***
     * @Description: 初始化设置商户公共参数（全局只需设置一次）
     * @throws Exception
     */
    public static void doInit() throws Exception {
        if(!init) {
            init = initByJava();
        }
    }
    public static boolean initByJava() throws SDKException {
        Config2 config = new Config2();
        config.setAppId(appId);
        config.setSerialNo(serialNo);
        config.setPriKey(priKeyStr);
        config.setLklCer(lklCerStr);
        config.setLklNotifyCer(lklNotifyCerStr);
        config.setServerUrl(serverUrl);
        config.setSm4Key(sm4Key);
        return LKLSDK.init(config);
 
    }
}
 

 ruoyi-admin/src/main/resources/application-test.yml

@@ -95,7 +95,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://127.0.0.1:3306/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
        url: jdbc:mysql://192.168.110.34:3306/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
        username: root
        password: 123456
      # 从库数据源
@@ -203,4 +203,16 @@
  config:
    accessKeyId: LTAI5t99NH2Wwoq48ho72u8M
    accessKeySecret: wAGHKUEBrrTgDcbfjnBKTEt5858Ru5
    signName: "海诊通"
    signName: "海诊通"
lakala:
  MerchantNo: 1
  TermNo: 1
  NotifyUrl: 1
  subAppId: 1
  appId: 1
  serialNo: 1
  priKeyStr: 1
  lklCerStr: 1
  lklNotifyCerStr: 1
  sm4Key: 1
  serverUrl: 1

 ruoyi-system/pom.xml

@@ -16,13 +16,6 @@
    </description>

    <dependencies>
        <dependency>
            <groupId>com.lkl.laop.sdk</groupId>
            <artifactId>lkl-laop-java-sdk</artifactId>
            <version>1.0.x</version>
            <systemPath>${project.basedir}/lib/lkl-java-sdk-1.0.7.jar</systemPath>
            <scope>system</scope>
        </dependency>

        <dependency>
            <groupId>com.qcloud</groupId>

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -1,13 +1,5 @@
package com.ruoyi.system.service.impl;

import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
@@ -17,6 +9,15 @@
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 字典 业务层处理

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpMaintenanceReminderServiceImpl.java

@@ -1,7 +1,6 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.lkl.laop.sdk.LKLSDK;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.mapper.*;