diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index e329c081..a14bc2eb 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -135,6 +135,9 @@ public class ShiroConfig { //onlyoffice排除 filterChainDefinitionMap.put("/onlyoffice/**", "anon"); + //对接接口排除 + filterChainDefinitionMap.put("/sync/**", "anon"); + // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap<>(1); //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】 diff --git a/laws-modules/src/main/java/com/jero/modules/iam/BbcController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/BbcController.java similarity index 100% rename from laws-modules/src/main/java/com/jero/modules/iam/BbcController.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/BbcController.java diff --git a/laws-modules/src/main/java/com/jero/modules/iam/BbcControllerUnencrypted.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/BbcControllerUnencrypted.java similarity index 100% rename from laws-modules/src/main/java/com/jero/modules/iam/BbcControllerUnencrypted.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/BbcControllerUnencrypted.java diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java index 7a614478..f1494c9d 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java @@ -1,5 +1,6 @@ package com.jero.modules.docking.iam.dto; +import com.jero.modules.docking.iam.annotation.IamProperty; import lombok.Data; /** @@ -16,63 +17,73 @@ public class IamOrgAcceptDto extends IamCommonAcceptDto { /** * 机构编码.全集团唯一，不可重复，撤销后不可重新启用 */ - + @IamProperty(required = true, multivalued = false) private String srmsOrgCode; /** * 组织名称 */ + @IamProperty(required = true, multivalued = false) private String srmsDepartName; /** * 父级机构编码.当前组织所属的父节点code */ + @IamProperty(required = true, multivalued = false) private String srmsParentCode; /** * 所属单位,10位HR机构编号 */ + @IamProperty(required = true, multivalued = false) private String srmsCompany; /** * 机构状态 */ + @IamProperty(required = true, multivalued = false) private String srmsStatus; - - /** - * 组织类型。1.单位 2.部门。单位下可以有单位，但是部门下不能有单位 - */ - private String srmsOrgCategory; - /** * 机构类型。001内部机构 002 外部机构 003 虚拟机构 */ + @IamProperty(required = true, multivalued = false) private String srmsType; + /** + * 组织类型。1.单位 2.部门。单位下可以有单位，但是部门下不能有单位 + */ + @IamProperty(required = true, multivalued = false) + private String srmsOrgCategory; + /** * 创建时间 */ + @IamProperty(required = true, multivalued = false) private String srmsCreateTime; /** * 更新时间 */ + @IamProperty(required = true, multivalued = false) private String srmsUpdateTime; /** * 部门负责人 */ + @IamProperty(required = false, multivalued = false) private String srmsHeadOfDepartment; /** * 分管领导 */ + @IamProperty(required = false, multivalued = false) private String srmsLeadersInCharge; /** * 副职领导 */ + @IamProperty(required = false, multivalued = false) private String srmsDeputyLeader; } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java index 5876daf1..a425e636 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java @@ -1,5 +1,6 @@ package com.jero.modules.docking.iam.dto; +import com.jero.modules.docking.iam.annotation.IamProperty; import lombok.Data; /** @@ -16,140 +17,168 @@ public class IamUserAcceptDto extends IamCommonAcceptDto { /** * 单位编码 */ + @IamProperty(required = true, multivalued = false) private String srmsCompanyCode; /** * 部门编码 */ + @IamProperty(required = true, multivalued = false) private String srmsOrgCode; /** * 人员类型 */ + @IamProperty(required = true, multivalued = false) private String srmsTypeId; /** * 工号 */ + @IamProperty(required = true, multivalued = false) private String srmsUsername; /** * 姓名 */ + @IamProperty(required = true, multivalued = false) private String srmsRealname; /** * 密码 */ + @IamProperty(required = false, multivalued = false) private String srmsPassword; /** * 性别 */ + @IamProperty(required = true, multivalued = false) private String srmsSex; /** * 岗位 */ + @IamProperty(required = true, multivalued = false) private String srmsPost; /** * 职务级别 */ + @IamProperty(required = true, multivalued = false) private String srmsDutyLevelId; /** * 族 */ + @IamProperty(required = true, multivalued = false) private String srmsRace; /** * 岗位序列 */ + @IamProperty(required = true, multivalued = false) private String srmsPostSequence; /** * 专业技术职务（职称） */ + @IamProperty(required = true, multivalued = false) private String srmsTechnicalPosition; /** * 直接上级 */ + @IamProperty(required = true, multivalued = false) private String srmsDirectLeadership; /** * 岗位状态 */ + @IamProperty(required = true, multivalued = false) private String srmsPostStatus; /** * 是否在册 */ + @IamProperty(required = true, multivalued = false) private String srmsStatus; /** * 办公电话 */ + @IamProperty(required = true, multivalued = false) private String srmsOfficePhone; /** * 移动电话 */ + @IamProperty(required = true, multivalued = false) private String srmsPhone; /** * 电子邮件 */ + @IamProperty(required = true, multivalued = false) private String srmsEmail; /** * 身份证号码 */ + @IamProperty(required = true, multivalued = false) private String srmsIdNumber; /** * 学历 */ + @IamProperty(required = true, multivalued = false) private String srmsEducation; /** * 借调前所属部门 */ + @IamProperty(required = false, multivalued = false) private String srmsDepartmentBeforeTransfer; /** * 创建时间 */ + @IamProperty(required = true, multivalued = false) private String srmsCreateTime; /** * 更新时间 */ + @IamProperty(required = true, multivalued = false) private String srmsUpdateTime; /** * 劳务派遣单位编码 */ + @IamProperty(required = false, multivalued = false) private String srmsLaborDispatchCode; /** * 劳务派遣单位名称 */ + @IamProperty(required = false, multivalued = false) private String srmsLaborDispatchName; /** * 职业资格 */ + @IamProperty(required = false, multivalued = false) private String srmsProfessionalQualification; /** * 职业资格等级 */ + @IamProperty(required = false, multivalued = false) private String srmsProfessionalLevel; /** * 进入集团时间 */ + @IamProperty(required = true, multivalued = false) private String srmsEntryTime; } diff --git a/laws-modules/src/main/java/com/jero/modules/iam/BamboocloudUtils.java b/laws-modules/src/main/java/com/jero/modules/iam/BamboocloudUtils.java deleted file mode 100644 index c6e83d63..00000000 --- a/laws-modules/src/main/java/com/jero/modules/iam/BamboocloudUtils.java +++ /dev/null @@ -1,84 +0,0 @@ -//package com.jero.modules.iam; -// -//import com.bamboocloud.codec.BamboocloudFacade; -//import lombok.extern.slf4j.Slf4j; -// -//import javax.servlet.http.HttpServletRequest; -//import java.io.BufferedReader; -//import java.io.IOException; -//import java.util.Iterator; -//import java.util.Map; -//import java.util.TreeMap; -//@Slf4j -//public class BamboocloudUtils { -// public static void main(String[] args) { -// String aes = BamboocloudFacade.encrypt("{\"uid\":\"104\",\"bimRequestId\":\"95d73fe7aa7a4930a3edea779708a46c\",\"resultCode\":\"0\",\"message\":\"success\"}", "123456", "AES"); -// System.out.println(aes); -// String aes1 = getPlaintext("KJ3jbIflWkNiEq3oxE2d5oxtKRLO3CC7edGrq57RIB02RSRgPljiNcTfuWYLS3sc1tbZMLm5fWG2guLK100g9MkWH9NhlxorPSlcP8LaYuP5NeZ1wFP8iKqr5RredwXfDA3J1fjOCAJfzPvJ4HSb1w==", "123456", "AES"); -// System.out.println(aes1); -// } -// public static boolean checkUsernamePassword(String username, String password) { -// log.info("username --->" + username + " password --- >" + password + " ----ok"); -// if("bbcadmin".equals(username)&&"P@ssw0rd".equals(password)) { -// return true; -// } -// else { -// return false; -// } -// } -// -// public static String getPlaintext(String ciphertext, String key, String type) { -// return BamboocloudFacade.decrypt(ciphertext, key, type); -// } -// -// public static Boolean verify(Map reqmap, String type) { -// Map verifymap = new TreeMap(); -// StringBuffer sb = new StringBuffer(); -// Iterator it = reqmap.keySet().iterator(); -// while (it.hasNext()) { -// String key = (String) it.next(); -// verifymap.put(key, reqmap.get(key)); -// } -// Iterator ittree = verifymap.keySet().iterator(); -// while (ittree.hasNext()) { -// String key = (String) ittree.next(); -// if (!"signature".equals(key)) { -// sb.append(key).append("=").append(verifymap.get(key)).append("&"); -// } -// } -// sb.deleteCharAt(sb.length() - 1); -// System.out.println(reqmap.get("signature") + " now " + sb.toString()); -// return BamboocloudFacade.verify(reqmap.get("signature").toString(), sb.toString(), type); -// } -// -// public static String getRequestBody(HttpServletRequest request) { -// BufferedReader br = null; -// StringBuilder sb = new StringBuilder(); -// String str = ""; -// try { -// br = request.getReader(); -// while ((str = br.readLine()) != null) { -// sb.append(str); -// } -// br.close(); -// } catch (IOException e) { -// e.printStackTrace(); -// if (br != null) { -// try { -// br.close(); -// } catch (IOException eo) { -// eo.printStackTrace(); -// } -// } -// } finally { -// if (br != null) { -// try { -// br.close(); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// } -// return sb.toString(); -// } -//} diff --git a/laws-modules/src/main/java/com/jero/modules/iam/SHA256Util.java b/laws-modules/src/main/java/com/jero/modules/iam/SHA256Util.java deleted file mode 100644 index abbb1923..00000000 --- a/laws-modules/src/main/java/com/jero/modules/iam/SHA256Util.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jero.modules.iam; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -public class SHA256Util { - public static void main(String[] args) { - String sha256StrJava = getSHA256StrJava("123456"); - System.out.println(sha256StrJava); - } - /** - * 利用java原生的摘要实现SHA256加密密后的报文 - */ - public static String getSHA256StrJava(String str) { - MessageDigest messageDigest; - String encodeStr = ""; - try { - messageDigest = MessageDigest.getInstance("SHA-256"); - messageDigest.update(str.getBytes(StandardCharsets.UTF_8)); - encodeStr = byte2Hex(messageDigest.digest()); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - return encodeStr; - } - - /** - * 将byte转为16进制 - */ - private static String byte2Hex(byte[] bytes) { - StringBuilder stringBuffer = new StringBuilder(); - String temp; - for (byte aByte : bytes) { - temp = Integer.toHexString(aByte & 0xFF); - if (temp.length() == 1) { - //1得到一位的进行补0操作 - stringBuffer.append("0"); - } - stringBuffer.append(temp); - } - return stringBuffer.toString(); - } -}