java110-utils/src/main/java/com/java110/utils/util/ValidatorUtil.java
@@ -9,6 +9,8 @@ * add by wuxw 2020/2/10 **/ import com.java110.utils.cache.MappingCache; import java.util.regex.Pattern; /** @@ -94,6 +96,10 @@ if (StringUtil.isEmpty(mobile)) { return false; } String telValidate = MappingCache.getValue("SYSTEM_SWITCH","TEL_VALIDATE"); if("OFF".equals(telValidate)){ return true; } return Pattern.matches(REGEX_MOBILE, mobile); } service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java
@@ -74,9 +74,14 @@ public PaymentOrderDto unified(ICmdDataFlowContext context, JSONObject reqJson) { String userId = context.getReqHeaders().get("user-id"); String ownerId = reqJson.getString("ownerId"); String roomId = reqJson.getString("roomId"); if (StringUtil.isEmpty(ownerId) && StringUtil.isEmpty(roomId)) { throw new IllegalArgumentException("参数错误未包含业主或者房屋编号"); } String payObjType = "3333"; if (reqJson.containsKey("payObjType")) { payObjType = reqJson.getString("payObjType"); service-user/src/main/java/com/java110/user/cmd/privilege/DeletePrivilegeGroupInfoCmd.java
@@ -17,6 +17,7 @@ import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.ListUtil; import org.springframework.beans.factory.annotation.Autowired; import java.text.ParseException; @@ -50,7 +51,7 @@ PrivilegeUserDto privilegeUserDto = new PrivilegeUserDto(); privilegeUserDto.setpId(reqJson.getString("pgId")); List<PrivilegeUserDto> privilegeUserDtos = privilegeUserV1InnerServiceSMOImpl.queryPrivilegeUsers(privilegeUserDto); if(privilegeUserDtos != null && privilegeUserDtos.size() > 0){ if (!ListUtil.isNull(privilegeUserDtos)) { throw new IllegalArgumentException("该角色下有关联员工,请先删除关联员工!"); } PrivilegeGroupPo privilegeGroupPo = BeanConvertUtil.covertBean(reqJson,PrivilegeGroupPo.class); springboot/src/main/resources/application-debug.yml
@@ -29,7 +29,7 @@ activiti: database-schema-update: false datasource: url: jdbc:mysql://192.168.100.108:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false url: jdbc:mysql://wuye.elephxi.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false username: TT password: hc12345678 type: com.alibaba.druid.pool.DruidDataSource