Merge branch 'master' of ssh://git@dev.33.cn/maamin1/sqLogisticsProject.git

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

@@ -102,7 +102,7 @@
 			select count(*)  from  users where random=#{random}
 	</select>
 	
-	<!--插入，删除，修改 ， 全 往数据库插入操作记录信息-->
+	<!--插入，修改 ， 全 往数据库插入操作记录信息-->
 	<insert id="insertOperationHistory">
 		insert into  
 		           operation_history_admin(operator_id,operation_type_id,be_operated_id,operation_time,hash)
@@ -114,7 +114,7 @@
 		            #{hash})
 	</insert>
 	
-	
+	<!-- 账号删除 往操作记录表插入信息-->
 	<insert id="insertOperationHistoryOfDelete" parameterType="User">
 		insert into  
 		           operation_history_admin(operator_id,operation_type_id,be_operated_id,operation_time,hash)

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/UserServiceImpl.java

@@ -117,7 +117,7 @@ public class UserServiceImpl  implements  UserService {
 		
 		boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链
 		if(!flag) {
-			 throw new RuntimeException("区块链操作失败") ;	
+			 throw new RuntimeException("区块链操作失败5");	
 		}
 		
 	}
@@ -139,7 +139,7 @@ public class UserServiceImpl  implements  UserService {
 		Map<String,Object> map = JSON.parseObject(sign, Map.class);
 		String hash = (String) map.get("sid");
 		user.setUserId(user.getUserId());//操作人（管理员）
-		user.setOperationTypeId(OperationType.DELETE);//操作类型 (编辑)
+		user.setOperationTypeId(OperationType.DELETE);//操作类型 (删除)
 		user.setUserIdbs(strs);
 		user.setOperationTime(currentTime);//操作时间
 		user.setHash(hash);//操作hash

saicLogistics/src/main/resources/spring-mvc.xml

@@ -35,11 +35,11 @@
 	<tx:annotation-driven transaction-manager="transactionManager"
 		proxy-target-class="true" />
 	<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
-   	<mvc:interceptors>
+<!--    	<mvc:interceptors>
 		<mvc:interceptor>
 			<mvc:mapping path="/**" />
 			<mvc:exclude-mapping path="/login"/>
 			<bean class="com.fuzamei.interceptor.TokenInterceptor" />
 		</mvc:interceptor>
-	</mvc:interceptors>   
+	</mvc:interceptors>    -->
 </beans>