new

saicLogistics/src/main/java/com/fuzamei/constant/RegexConstant.java

@@ -13,4 +13,7 @@ public class RegexConstant {
 	public static final String BOX_NO="^[a-zA-Z0-9]{8}$";
 	
 	public static final String NUMBER_NO="\\d+(,\\d+)*";//校验传的id是数字，以逗号隔开
+	
+	public static final String RANDOM_REGEX="^[a-zA-Z0-9]{10}$";//校验传的随机数
+	
 }

saicLogistics/src/main/java/com/fuzamei/entity/UserDetail.java

@@ -23,7 +23,7 @@ public class UserDetail {
 	private Long createTime;			//用户创建时间
 	private Long updateTime;			//更新时间
 	private List<Module> modules;		//模块信息
-	private List<UserDetail> users;			//对应的人员信息
+	private List<UserDetail> users;		//对应的人员信息
 	public Integer getId() {
 		return id;
 	}

saicLogistics/src/main/java/com/fuzamei/mapper/UserMapper.xml

@@ -94,7 +94,7 @@
 	</select>
 	
 	<!-- 查询数据库得随机数是不是又是一样得 -->
-	<select id="queryRondomRepetition" parameterType="com.fuzamei.entity.User" resultType="int" >
+	<select id="queryRondomRepetition" parameterType="java.lang.String" resultType="int" >
 			select count(*)  from  users where random=#{random}
 	</select>
 	

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -59,7 +59,6 @@ public class UserAction {
 	
 	@PostMapping(value = "queryUserIdMax")
 	public  Map<String, Object> queryUserIdMax(){
-		
 		try {
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
@@ -165,21 +164,18 @@ public class UserAction {
 	@PostMapping(value = "/insertUsers")
 	public Map<String, Object> insertUsers(@RequestBody User user) {
 		try {
-			//ValidationUtil.checkAndAssignInt(user.getUserId());
-			
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			user.setUserId(user_id);
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user_id), Roles.ADMIN);
-		    ValidationUtil.checkAndAssignInt(user.getRoleId());//校验角色
-		   // ValidationUtil.checkBlankAndAssignString(user.getSign());////校验签名 非空校验 --待-------XXX
-			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getUsername());//校验账号
-			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPassword());//校验密码
-			ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPersonName());//校验名称
-			 String random=user.getRandom(); //得到前端传来得随机数
+		    ValidationUtil.checkRangeAndAssignInt(user.getRoleId(),1,4);//校验角色
+			ValidationUtil.checkBlankAndAssignString(user.getUsername());//校验账号
+			ValidationUtil.checkBlankAndAssignString(user.getPassword());//校验密码
+			ValidationUtil.checkBlankAndAssignString(user.getPersonName());//校验名称
+			String random = ValidationUtil.checkBlankAndAssignString(user.getRandom(),RegexConstant.RANDOM_REGEX);//随机数校验
 		    int uu=userService.queryRondomRepetition(random);//校验拿到的随机数和数据库得随机数校验
 			List<User> us = userService.findUserById(user);
 		    if(uu!=0) throw new RuntimeException("随机数重复");
-		    if (us.size()!=0) throw new RuntimeException("id和账号异常");
+		    if (us.size()!=0) throw new RuntimeException("账号已存在");
 			userService.insertUsers(user);
 			return JSONUtil.getJsonMap(200, true, "添加成功", null);
 		} catch (Exception e) {

saicLogistics/src/main/resources/conf.properties

@@ -1,5 +1,6 @@
+url_prefix=http
 #测试版区块链地址
-block_ip=114.55.178.27
+block_ip=114.55.104.241
 block_port=46657
 #最大的公私钥对，前面私钥，后面是公钥
 privateKey=90b289fda1fb0439158f837bbe60cc1ec99616dd0bc6335d6fd0bf3d22888e20