diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml
index 31f1e774..b23dde3c 100644
--- a/smart-admin-service/pom.xml
+++ b/smart-admin-service/pom.xml
@@ -38,7 +38,6 @@
2.7.0
[7.2.0, 7.2.99]
1.3.1
- 1.2.9
0.9.0
0.0.1-RC11
6.0.2.Final
@@ -485,11 +484,6 @@
-
- pl.project13.maven
- git-commit-id-plugin
- 2.2.4
-
org.apache.maven.plugins
maven-compiler-plugin
diff --git a/smart-admin-service/smart-admin-api/pom.xml b/smart-admin-service/smart-admin-api/pom.xml
index c2ce242e..0b35c3f8 100644
--- a/smart-admin-service/smart-admin-api/pom.xml
+++ b/smart-admin-service/smart-admin-api/pom.xml
@@ -356,32 +356,6 @@
true
-
- pl.project13.maven
- git-commit-id-plugin
- 2.2.4
-
-
- get-the-git-infos
-
- revision
-
-
-
-
- ${project.basedir}/.git
- git
- false
- true
- ${project.build.outputDirectory}/git.properties
- json
-
- false
- false
- -dirty
-
-
-
\ No newline at end of file
diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java
index f1126a3f..eb462dc7 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java
@@ -46,7 +46,7 @@ public class PrivilegeController {
@ApiOperation(value = "查询所有菜单项")
@PostMapping("/privilege/menu/queryAll")
- public ResponseDTO> queryAll() {
+ public ResponseDTO> queryAll() {
return privilegeService.menuQueryAll();
}
diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuListVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java
similarity index 81%
rename from smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuListVO.java
rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java
index 62aec553..a573f39a 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuListVO.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java
@@ -3,6 +3,7 @@ package com.gangquan360.smartadmin.module.privilege.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -16,7 +17,7 @@ import java.util.List;
* @since JDK1.8
*/
@Data
-public class PrivilegeMenuListVO {
+public class PrivilegeMenuVO {
@ApiModelProperty("菜单名")
private String menuName;
@@ -30,8 +31,8 @@ public class PrivilegeMenuListVO {
@ApiModelProperty("顺序")
private Integer sort;
- @ApiModelProperty("子菜单列表")
- private List menuList;
+ @ApiModelProperty("前端路由path")
+ private String url;
}
diff --git a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java
index 94b0ac9e..dafa33ab 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java
@@ -6,7 +6,6 @@ import com.gangquan360.smartadmin.module.privilege.dao.PrivilegeDao;
import com.gangquan360.smartadmin.module.privilege.domain.dto.*;
import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity;
import com.gangquan360.smartadmin.module.role.roleprivilege.RolePrivilegeDao;
-import com.gangquan360.smartadmin.util.SmartBeanUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -140,18 +139,19 @@ public class PrivilegeService {
*
* @return
*/
- public ResponseDTO> menuQueryAll() {
+ public ResponseDTO> menuQueryAll() {
List privilegeEntityList = privilegeDao.selectByType(PrivilegeTypeEnum.MENU.getValue());
if (CollectionUtils.isEmpty(privilegeEntityList)) {
return ResponseDTO.succData(Lists.newArrayList());
}
- List voList = privilegeEntityList.stream().map( e-> {
- PrivilegeMenuListVO vo = new PrivilegeMenuListVO();
+ List voList = privilegeEntityList.stream().map(e-> {
+ PrivilegeMenuVO vo = new PrivilegeMenuVO();
vo.setMenuKey(e.getKey());
vo.setMenuName(e.getName());
vo.setParentKey(e.getParentKey());
vo.setSort(e.getSort());
+ vo.setUrl(e.getUrl());
return vo;
}).collect(Collectors.toList());
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
index 6ce52c83..29eef45a 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
@@ -21,7 +21,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false
spring.servlet.multipart.max-file-size=30MB
spring.servlet.multipart.max-request-size=30MB
file-upload-service.path=/home/upload/
-file-upload-service.geturl=http://127.0.0.1/smartAdmin/file/
######################### database #########################
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/smart-admin-dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties
index ad34ca04..837ec16e 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties
@@ -21,7 +21,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false
spring.servlet.multipart.max-file-size=30MB
spring.servlet.multipart.max-request-size=30MB
file-upload-service.path=/home/upload/
-file-upload-service.geturl=http://172.16.0.145/smartAdmin/file/
######################### database #########################
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/smart-admin-dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
index e42e3f94..a1a740fe 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
@@ -22,7 +22,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false
spring.servlet.multipart.max-file-size=30MB
spring.servlet.multipart.max-request-size=30MB
file-upload-service.path=/home/upload/smart-admin-file
-file-upload-service.geturl=http://smartadmin.gangquan360.com/demoAdmin/file/
######################### database #########################
spring.datasource.url=jdbc:mysql://172.16.0.201:3306/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties
index ad34ca04..837ec16e 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties
@@ -21,7 +21,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false
spring.servlet.multipart.max-file-size=30MB
spring.servlet.multipart.max-request-size=30MB
file-upload-service.path=/home/upload/
-file-upload-service.geturl=http://172.16.0.145/smartAdmin/file/
######################### database #########################
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/smart-admin-dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
diff --git a/smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue b/smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue
index c6b33e4e..0bffac0a 100644
--- a/smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue
+++ b/smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue
@@ -241,7 +241,8 @@ export default {
isChange =
serverMenu.menuName !== menu.menuName ||
serverMenu.menuKey !== menu.menuKey ||
- serverMenu.parentKey !== menu.parentKey;
+ serverMenu.parentKey !== menu.parentKey||
+ serverMenu.url !== menu.url;
} else {
isChange = true;
}