111

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

@@ -4,7 +4,11 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +31,8 @@ public class UserAction {
 	private UserService userService;
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
+	@Autowired
+	private HttpServletRequest request;
 
 	/**
 	 * 查询*得到所有的角色
@@ -39,8 +45,8 @@ public class UserAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			List<Role> roles = userService.getAllRoles();
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, roles);
@@ -63,8 +69,8 @@ public class UserAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
 			//Integer user_id = ValidationUtil.checkAndAssignInt(map.get("user_id"));
-			String tokenId= (String) map.get("tokenId");
-			Integer user_id = ValidationUtil.checkAndAssignInt(tokenId.split("&")[1]);
+			//String tokenId= (String) map.get("tokenId");
+			Integer user_id = ValidationUtil.checkAndAssignInt(request.getHeader("Authorization"));
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
 			Integer roleId = ValidationUtil.checkAndAssignNullIntegerIfIsBlank(map.get("roleId"));
 			String username = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
@@ -101,7 +107,7 @@ public class UserAction {
 	public Map<String, Object> updateAccountByUserId(@RequestBody User user) {
 		try {
 			
-			String userId = user.getTokenId().split("&")[1];
+			String userId = request.getHeader("Authorization");
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Roles.ADMIN);
 			
 		   //userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user.getUserId()));
@@ -139,7 +145,7 @@ public class UserAction {
 	public Map<String, Object> insertUsers(@RequestBody User user) {
 		try {
 			//ValidationUtil.checkAndAssignInt(user.getUserId());
-			String userId = user.getTokenId().split("&")[1];
+			String userId = request.getHeader("Authorization");
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Roles.ADMIN);
 			List<User> us = userService.findUserById(user);
 			if (us == null || us.size() < 1) {

saicLogistics/src/main/resources/applicationContext.xml

@@ -28,7 +28,7 @@
 		<property name="jdbcUrl" value="${jdbc.url}"></property>
 		<property name="username" value="${jdbc.username}"></property>
 		<property name="password" value="${jdbc.password}"></property>
-		<property name="readOnly" value="${jdbc.readOnly}" />
+		<property name="readOnly" value="false" />
 		<property name="connectionTimeout" value="${jdbc.connectionTimeout}" />
 		<property name="idleTimeout" value="${jdbc.idleTimeout}" />
 		<property name="maxLifetime" value="${jdbc.maxLifetime}" />

saicLogistics/src/main/resources/jdbc.properties

@@ -2,8 +2,6 @@ jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://118.178.58.178:3306/sq_logistics?useUnicode=true&characterEncoding=UTF-8
 jdbc.username=root
 jdbc.password=sql345678
-#连接只读数据库时配置为true， 保证安全,默认false
-jdbc.redOnly=false
 #等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 缺省:30秒
 jdbc.connectionTimeout=30000
 #一个连接idle状态的最大时长（毫秒），超时则被释放（retired），缺省:10分钟