yaoll před 4 roky
rodič
revize
16ab136019

+ 2 - 2
dmp-admin/src/main/java/com/persagy/dmp/admin/controller/DmpGatewayController.java

@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
  * @verison: 1.0
  */
 @RestController
-@RequestMapping("/dmp")
+@RequestMapping("/admin/dmp")
 public class DmpGatewayController {
 
 	@Autowired
@@ -46,7 +46,7 @@ public class DmpGatewayController {
 
 	private void dispatch(HttpServletRequest request, HttpServletResponse response, @RequestBody JsonNode param) {
 		StringBuilder url = new StringBuilder(dmpServer);
-		String uri = request.getRequestURI().replace("/dmp", "");
+		String uri = request.getRequestURI().replace("/admin/dmp", "");
 		url.append(uri);
 		String queryString = request.getQueryString();
 		if (!"/rwd/def/class".equalsIgnoreCase(uri) && !"/rwd/def/funcid".equalsIgnoreCase(uri)) {

+ 1 - 1
dmp-admin/src/main/java/com/persagy/dmp/admin/controller/DmpTransController.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * @verison: 1.0
  */
 @RestController
-@RequestMapping("/dmp/rwd/trans")
+@RequestMapping("/admin/dmp/rwd/trans")
 public class DmpTransController {
 
 	@Autowired

+ 1 - 1
dmp-admin/src/main/java/com/persagy/dmp/admin/controller/TransObjectInfoController.java

@@ -23,7 +23,7 @@ import java.net.URLEncoder;
  */
 @Slf4j
 @RestController
-@RequestMapping("/dmp/rwd/trans/object/info")
+@RequestMapping("/admin/dmp/rwd/trans/object/info")
 public class TransObjectInfoController {
 
 	@Autowired

+ 1 - 1
dmp-admin/src/main/java/com/persagy/dmp/admin/service/AdminService.java

@@ -58,7 +58,7 @@ public class AdminService {
 			return resp;
 		}
 
-		if (!MD5Utils.getSign(password).equalsIgnoreCase(user.getPassword())) {
+		if (!MD5Utils.getSign(user.getUsername() + password).equalsIgnoreCase(user.getPassword())) {
 			resp.setFail("username or password error!");
 			return resp;
 		}

+ 1 - 1
dmp-admin/src/main/java/com/persagy/dmp/admin/service/AdminUserService.java

@@ -80,7 +80,7 @@ public class AdminUserService {
 		AdminUser entity = new AdminUser();
 		entity.setUsername(username);
 		entity.setRealname(param.getRealname());
-		entity.setPassword(MD5Utils.getSign("123456"));
+		entity.setPassword(MD5Utils.getSign(username + "123456"));
 		entity.setCreateUser(UserUtils.currentUserId());
 		entity.setStatus(1);
 		adminUserRepository.save(entity);

+ 2 - 1
dmp-admin/src/main/java/com/persagy/dmp/admin/service/TransObjectInfoService.java

@@ -15,6 +15,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -37,7 +38,7 @@ public class TransObjectInfoService {
 		return criteriaUtils.query(QTransObjectInfo.transObjectInfo, null, criteria);
 	}
 
-
+	@Transactional
 	public MapResponse deleteByProjectId(String projectId) {
 		MapResponse resp = new MapResponse();
 		if (projectId != null) {