Sfoglia il codice sorgente

门户ehr单点登录

Zimo 1 giorno fa
parent
commit
4f025ff84a

+ 8 - 0
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import cn.iocoder.yudao.module.system.service.social.SocialClientService;
 import cn.iocoder.yudao.module.system.service.social.SocialClientService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -212,6 +213,13 @@ public class AuthController {
         return success(authService.pmsSsoToken(reqVO));
         return success(authService.pmsSsoToken(reqVO));
     }
     }
 
 
+    @PostMapping("/ehrLogin")
+    @PermitAll
+    @Operation(summary = "根据当前登录人工号 获取随机验证码", description = "快捷登录OA")
+    public CommonResult<ImmutableMap> ehrLogin(@RequestBody @Valid AuthOaLoginReqVO reqVO) throws Exception {
+        return success(authService.ehrLogin(reqVO));
+    }
+
     @PostMapping("/zentaoSsoToken")
     @PostMapping("/zentaoSsoToken")
     @PermitAll
     @PermitAll
     @Operation(summary = "根据当前登录人工号 获取随机验证码", description = "快捷登录 禅道")
     @Operation(summary = "根据当前登录人工号 获取随机验证码", description = "快捷登录 禅道")

+ 8 - 0
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.auth;
 
 
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*;
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import com.google.common.collect.ImmutableMap;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
 
 
@@ -105,6 +106,13 @@ public interface AdminAuthService {
      */
      */
     String pmsSsoToken(AuthOaLoginReqVO reqVO);
     String pmsSsoToken(AuthOaLoginReqVO reqVO);
 
 
+    /**
+     * ehr sso登录
+     * @param reqVO
+     * @return
+     */
+    ImmutableMap ehrLogin(AuthOaLoginReqVO reqVO) throws Exception;
+
     /**
     /**
      * 根据登录token获取登录人的工号
      * 根据登录token获取登录人的工号
      *
      *

+ 26 - 0
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -37,13 +37,16 @@ import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.module.system.util.DingtalkUtil;
 import cn.iocoder.yudao.module.system.util.DingtalkUtil;
+import cn.iocoder.yudao.module.system.util.EncryptUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.anji.captcha.model.common.ResponseModel;
 import com.anji.captcha.model.common.ResponseModel;
 import com.anji.captcha.model.vo.CaptchaVO;
 import com.anji.captcha.model.vo.CaptchaVO;
 import com.anji.captcha.service.CaptchaService;
 import com.anji.captcha.service.CaptchaService;
+import com.baomidou.mybatisplus.core.toolkit.EncryptUtils;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableMap;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
@@ -108,6 +111,18 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     @Value("${oa.secret}")
     @Value("${oa.secret}")
     private String oaSecret;
     private String oaSecret;
 
 
+    @Value("${ehr.licence}")
+    private String ehrLicence;
+    @Value("${ehr.clientId}")
+    private String ehrClientId;
+    @Value("${ehr.privateKey}")
+    private String ehrPrivateKey;
+    @Value("${ehr.url}")
+    private String ehrUrl;
+    @Value("${ehr.home}")
+    private String ehrHome;
+
+
     @Value("${zentao.code}")
     @Value("${zentao.code}")
     private String zentaoCode;
     private String zentaoCode;
 
 
@@ -393,6 +408,17 @@ public class AdminAuthServiceImpl implements AdminAuthService {
         return result;
         return result;
     }
     }
 
 
+    @Override
+    public ImmutableMap ehrLogin(AuthOaLoginReqVO reqVO) throws Exception {
+        String workcode = reqVO.getUsername();
+        AdminUserDO userByUsername = userService.getUserByUsername(workcode);
+        if (userByUsername == null) {throw new ServiceException(new ErrorCode(22,"不存在用户"));}
+        String sign = "company_id="+ehrClientId+"&mobile_no="+userByUsername.getMobile()+"&timestamp="+System.currentTimeMillis();;
+        String signture = EncryptUtil.encryptByPrivateKey(sign, "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIFwW+2Zqr+UTebl0OAAQ9XVkJGol+NHNAYcEgqu7PISEPxquHhO/Vwkq7AkaYxiNC79PSGAknX9uG1I78nzx6krkoiTw50+fG6iBBNXrou1GC4A0Ak4Q/4njX4rYcy812M91q/ySop2LBILsyRVDYBdek1WQ4k01eiKWJKGt2I1AgMBAAECgYB6XD36uTZJjqep63xuFLILtazJlSeoSYorcGO5x6zkFSILi9NAn+MwNNY8V9+TPs530Rr1zbYmZifu33EWZyZJJk8STSicgGb03Bcm7eduJX7Xn0PanNoegXiE94SzdESFgZIgVkS0we3s5okRiRcXGYEo9XQ6HZiCaEinbz3YbQJBAPIcUUPD5DnJvTysFLiUzqwJlLGjhzwa1c+ld77Gj3vR4MPDRtG0GjoYW5VMO3SuwrXqqbnD97D2Ep7ygAVZpssCQQCI3VLNhrOH4UUGiQj5+T87X9t+Y+AIxwJJr/264iSo02MwDtDpynQ5RcdcdM09aEXgjQNlgKguSEFitek3mPr/AkAMEbNPYH2JD/B6DM3/oZNn6hZagJ9mNKRB9KqyfO18K6s7twlZvNOt37b5C1LPb0LPlMIfO5CmZq3o9IfDPIPfAkAqUHMXQ/whmI4ktR1nW54nFz3fV7WeQRj9+0FxFBXNdH2IECya+5LvWhmHBj2mLKTeBfr02NAmbwR4JlHSdKO1AkEArjvpWjdoiW8fkl1OwbUjdExcjTPAcclc8BZFUptfUqzgrIH2Us49w9e8U6Fp088AgTqFOPXdvYbLAyIcMCQ4ZA==")
+                .replaceAll("\\+", "%2B");
+        return ImmutableMap.of("licence", ehrLicence, "sign", signture,"redirect", ehrHome,"ehrUrl", ehrUrl);
+    }
+
     @Override
     @Override
     public String pmsSsoToken(AuthOaLoginReqVO reqVO) {
     public String pmsSsoToken(AuthOaLoginReqVO reqVO) {
         HttpHeaders headers = new HttpHeaders();
         HttpHeaders headers = new HttpHeaders();

+ 273 - 0
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/Base64Util.java

@@ -0,0 +1,273 @@
+package cn.iocoder.yudao.module.system.util;
+
+public class Base64Util {
+
+    static private final int BASE_LENGTH = 128;
+    static private final int LOOKUP_LENGTH = 64;
+    static private final int TWENTY_FOUR_BIT_GROUP = 24;
+    static private final int EIGHT_BIT = 8;
+    static private final int SIXTEEN_BIT = 16;
+    static private final int FOUR_BYTE = 4;
+    static private final int SIGN = -128;
+    static private final char PAD = '=';
+    static private final boolean fDebug = false;
+    static final private byte[] base64Alphabet = new byte[BASE_LENGTH];
+    static final private char[] lookUpBase64Alphabet = new char[LOOKUP_LENGTH];
+
+    static {
+        for (int i = 0; i < BASE_LENGTH; ++i) {
+            base64Alphabet[i] = -1;
+        }
+        for (int i = 'Z'; i >= 'A'; i--) {
+            base64Alphabet[i] = (byte) (i - 'A');
+        }
+        for (int i = 'z'; i >= 'a'; i--) {
+            base64Alphabet[i] = (byte) (i - 'a' + 26);
+        }
+
+        for (int i = '9'; i >= '0'; i--) {
+            base64Alphabet[i] = (byte) (i - '0' + 52);
+        }
+
+        base64Alphabet['+'] = 62;
+        base64Alphabet['/'] = 63;
+
+        for (int i = 0; i <= 25; i++) {
+            lookUpBase64Alphabet[i] = (char) ('A' + i);
+        }
+
+        for (int i = 26, j = 0; i <= 51; i++, j++) {
+            lookUpBase64Alphabet[i] = (char) ('a' + j);
+        }
+
+        for (int i = 52, j = 0; i <= 61; i++, j++) {
+            lookUpBase64Alphabet[i] = (char) ('0' + j);
+        }
+        lookUpBase64Alphabet[62] = (char) '+';
+        lookUpBase64Alphabet[63] = (char) '/';
+
+    }
+
+    private static boolean isWhiteSpace(char octect) {
+        return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
+    }
+
+    private static boolean isPad(char octect) {
+        return (octect == PAD);
+    }
+
+    private static boolean isData(char octect) {
+        return (octect < BASE_LENGTH && base64Alphabet[octect] != -1);
+    }
+
+    /**
+     * Encodes hex octects into Base64
+     *
+     * @param binaryData Array containing binaryData
+     * @return Encoded Base64 array
+     */
+    public static String encode(byte[] binaryData) {
+
+        if (binaryData == null) {
+            return null;
+        }
+
+        int lengthDataBits = binaryData.length * EIGHT_BIT;
+        if (lengthDataBits == 0) {
+            return "";
+        }
+
+        int fewerThan24bits = lengthDataBits % TWENTY_FOUR_BIT_GROUP;
+        int numberTriplets = lengthDataBits / TWENTY_FOUR_BIT_GROUP;
+        int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
+        char encodedData[] = null;
+
+        encodedData = new char[numberQuartet * 4];
+
+        byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
+
+        int encodedIndex = 0;
+        int dataIndex = 0;
+        if (fDebug) {
+            System.out.println("number of triplets = " + numberTriplets);
+        }
+
+        for (int i = 0; i < numberTriplets; i++) {
+            b1 = binaryData[dataIndex++];
+            b2 = binaryData[dataIndex++];
+            b3 = binaryData[dataIndex++];
+
+            if (fDebug) {
+                System.out.println("b1= " + b1 + ", b2= " + b2 + ", b3= " + b3);
+            }
+
+            l = (byte) (b2 & 0x0f);
+            k = (byte) (b1 & 0x03);
+
+            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+            byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
+
+            if (fDebug) {
+                System.out.println("val2 = " + val2);
+                System.out.println("k4 = " + (k << 4));
+                System.out.println("vak = " + (val2 | (k << 4)));
+            }
+
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
+        }
+
+        // form integral number of 6-bit groups
+        if (fewerThan24bits == EIGHT_BIT) {
+            b1 = binaryData[dataIndex];
+            k = (byte) (b1 & 0x03);
+            if (fDebug) {
+                System.out.println("b1=" + b1);
+                System.out.println("b1<<2 = " + (b1 >> 2));
+            }
+            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
+            encodedData[encodedIndex++] = PAD;
+            encodedData[encodedIndex++] = PAD;
+        } else if (fewerThan24bits == SIXTEEN_BIT) {
+            b1 = binaryData[dataIndex];
+            b2 = binaryData[dataIndex + 1];
+            l = (byte) (b2 & 0x0f);
+            k = (byte) (b1 & 0x03);
+
+            byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+            byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
+            encodedData[encodedIndex++] = PAD;
+        }
+
+        return new String(encodedData);
+    }
+
+    /**
+     * Decodes Base64 data into octects
+     *
+     * @param encoded string containing Base64 data
+     * @return Array containind decoded data.
+     */
+    public static byte[] decode(String encoded) {
+
+        if (encoded == null) {
+            return null;
+        }
+
+        char[] base64Data = encoded.toCharArray();
+        // remove white spaces
+        int len = removeWhiteSpace(base64Data);
+
+        if (len % FOUR_BYTE != 0) {
+            return null;//should be divisible by four
+        }
+
+        int numberQuadruple = (len / FOUR_BYTE);
+
+        if (numberQuadruple == 0) {
+            return new byte[0];
+        }
+
+        byte decodedData[] = null;
+        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+        char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
+
+        int i = 0;
+        int encodedIndex = 0;
+        int dataIndex = 0;
+        decodedData = new byte[(numberQuadruple) * 3];
+
+        for (; i < numberQuadruple - 1; i++) {
+
+            if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
+                    || !isData((d3 = base64Data[dataIndex++]))
+                    || !isData((d4 = base64Data[dataIndex++]))) {
+                return null;
+            }//if found "no data" just return null
+
+            b1 = base64Alphabet[d1];
+            b2 = base64Alphabet[d2];
+            b3 = base64Alphabet[d3];
+            b4 = base64Alphabet[d4];
+
+            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+        }
+
+        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) {
+            return null;//if found "no data" just return null
+        }
+
+        b1 = base64Alphabet[d1];
+        b2 = base64Alphabet[d2];
+
+        d3 = base64Data[dataIndex++];
+        d4 = base64Data[dataIndex++];
+        if (!isData((d3)) || !isData((d4))) {//Check if they are PAD characters
+            if (isPad(d3) && isPad(d4)) {
+                if ((b2 & 0xf) != 0)//last 4 bits should be zero
+                {
+                    return null;
+                }
+                byte[] tmp = new byte[i * 3 + 1];
+                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+                tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+                return tmp;
+            } else if (!isPad(d3) && isPad(d4)) {
+                b3 = base64Alphabet[d3];
+                if ((b3 & 0x3) != 0)//last 2 bits should be zero
+                {
+                    return null;
+                }
+                byte[] tmp = new byte[i * 3 + 2];
+                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+                tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+                tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+                return tmp;
+            } else {
+                return null;
+            }
+        } else { //No PAD e.g 3cQl
+            b3 = base64Alphabet[d3];
+            b4 = base64Alphabet[d4];
+            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+            decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+
+        }
+
+        return decodedData;
+    }
+
+    /**
+     * remove WhiteSpace from MIME containing encoded Base64 data.
+     *
+     * @param data the byte array of base64 data (with WS)
+     * @return the new length
+     */
+    private static int removeWhiteSpace(char[] data) {
+        if (data == null) {
+            return 0;
+        }
+
+        // count characters that's not whitespace
+        int newSize = 0;
+        int len = data.length;
+        for (int i = 0; i < len; i++) {
+            if (!isWhiteSpace(data[i])) {
+                data[newSize++] = data[i];
+            }
+        }
+        return newSize;
+    }
+}

+ 31 - 0
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/EncryptUtil.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.system.util;
+
+
+import javax.crypto.Cipher;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.PKCS8EncodedKeySpec;
+
+public class EncryptUtil {
+    
+    /**
+    * content: company_id=客户标识&mobile_no=手机号×tamp=时间戳
+    **/
+    public static String encryptByPrivateKey(String content, String privateKey) throws NoSuchAlgorithmException, Exception {
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(Base64Util.decode(privateKey));
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        Key key = keyFactory.generatePrivate(keySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.ENCRYPT_MODE, key);
+        byte[] resultBytes = cipher.doFinal(content.getBytes("UTF-8"));
+        return Base64Util.encode(resultBytes);
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        String abc = "company_id=32640f63-35e9-4cb4-9cf9-3254a32ba862&mobile_no=15835101206&timestamp="+System.currentTimeMillis();
+        System.out.println(EncryptUtil.encryptByPrivateKey(abc, "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIFwW+2Zqr+UTebl0OAAQ9XVkJGol+NHNAYcEgqu7PISEPxquHhO/Vwkq7AkaYxiNC79PSGAknX9uG1I78nzx6krkoiTw50+fG6iBBNXrou1GC4A0Ak4Q/4njX4rYcy812M91q/ySop2LBILsyRVDYBdek1WQ4k01eiKWJKGt2I1AgMBAAECgYB6XD36uTZJjqep63xuFLILtazJlSeoSYorcGO5x6zkFSILi9NAn+MwNNY8V9+TPs530Rr1zbYmZifu33EWZyZJJk8STSicgGb03Bcm7eduJX7Xn0PanNoegXiE94SzdESFgZIgVkS0we3s5okRiRcXGYEo9XQ6HZiCaEinbz3YbQJBAPIcUUPD5DnJvTysFLiUzqwJlLGjhzwa1c+ld77Gj3vR4MPDRtG0GjoYW5VMO3SuwrXqqbnD97D2Ep7ygAVZpssCQQCI3VLNhrOH4UUGiQj5+T87X9t+Y+AIxwJJr/264iSo02MwDtDpynQ5RcdcdM09aEXgjQNlgKguSEFitek3mPr/AkAMEbNPYH2JD/B6DM3/oZNn6hZagJ9mNKRB9KqyfO18K6s7twlZvNOt37b5C1LPb0LPlMIfO5CmZq3o9IfDPIPfAkAqUHMXQ/whmI4ktR1nW54nFz3fV7WeQRj9+0FxFBXNdH2IECya+5LvWhmHBj2mLKTeBfr02NAmbwR4JlHSdKO1AkEArjvpWjdoiW8fkl1OwbUjdExcjTPAcclc8BZFUptfUqzgrIH2Us49w9e8U6Fp088AgTqFOPXdvYbLAyIcMCQ4ZA==")
+                .replaceAll("\\+","%2B"));
+    }
+}

+ 3 - 3
yudao-server/src/main/java/cn/iocoder/yudao/server/rest/SrmRest.java

@@ -38,8 +38,8 @@ public class SrmRest {
     private AdminAuthService authService;
     private AdminAuthService authService;
     @Autowired
     @Autowired
     private SrmNoticeMapper srmNoticeMapper;
     private SrmNoticeMapper srmNoticeMapper;
-    @Autowired
-    private RestTemplate restTemplate;
+//    @Autowired
+//    private RestTemplate restTemplate;
 
 
     /**
     /**
      * 获取SRM的待办及已办的数量
      * 获取SRM的待办及已办的数量
@@ -141,7 +141,7 @@ public class SrmRest {
         requestBody.put("propertyValues", 0);
         requestBody.put("propertyValues", 0);
         System.out.println("==============================" + JSON.toJSONString(requestBody));
         System.out.println("==============================" + JSON.toJSONString(requestBody));
         HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
         HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
-//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
         String todoStr = null;
         String todoStr = null;
         try {
         try {
             ResponseEntity<String> exchange = restTemplate.exchange(srmNoticeUrl, HttpMethod.GET, requestEntity, String.class);
             ResponseEntity<String> exchange = restTemplate.exchange(srmNoticeUrl, HttpMethod.GET, requestEntity, String.class);

+ 11 - 4
yudao-server/src/main/resources/application-dev.yaml

@@ -272,10 +272,17 @@ oa:
   spk: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1QTZ7wwptdwUFJ13dMHpfXUG6/YMV/Vo7BHrTracJSVQi93Ykw3Hx37oRYdu0RDbWVhxQurRijUwKp3JLtb33mOUFpNLH2YQR4O4KDEDtSnH5QKgN0t3Yn1WyEAi7ovqLNKMmSdDpIG2tBNaLF60C+WRJpYTlM3gqe4jlUIxaqQIDAQAB
   spk: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1QTZ7wwptdwUFJ13dMHpfXUG6/YMV/Vo7BHrTracJSVQi93Ykw3Hx37oRYdu0RDbWVhxQurRijUwKp3JLtb33mOUFpNLH2YQR4O4KDEDtSnH5QKgN0t3Yn1WyEAi7ovqLNKMmSdDpIG2tBNaLF60C+WRJpYTlM3gqe4jlUIxaqQIDAQAB
   secrit: cc942f10-bd18-4f6c-b2cd-9f804c0c4491
   secrit: cc942f10-bd18-4f6c-b2cd-9f804c0c4491
 srm:
 srm:
-  ssoToken: https://srmqas.deepoil.cc/jbl/api/sso/get-temporary-token/OA
-  todo: https://srmqas.deepoil.cc/jbl/api/workflow-request/backlog/page
-  done: https://srmqas.deepoil.cc/jbl/api/workflow-request/through-my/page
-  notice: https://srmqas.deepoil.cc/jbl/api/info-status
+  ssoToken: https://srm.deepoil.cc/jbl/api/sso/get-temporary-token/OA
+  todo: https://srm.deepoil.cc/jbl/api/workflow-request/backlog/page
+  done: https://srm.deepoil.cc/jbl/api/workflow-request/through-my/page
+  notice: https://srm.deepoil.cc/jbl/api/info-status
+ehr:
+  licence: 6b24a64c-828e-4abc-9493-d792eb17ba14
+  clientId: 32640f63-35e9-4cb4-9cf9-3254a32ba862
+  privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIFwW+2Zqr+UTebl0OAAQ9XVkJGol+NHNAYcEgqu7PISEPxquHhO/Vwkq7AkaYxiNC79PSGAknX9uG1I78nzx6krkoiTw50+fG6iBBNXrou1GC4A0Ak4Q/4njX4rYcy812M91q/ySop2LBILsyRVDYBdek1WQ4k01eiKWJKGt2I1AgMBAAECgYB6XD36uTZJjqep63xuFLILtazJlSeoSYorcGO5x6zkFSILi9NAn+MwNNY8V9+TPs530Rr1zbYmZifu33EWZyZJJk8STSicgGb03Bcm7eduJX7Xn0PanNoegXiE94SzdESFgZIgVkS0we3s5okRiRcXGYEo9XQ6HZiCaEinbz3YbQJBAPIcUUPD5DnJvTysFLiUzqwJlLGjhzwa1c+ld77Gj3vR4MPDRtG0GjoYW5VMO3SuwrXqqbnD97D2Ep7ygAVZpssCQQCI3VLNhrOH4UUGiQj5+T87X9t+Y+AIxwJJr/264iSo02MwDtDpynQ5RcdcdM09aEXgjQNlgKguSEFitek3mPr/AkAMEbNPYH2JD/B6DM3/oZNn6hZagJ9mNKRB9KqyfO18K6s7twlZvNOt37b5C1LPb0LPlMIfO5CmZq3o9IfDPIPfAkAqUHMXQ/whmI4ktR1nW54nFz3fV7WeQRj9+0FxFBXNdH2IECya+5LvWhmHBj2mLKTeBfr02NAmbwR4JlHSdKO1AkEArjvpWjdoiW8fkl1OwbUjdExcjTPAcclc8BZFUptfUqzgrIH2Us49w9e8U6Fp088AgTqFOPXdvYbLAyIcMCQ4ZA==
+  company_id: c7f474d57ec74a8cb10561b14c272e67
+  url: https://ehr.deepoil.cc
+  home: /proxy/hr/home
 pms:
 pms:
   secret: cc99d802-ce5c-5f62-b037-9a00726e7109
   secret: cc99d802-ce5c-5f62-b037-9a00726e7109
   ssoToken: https://iot.deepoil.cc/admin-api/system/auth/ssoLogin/getToken
   ssoToken: https://iot.deepoil.cc/admin-api/system/auth/ssoLogin/getToken