更换了api 工具

权限时返回全部给前端，用authority判断是否有使用权限

README.md

@@ -20,3 +20,26 @@
 http://localhost:8085/xiaoan-web/#/login
 
 
+##uat 环境
+服务器	客户环境
+	218.17.126.170
+	root
+	1234
+	端口：9999
+	/root/user/java/tomcat-8011-xiaoan/webapps
+	url:
+	访问：
+    1.使用向日葵连接
+    569648266
+    7902
+    访问url：
+    前端：192.168.1.8:8011/dist
+    后端：192.1.68.1.8:8011/doc.html
+	
+mysql	
+	218.17.126.170
+	root
+	12345678
+	端口：9998
+
+

xiaoan-application/src/main/resources/application-dev.properties

@@ -55,4 +55,5 @@ spring.redis.jedis.pool.max-active=8
 # 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
-scene.path=F:\\test\\xiaoan\\
+#log
+logging.path=E:/javaProject/log/xiaoan

xiaoan-application/src/main/resources/application-uat.properties

@@ -0,0 +1,52 @@
+
+#DB
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.druid.url=jdbc:mysql://218.17.126.170:9998/xiaoan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=root
+spring.datasource.druid.password=12345678
+
+
+
+
+# 初始连接数
+spring.datasource.druid.initial-size=5
+# 最小连接池数量
+spring.datasource.druid.min-idle=10
+# 最大连接池数量
+spring.datasource.druid.max-active=20
+# 配置获取连接等待超时的时间
+spring.datasource.druid.max-wait=60000
+# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+# 配置一个连接在池中最小生存的时间，单位是毫秒
+spring.datasource.druid.min-evictable-idle-time-millis=30000
+# 配置一个连接在池中最大生存的时间，单位是毫秒
+spring.datasource.druid.max-evictable-idle-time-millis=90000
+# 配置检测连接是否有效
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=false
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.stat-view-servlet.enabled=true
+
+#logging.file=log/xiaoan.log
+
+# Redis数据库索引（默认为0）
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# 连接超时时间 单位 ms（毫秒）
+spring.redis.timeout=3000ms
+# 连接池中的最大空闲连接，默认值也是8。
+spring.redis.jedis.pool.max-idle=8
+#连接池中的最小空闲连接，默认值也是0。
+spring.redis.jedis.pool.min-idle=0
+# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+spring.redis.jedis.pool.max-active=8
+# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+
+logging.path=/root/user/java/log/xiaoan

xiaoan-application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8011
 
-spring.profiles.active=dev
+spring.profiles.active=uat
 
 #mybatis
 #mybatis.mapper-locations=classpath:mapper/*.xml
@@ -15,7 +15,6 @@ pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 
 #log
-logging.path=E:/javaProject/log/xiaoan
 logging.config=classpath:logback-spring.xml
 logging.level.com.xiaoan=debug
 

xiaoan-service/src/main/java/com/xiaoan/service/backend/ResourceService.java

@@ -3,7 +3,6 @@ package com.xiaoan.service.backend;
 import com.xiaoan.domain.backend.ResourceEntity;
 import com.xiaoan.domain.backend.UserEntity;
 import com.xiaoan.service.IBaseService;
-import com.xiaoan.service.backend.dto.ResourcePermissions;
 import com.xiaoan.service.backend.dto.ResourceTree;
 
 import java.util.List;

xiaoan-service/src/main/java/com/xiaoan/service/backend/dto/ResourcePermissions.java

@@ -1,23 +0,0 @@
-package com.xiaoan.service.backend.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ResourcePermissions {
-
-    private Long id;
-
-    /** 名称*/
-    private String name;
-
-    /** 权限*/
-    private boolean authority;
-
-    /** 子权限*/
-    private List<ResourcePermissions> items;
-
-    private Long parentId;
-
-}

xiaoan-service/src/main/java/com/xiaoan/service/backend/impl/ResourceServiceImpl.java

@@ -8,12 +8,9 @@ import com.xiaoan.domain.backend.ResourceEntity;
 import com.xiaoan.domain.backend.UserEntity;
 import com.xiaoan.service.BaseServiceImpl;
 import com.xiaoan.service.backend.ResourceService;
-import com.xiaoan.service.backend.dto.ResourcePermissions;
 import com.xiaoan.service.backend.dto.ResourceTree;
-import com.xiaoan.service.backend.util.ResourcePermissionTreeUtil;
 import com.xiaoan.service.backend.util.ResourceTreeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

xiaoan-service/src/main/java/com/xiaoan/service/backend/util/ResourcePermissionTreeUtil.java

@@ -1,120 +0,0 @@
-package com.xiaoan.service.backend.util;
-
-import com.xiaoan.domain.backend.ResourceEntity;
-import com.xiaoan.service.backend.dto.ResourcePermissions;
-import com.xiaoan.service.backend.dto.ResourceTree;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class ResourcePermissionTreeUtil {
-
-    private List<ResourcePermissions> resultNodes = new ArrayList<>();//树形结构排序之后list内容
-
-//    private List<ResourceTree> nodes = new ArrayList<ResourceTree>();
-    private List<ResourcePermissions> nodes = new ArrayList<>();
-
-    private List<ResourcePermissions> parents = new ArrayList<>();
-
-    private List<ResourcePermissions> childs = new ArrayList<>();
-
-    /** 传入参数*/
-    public ResourcePermissionTreeUtil(List<ResourceEntity> nodesList) {//通过构造函数初始化
-
-        for (ResourceEntity n : nodesList) {
-            ResourcePermissions resourcePermissions = new ResourcePermissions();
-            resourcePermissions.setId(n.getId());
-            resourcePermissions.setName(n.getName());
-            if (n.getParentId() != null) {
-                resourcePermissions.setParentId(n.getParentId());
-            }
-            nodes.add(resourcePermissions);
-        }
-    }
-
-    public ResourcePermissionTreeUtil() {
-    }
-
-        public List<ResourcePermissions> buildTree() {
-        return nodes;
-    }
-
-    public void format  () {
-
-    }
-
-
-
-    /**
-     * 构建树形结构list
-     *
-     * @return 返回树形结构List列表
-     */
-//    public List<ResourcePermissions> buildTree() {
-//        for (ResourcePermissions node : nodes) {
-//            Long id = node.getId();
-//
-//
-//
-//
-//            if (id == null) {//通过循环一级节点 就可以通过递归获取二级以下节点
-//                resultNodes.add(node);//添加一级节点
-////                node.setLevel(1);
-//                build(node, node.getLevel());//递归获取二级、三级、。。。节点
-//            }
-//        }
-//        return resultNodes;
-//    }
-
-    /**
-     * 递归循环子节点
-     *
-     * @param node 当前节点
-     */
-//    private void build(ResourceTree node, int level) {
-//        List<ResourceTree> children = getChildren(node);
-//        if (!children.isEmpty()) {//如果存在子节点
-//            node.setChildren(children);
-////        	level++;
-//            for (ResourceTree child : children) {//将子节点遍历加入返回值中
-////        		child.setLevel(level);
-//                build(child, child.getLevel());
-//            }
-//        }
-//    }
-//
-//    /**
-//     * @param node
-//     * @return 返回
-//     */
-//    private List<ResourceTree> getChildren(ResourceTree node) {
-//        List<ResourceTree> children = new ArrayList<ResourceTree>();
-//        Long id = node.getId();
-//        for (ResourceTree child : nodes) {
-//            if (id.equals(child.getParentId())) {//如果id等于父id
-//                children.add(child);//将该节点加入循环列表中
-//            }
-//        }
-//        return children;
-//    }
-//
-//    public List<ResourceTree> buildTree(List<ResourceEntity> all, List<ResourceEntity> in) {
-//        for (ResourceEntity n : all) {
-//            ResourceTree treeGrid = new ResourceTree();
-//            treeGrid.setId(n.getId());
-//            treeGrid.setName(n.getName());
-//            for (ResourceEntity nin : in) {
-//                if (nin.getId().equals(n.getId())) {
-//                    treeGrid.setChecked(true);
-//                }
-//            }
-//            if (n.getParentId() != null) {
-//                treeGrid.setParentId(n.getParentId());
-//            }
-//            nodes.add(treeGrid);
-//        }
-//        return buildTree();
-//    }
-
-}

xiaoan-web/src/main/java/com/xiaoan/web/backend/IndexController.java

@@ -3,22 +3,16 @@ package com.xiaoan.web.backend;
 import com.xiaoan.common.constant.MsgCode;
 import com.xiaoan.common.util.PasswordUtils;
 import com.xiaoan.common.util.ResultJson;
-import com.xiaoan.domain.backend.ResourceEntity;
 import com.xiaoan.domain.backend.UserEntity;
 import com.xiaoan.domain.dto.request.LoginRequest;
-import com.xiaoan.domain.dto.request.UserRequest;
 import com.xiaoan.service.backend.ResourceService;
-import com.xiaoan.service.backend.RoleService;
 import com.xiaoan.service.backend.UserService;
-import com.xiaoan.service.backend.dto.ResourcePermissions;
 import com.xiaoan.service.backend.dto.ResourceTree;
-import com.xiaoan.web.shiro.JWTUtil;
 import com.xiaoan.web.shiro.JwtUtil2;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;

xiaoan-web/src/main/java/com/xiaoan/web/backend/SceneController.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,8 +28,6 @@ import java.util.List;
 @Transactional
 public class SceneController extends BaseController {
 
-    @Value("${scene.path}")
-    private String scenePath;
 
     @Autowired
     private SceneService sceneService;