update

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -44,14 +44,6 @@ public class SysUser extends BaseEntity implements Serializable{
 	@ApiModelProperty(value = "头像",required = false)
 	private String avatar;
 
-	/** 部门ID */
-	@ApiModelProperty(value = "部门ID",required = false)
-	private Integer organId;
-
-	/** 部门ID */
-	@ApiModelProperty(value = "部门名称",required = false)
-	private String organName;
-
 	/** 创建时间 */
 	private java.util.Date createTime;
 
@@ -76,10 +68,6 @@ public class SysUser extends BaseEntity implements Serializable{
 
 	/** 用户类型 */
 //	@ApiModelProperty(value = "用户类型",required = false)
-//	private String userType;
-
-	/** 用户类型 */
-//	@ApiModelProperty(value = "用户类型",required = false)
 	//STUDENT("学生"), EDU_TEACHER("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员")
 	private String userType;
 
@@ -104,27 +92,12 @@ public class SysUser extends BaseEntity implements Serializable{
 	@ApiModelProperty(value = "真实姓名",required = false)
 	private String realName;
 
-	@ApiModelProperty(value = "年级",required = false)
-	private String currentGrade;
-
-	@ApiModelProperty(value = "年级（数字表示）",required = false)
-	private Integer currentGradeNum;
-
-	@ApiModelProperty(value = "班级",required = false)
-	private String currentClass;
-
 	@ApiModelProperty(value = "微信号",required = false)
 	private String wechatId;
 
 	@ApiModelProperty(value = "是否是超管",required = false)
 	private Boolean isSuperAdmin = false;
 
-	private Integer serviceTag;
-
-	private Integer operatingTag;
-
-	private Integer teacherId;
-
 	@ApiModelProperty(value = "用户角色",required = false)
 	private List<Integer> roles;
 
@@ -136,39 +109,6 @@ public class SysUser extends BaseEntity implements Serializable{
 
 	private String certificateType;
 
-	@ApiModelProperty(value = "社保部门id",required = false)
-	private Integer deptId;
-
-	@ApiModelProperty(value = "部门ids",required = false)
-	private String deptIds;
-
-	@ApiModelProperty(value = "岗位id",required = false)
-	private String postIds;
-
-	@ApiModelProperty(value = "岗位管理部门",required = false)
-	private String postDeptIds;
-
-	@ApiModelProperty(value = "银行卡号",required = false)
-	private String bankCard;
-
-	@ApiModelProperty(value = "开户行",required = false)
-	private String openBankAddress;
-	
-	private String positionName;
-
-	@ApiModelProperty(value = "用户职位",required = false)
-	private String positions;
-	
-	private String organIdList;
-
-	public String getPositions() {
-		return positions;
-	}
-
-	public void setPositions(String positions) {
-		this.positions = positions;
-	}
-
 	public String getCertificateType() {
 		return certificateType;
 	}
@@ -177,46 +117,6 @@ public class SysUser extends BaseEntity implements Serializable{
 		this.certificateType = certificateType;
 	}
 
-	public Integer getServiceTag() {
-		return serviceTag;
-	}
-
-	public void setServiceTag(Integer serviceTag) {
-		this.serviceTag = serviceTag;
-	}
-
-	public Integer getOperatingTag() {
-		return operatingTag;
-	}
-
-	public void setOperatingTag(Integer operatingTag) {
-		this.operatingTag = operatingTag;
-	}
-
-	public String getCurrentGrade() {
-		return currentGrade;
-	}
-
-	public void setCurrentGrade(String currentGrade) {
-		this.currentGrade = currentGrade;
-	}
-
-	public String getCurrentClass() {
-		return currentClass;
-	}
-
-	public void setCurrentClass(String currentClass) {
-		this.currentClass = currentClass;
-	}
-
-	public String getOrganName() {
-		return organName;
-	}
-
-	public void setOrganName(String organName) {
-		this.organName = organName;
-	}
-
 	public String getRealName() {
 		return realName;
 	}
@@ -281,14 +181,6 @@ public class SysUser extends BaseEntity implements Serializable{
 		return this.avatar;
 	}
 
-	public Integer getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
-	}
-
 	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
@@ -412,14 +304,6 @@ public class SysUser extends BaseEntity implements Serializable{
 		this.isSuperAdmin = isSuperAdmin;
 	}
 
-	public Integer getTeacherId() {
-		return teacherId;
-	}
-
-	public void setTeacherId(Integer teacherId) {
-		this.teacherId = teacherId;
-	}
-
 	public List<Integer> getRoles() {
 		return roles;
 	}
@@ -447,76 +331,4 @@ public class SysUser extends BaseEntity implements Serializable{
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
-	public Integer getCurrentGradeNum() {
-		return currentGradeNum;
-	}
-
-	public void setCurrentGradeNum(Integer currentGradeNum) {
-		this.currentGradeNum = currentGradeNum;
-	}
-
-	public String getDeptIds() {
-		return deptIds;
-	}
-
-	public void setDeptIds(String deptId) {
-		this.deptIds = deptId;
-	}
-
-	public String getPostIds() {
-		return postIds;
-	}
-
-	public void setPostIds(String postIds) {
-		this.postIds = postIds;
-	}
-
-	public String getBankCard() {
-		return bankCard;
-	}
-
-	public void setBankCard(String bankCard) {
-		this.bankCard = bankCard;
-	}
-
-	public String getOpenBankAddress() {
-		return openBankAddress;
-	}
-
-	public void setOpenBankAddress(String openBankAddress) {
-		this.openBankAddress = openBankAddress;
-	}
-
-	public String getPostDeptIds() {
-		return postDeptIds;
-	}
-
-	public void setPostDeptIds(String postDeptIds) {
-		this.postDeptIds = postDeptIds;
-	}
-
-	public Integer getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(Integer deptId) {
-		this.deptId = deptId;
-	}
-
-	public String getPositionName() {
-		return positionName;
-	}
-
-	public void setPositionName(String positionName) {
-		this.positionName = positionName;
-	}
-
-	public String getOrganIdList() {
-		return organIdList;
-	}
-
-	public void setOrganIdList(String organIdList) {
-		this.organIdList = organIdList;
-	}
 }

cooleshow-auth/auth-server/pom.xml

@@ -62,11 +62,22 @@
 		<dependency>
 			<groupId>com.yonge.toolset</groupId>
 			<artifactId>audit-log</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>freemarker</artifactId>
+					<groupId>org.freemarker</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-pool2</artifactId>
 		</dependency>
+		
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
 	</dependencies>
 </project>

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/PhoneAuthenticationProvider.java

@@ -95,7 +95,6 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 
 					// 添加userType以及附加信息
 					if (StringUtils.equals("STUDENT", clientId)) {
-						user.setOrganId(sysUserService.getLesseeOrganId());
 						sysUserService.saveStudent(user.getId());
 					} else if (StringUtils.equals("TEACHER", clientId)) {
 						sysUserService.saveTeacher(user.getId());

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/service/DefaultUserDetailsService.java

@@ -65,7 +65,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 		if (authorities == null) {
 			authorities = new ArrayList<>();
 		}
-		
+
 		authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(userType)));
 
 		for (String role : roles) {
@@ -74,8 +74,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		SysUser sysUser = userInfo.getSysUser();
 
-		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), sysUser.getLockFlag() == 0, true, true, true,
-				authorities);
+		return new AuthUser(sysUser.getId(), username, BCRYPT + sysUser.getPassword(), sysUser.getLockFlag() == 0, true, true, true, authorities);
 	}
 
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -72,7 +72,7 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param userId
 	 * @param lesseeOrganId
 	 */
-	void insertTeacher(@Param("userId") Integer userId, @Param("lesseeOrganId") Integer lesseeOrganId);
+	void insertTeacher(@Param("userId") Integer userId);
 
 	/**
 	 * 获取教师分部编号

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -123,5 +123,4 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 */
 	void saveTeacher(Integer userId);
 	
-	Integer getLesseeOrganId();
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,9 +37,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Autowired
 	private IdGeneratorService smsCodeService;
 
-	@Value("${auth.sysconfig.tenantId}")
-	private Integer lesseeOrganId;
-
 	@Override
 	public BaseDAO<Integer, SysUser> getDAO() {
 		return sysUserDao;
@@ -155,21 +151,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			//sysTenantAccount
 			sysUserDao.insertSysTenantAccount(sysUser.getId());
 			//创建teacher表
-			sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
+			sysUserDao.insertTeacher(sysUser.getId());
 			return queryUserInfoByPhone(phone);
 		}else if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
 			SysUser sysUser = new SysUser();
 			sysUser.setPhone(phone);
 			sysUser.setUserType("STUDENT");
-			if(StringUtils.isBlank(organId)){
-				sysUser.setOrganId(lesseeOrganId);
-			}else{
-				sysUser.setOrganId(Integer.parseInt(organId));
-			}
-			//注册是否赠送会员
-			if(sysUser.getOrganId() == 59){
-				
-			}
 			
 			sysUserDao.insert(sysUser);
 			sysUserService.saveStudent(sysUser.getId());
@@ -193,12 +180,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	public void saveTeacher(Integer userId) {
-		sysUserDao.insertTeacher(userId, lesseeOrganId);
-	}
-
-	@Override
-	public Integer getLesseeOrganId() {
-		return lesseeOrganId;
+		sysUserDao.insertTeacher(userId);
 	}
 
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -20,8 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
-import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.service.SysRoleService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
@@ -29,8 +27,6 @@ import com.yonge.cooleshow.auth.service.SysUserService;
 import com.yonge.cooleshow.auth.web.controller.queryInfo.SysUserQueryInfo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.entity.ImResult;
-import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.security.AuthUser;
@@ -56,8 +52,6 @@ public class UserController extends BaseController {
 	private IdGeneratorService smsCodeService;
 	@Value("${message.debugMode}")
 	private boolean debugMode;
-	@Autowired
-	private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
 
 	@ApiOperation(value = "分页查询用户信息")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),
@@ -247,10 +241,6 @@ public class UserController extends BaseController {
 				throw new BizException("出生日期不可超过当前时间");
 			}
 
-			if(!debugMode&&StringUtils.isNotBlank(sysUser.getCertificateType())&&"IDENTITY".equals(sysUser.getCertificateType())){
-				realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(sysUser.getRealName(), sysUser.getIdCardNo());
-			}
-
 			sysUserService.updateBaseInfo(sysUser);
 			return succeed();
 		}

cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=a5c10b43-0c4d-4e3b-a0ad-9af651cfe89c
+spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/controller/BaseController.java

@@ -25,9 +25,9 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 @ControllerAdvice

cooleshow-common/src/main/java/com/yonge/cooleshow/common/security/AuthUser.java

@@ -17,16 +17,10 @@ public class AuthUser extends User {
 	 */
 	private Integer userId;
 
-	/**
-	 * 所在组织的编号
-	 */
-	private Integer organId;
-
-	public AuthUser(Integer userId, Integer organId, String username, String password, boolean enabled, boolean accountNonExpired,
+	public AuthUser(Integer userId, String username, String password, boolean enabled, boolean accountNonExpired,
 			boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
-		this.organId = organId;
 	}
 
 	public Integer getUserId() {
@@ -37,12 +31,4 @@ public class AuthUser extends User {
 		this.userId = userId;
 	}
 
-	public Integer getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
-	}
-
 }

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/entity/SysEmail.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/entity/SysEmail.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.entity;
+package com.yonge.toolset.thirdparty.entity;
 
 import java.io.Serializable;
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/eseal/ESealPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/eseal/ESealPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.eseal;
+package com.yonge.toolset.thirdparty.eseal;
 
 public interface ESealPlugin {
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/eseal/ESealPluginContext.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/eseal/ESealPluginContext.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.eseal;
+package com.yonge.toolset.thirdparty.eseal;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.thirdparty.eseal.provider.TsignPlugin;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.eseal.provider.TsignPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 
 @Component
 public class ESealPluginContext implements ApplicationContextAware, InitializingBean {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/eseal/provider/BytedancePlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/eseal/provider/BytedancePlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.eseal.provider;
+package com.yonge.toolset.thirdparty.eseal.provider;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 import com.yonge.toolset.utils.http.HttpUtil;
 import com.yonge.toolset.utils.sort.SortUtil;
 import com.yonge.toolset.utils.string.ValueUtil;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/eseal/provider/TsignPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.eseal.provider;
+package com.yonge.toolset.thirdparty.eseal.provider;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -31,8 +31,8 @@ import com.timevale.esign.sdk.tech.service.UserSignService;
 import com.timevale.esign.sdk.tech.v3.client.ServiceClient;
 import com.timevale.esign.sdk.tech.v3.client.ServiceClientManager;
 import com.timevale.tech.sdk.bean.ProjectConfig;
-import com.ym.mec.thirdparty.eseal.ESealPlugin;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.eseal.ESealPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 
 /**
  * 接口文档地址  https://open.esign.cn/doc/detail?id=opendoc%2Fpaas_sdk%2Fbzu9e8&namespace=opendoc%2Fpaas_sdk&searchText=

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/exception/ThirdpartyException.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/exception/ThirdpartyException.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.exception;
+package com.yonge.toolset.thirdparty.exception;
 
 import com.yonge.toolset.utils.string.MessageFormatter;
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/lingxinpay/ContractSignService.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/lingxinpay/ContractSignService.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.lingxinpay;
+package com.yonge.toolset.thirdparty.lingxinpay;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 @Service

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/lingxinpay/RSA.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/lingxinpay/RSA.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.lingxinpay;
+package com.yonge.toolset.thirdparty.lingxinpay;
 
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/MessageSenderPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message;
+package com.yonge.toolset.thirdparty.message;
 
 import java.io.IOException;
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/MessageSenderPluginContext.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message;
+package com.yonge.toolset.thirdparty.message;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -7,16 +7,15 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.ym.mec.thirdparty.entity.SysEmail;
-import com.ym.mec.thirdparty.message.provider.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.entity.SysEmail;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.message.provider.*;
 
 @Component
 public class MessageSenderPluginContext implements ApplicationContextAware {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/provider/AwSmsPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/AwSmsPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.provider;
+package com.yonge.toolset.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -9,8 +9,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.message.MessageSenderPlugin;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 /**

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/provider/CommEmailPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/CommEmailPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.provider;
+package com.yonge.toolset.thirdparty.message.provider;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.mail.DefaultAuthenticator;
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
-import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+import com.yonge.toolset.thirdparty.message.MessageSenderPlugin;
 
 @Service
 public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/JiguangPushPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.provider;
+package com.yonge.toolset.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -13,8 +13,8 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.message.MessageSenderPlugin;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 /**

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/provider/MOxintongSMSPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/MOxintongSMSPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.provider;
+package com.yonge.toolset.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -10,8 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.message.MessageSenderPlugin;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 /**

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/provider/ShiyuanSMSPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/ShiyuanSMSPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.provider;
+package com.yonge.toolset.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -10,8 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.message.MessageSenderPlugin;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 /**

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/message/provider/YimeiSmsPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/YimeiSmsPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.provider;
+package com.yonge.toolset.thirdparty.message.provider;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.message.MessageSenderPlugin;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.http.HttpUtil;
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/storage/StoragePlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/StoragePlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.storage;
+package com.yonge.toolset.thirdparty.storage;
 
 import java.io.File;
 import java.io.IOException;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/storage/StoragePluginContext.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/StoragePluginContext.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.storage;
+package com.yonge.toolset.thirdparty.storage;
 
 import java.io.File;
 import java.util.HashMap;
@@ -6,7 +6,7 @@ import java.util.Map;
 
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 
 @Component
 public class StoragePluginContext {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.storage.provider;
+package com.yonge.toolset.thirdparty.storage.provider;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,9 +13,9 @@ import org.springframework.stereotype.Component;
 import com.aliyun.oss.ClientConfiguration;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.OSSObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.storage.StoragePlugin;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.storage.StoragePlugin;
+import com.yonge.toolset.thirdparty.storage.StoragePluginContext;
 
 @Component
 public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean, DisposableBean {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/storage/provider/KS3StoragePlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/KS3StoragePlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.storage.provider;
+package com.yonge.toolset.thirdparty.storage.provider;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,9 +20,9 @@ import com.ksyun.ks3.service.Ks3ClientConfig;
 import com.ksyun.ks3.service.Ks3ClientConfig.PROTOCOL;
 import com.ksyun.ks3.service.request.GetObjectRequest;
 import com.ksyun.ks3.service.request.PutObjectRequest;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.storage.StoragePlugin;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.storage.StoragePlugin;
+import com.yonge.toolset.thirdparty.storage.StoragePluginContext;
 
 @Component
 public class KS3StoragePlugin implements StoragePlugin, InitializingBean, DisposableBean {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/union/GenerateNum.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/union/GenerateNum.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.union;
+package com.yonge.toolset.thirdparty.union;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/union/H5.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/union/H5.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.union;
+package com.yonge.toolset.thirdparty.union;
 
 import com.alibaba.fastjson.JSONObject;
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/union/Mp.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/union/Mp.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.union;
+package com.yonge.toolset.thirdparty.union;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.codec.binary.Base64;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/union/NotifyMsg.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/union/NotifyMsg.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.union;
+package com.yonge.toolset.thirdparty.union;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/union/UnionPay.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/union/UnionPay.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.union;
+package com.yonge.toolset.thirdparty.union;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.codec.binary.Base64;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/union/UnionPayFeignService.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/union/UnionPayFeignService.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.union;
+package com.yonge.toolset.thirdparty.union;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/user/realname/RealnameAuthenticationPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/user/realname/RealnameAuthenticationPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.user.realname;
+package com.yonge.toolset.thirdparty.user.realname;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/user/realname/RealnameAuthenticationPluginContext.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/user/realname/RealnameAuthenticationPluginContext.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.user.realname;
+package com.yonge.toolset.thirdparty.user.realname;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,8 +10,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 
 @Component
 public class RealnameAuthenticationPluginContext implements ApplicationContextAware, InitializingBean {

toolset/thirdparty-component/src/main/java/com/ym/mec/thirdparty/user/realname/provider/LinkfaceRealnameAuthenticationPlugin.java → toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/user/realname/provider/LinkfaceRealnameAuthenticationPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.user.realname.provider;
+package com.yonge.toolset.thirdparty.user.realname.provider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPlugin;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.http.HttpUtil;
 
 @Service