1.增加权限

cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @ClassName AuthorizaitonApplication
@@ -13,6 +14,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
  **/
 @SpringBootApplication
 @EnableEurekaClient
+@EnableFeignClients
 @MapperScan("com.mx.cneeds.server.dao")
 public class AuthorizaitonApplication {
 

cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/client/UserClient.java

+package com.mx.cneeds.server.anthorization.client;
+
+import com.mx.cneeds.common.dto.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @ClassName UserClient
+ * @Author zzrdark
+ * @Date 2020-03-09 15:21
+ * @Description TODO
+ **/
+@FeignClient(name = "CNEEDS-SERVER-USER")
+public interface UserClient {
+
+    /**
+     *
+     * @param page
+     * @param pageSize
+     * @param order
+     * @param orderField
+     * @return
+     */
+    @PostMapping("/sys/func/list")
+    PageDto funcList(@RequestParam Integer page,
+                     @RequestParam("limit") Integer pageSize,
+                     @RequestParam("sidx") String orderField,
+                     @RequestParam("order") String order);
+
+    @PostMapping("/sys/func/listAll")
+    List<FuncDto> funcListAll();
+    /**
+     *
+     * @param page
+     * @param pageSize
+     * @param orderField
+     * @param order
+     * @return
+     */
+    @PostMapping("/sys/dept/list")
+    PageDto deptList(@RequestParam Integer page,
+                     @RequestParam("limit") Integer pageSize,
+                     @RequestParam("sidx") String orderField,
+                     @RequestParam("order") String order,
+                     @RequestParam("name") String name);
+
+    /**
+     * 获取部门列表
+     * @return
+     */
+    @PostMapping("/sys/dept/listAll")
+    List<DepartmentDto> deptListAll();
+
+    @PostMapping("/sys/dept/save")
+    void addDept(@RequestBody DepartmentDto dto);
+
+    @PostMapping("/sys/dept/update")
+    void updateDept(@RequestBody DepartmentDto dto);
+
+    @PostMapping("/sys/dept/delete")
+    void deleteDept(@RequestBody List<Long> ids);
+
+    @PostMapping("/sys/dept/info")
+    DepartmentDto deptInfo(@RequestBody Long deptId);
+
+    /**
+     *
+     * @param page
+     * @param pageSize
+     * @param order
+     * @param orderField
+     * @return
+     */
+    @PostMapping("/sys/role/list")
+    PageDto roleList(@RequestParam Integer page,
+                     @RequestParam("limit") Integer pageSize,
+                     @RequestParam("sidx") String orderField,
+                     @RequestParam("order") String order,
+                     @RequestParam("roleName") String roleName);
+
+    @PostMapping("/sys/role/info")
+    RoleDto infoRole(@RequestParam Long roleId);
+
+    @PostMapping("/sys/role/save")
+    void addRole(@RequestBody RoleDto dto);
+
+    @PostMapping("/sys/role/update")
+    void updateRole(@RequestBody RoleDto dto);
+
+    @PostMapping("/sys/role/delete")
+    void deleteRole(@RequestBody List<Long> ids);
+
+
+    @PostMapping("/sys/role/listAll")
+    List<RoleDto> roleListAll();
+
+    /**
+     *
+     * @param page
+     * @param pageSize
+     * @param order
+     * @param orderField
+     * @return
+     */
+    @PostMapping("/sys/user/list")
+    PageDto userList(@RequestParam Integer page,
+                     @RequestParam("limit") Integer pageSize,
+                     @RequestParam("sidx") String orderField,
+                     @RequestParam("order") String order,
+                     @RequestParam("username") String username);
+
+
+    @PostMapping("/sys/user/userinfo")
+    UserDto userInfo(@RequestParam String username);
+
+
+
+    @PostMapping("/sys/user/save")
+    void addUser(@RequestBody UserDto dto);
+
+    @PostMapping("/sys/user/update")
+    void updateUser(@RequestBody UserDto dto);
+
+    @PostMapping("/sys/user/delete")
+    void deleteUser(@RequestBody List<Long> ids);
+}

cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/service/MyUserDetailsService.java

 package com.mx.cneeds.server.anthorization.service;
 
+import com.mx.cneeds.common.dto.UserDto;
+import com.mx.cneeds.server.anthorization.client.UserClient;
 import com.mx.cneeds.server.entity.SysUserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -10,6 +13,9 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Component
 public class MyUserDetailsService implements UserDetailsService {
 
@@ -19,6 +25,9 @@ public class MyUserDetailsService implements UserDetailsService {
 	@Autowired
 	private SysUserService sysUserService;
 
+	@Autowired
+	private UserClient userClient;
+	
 	/** (non-Javadoc)
 	 * @see UserDetailsService#loadUserByUsername(String)
 	 */
@@ -29,8 +38,25 @@ public class MyUserDetailsService implements UserDetailsService {
 		if (sysUserEntity == null){
 			return null;
 		}
-		return new User(username, sysUserEntity.getPassword(),
-				AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_admin"));
+
+		UserDto userDto = userClient.userInfo(username);
+
+		List<GrantedAuthority> authorities = new ArrayList<>();
+
+		if (sysUserEntity.getUserId() == 1){
+
+			authorities.add(new SimpleGrantedAuthority("ROLE_admin"));
+
+		}else {
+
+			List<String> funcPerms = userDto.getFuncPerms();
+			funcPerms.forEach( str -> {
+				authorities.add(new SimpleGrantedAuthority(str));
+			});
+
+		}
+
+		return new User(username, sysUserEntity.getPassword(), authorities);
 	}
 
 }
\ No newline at end of file

cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/service/impl/SysUserServiceImpl.java

@@ -7,10 +7,11 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.anthorization.service.SysUserService;
 import com.mx.cneeds.server.dao.SysUserDao;
+import com.mx.cneeds.server.entity.SysFuncEntity;
 import com.mx.cneeds.server.entity.SysUserEntity;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
+import java.util.*;
 
 
 @Service("sysUserService")

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java

@@ -2,6 +2,7 @@ package com.mx.cneeds.server.datashow.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
@@ -14,6 +15,7 @@ import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
 // 资源服务配置
 @Configuration
 @EnableResourceServer
+@EnableGlobalMethodSecurity(prePostEnabled = true)
 public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
 
     @Override

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java

@@ -16,6 +16,7 @@ import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.FileNotFoundException;
@@ -65,6 +66,7 @@ public class DeviceController {
         return new R().put("data",channelVo);
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:add') or hasRole('admin')")
     @PostMapping("/device/saveChannel")
     public R saveChannel_nums(DeviceChannelVo channelVo){
         DevicesDto devicesDto = new DevicesDto();
@@ -77,6 +79,7 @@ public class DeviceController {
 
 
 
+    @PreAuthorize("hasRole('configManagement:productSeries:list') or hasRole('admin')")
     @PostMapping("/series/list")
     public R seriesList(@RequestParam(required = false) Integer page,
                         @RequestParam(required = false) Integer pageSize,
@@ -110,6 +113,7 @@ public class DeviceController {
         return new R().put("data",pageDto);
     }
 
+    @PreAuthorize("hasRole('configManagement:productSeries:list') or hasRole('admin')")
     @PostMapping("/series/listAll")
     public R selectSeries(){
         List<SeriesDto> seriesDtos = deviceClient.seriesListAll();
@@ -117,6 +121,7 @@ public class DeviceController {
         return new R().put("data",seriesDtos);
     }
 
+    @PreAuthorize("hasRole('configManagement:productSeries:add') or hasRole('admin')")
     @PostMapping("/series/add")
     public R addSeries(SeriesVo seriesVo){
         SeriesDto querySeries = deviceClient.querySeries(seriesVo.getSeriesNum());
@@ -132,6 +137,7 @@ public class DeviceController {
 
     }
 
+    @PreAuthorize("hasRole('configManagement:productSeries:edit') or hasRole('admin')")
     @PostMapping("/series/edit")
     public R editSeries(SeriesVo seriesVo){
 
@@ -143,6 +149,7 @@ public class DeviceController {
 
     }
 
+    @PreAuthorize("hasRole('configManagement:productSeries:delete') or hasRole('admin')")
     @PostMapping("/series/delete")
     public R deleteSeries(@RequestParam(value = "ids",required = false) List<Long> ids){
         deviceClient.deleteSeries(ids);
@@ -151,6 +158,7 @@ public class DeviceController {
     }
 
 
+    @PreAuthorize("hasRole('deviceManagement:device:list') or hasRole('admin')")
     @PostMapping("/device/list")
     public R deviceList(@RequestParam(required = false) Integer page,
                         @RequestParam(required = false) Integer pageSize,
@@ -183,6 +191,7 @@ public class DeviceController {
         return new R().put("data",pageDto);
     }
 
+    @PreAuthorize("hasRole('deviceManagement:device:add') or hasRole('admin')")
     @PostMapping("/device/importDevice")
     public R importDevice(DevicesVo devicesVo){
         DevicesDto devicesDto = new DevicesDto();
@@ -193,6 +202,7 @@ public class DeviceController {
 
     }
 
+    @PreAuthorize("hasRole('deviceManagement:device:edit') or hasRole('admin')")
     @PostMapping("/device/updateDeviceSeriesBatch")
     public R updateDeviceSeriesBatch(DevicesVo devicesVo){
         DevicesDto devicesDto = new DevicesDto();
@@ -203,6 +213,7 @@ public class DeviceController {
 
     }
 
+    @PreAuthorize("hasRole('deviceManagement:device:delete') or hasRole('admin')")
     @PostMapping("/device/delete")
     public R deleteDevice(@RequestParam(value = "ids",required = false) List<Long> ids){
         deviceClient.deleteDevice(ids);
@@ -210,6 +221,7 @@ public class DeviceController {
 
     }
 
+    @PreAuthorize("hasRole('deviceManagement:device:list') or hasRole('admin')")
     @PostMapping("/device/queryDeviceByImei")
     public R queryDeviceByImei(@RequestBody DeviceInfoDto dto){
         log.debug("queryDeviceByImei: imei:" + dto.getImei());
@@ -221,6 +233,7 @@ public class DeviceController {
     }
 
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:list') or hasRole('admin')")
     @PostMapping("/deviceChannel/list")
     public R deivceChannelList(@RequestParam(required = false) Integer page,
                         @RequestParam(required = false) Integer pageSize,
@@ -254,6 +267,7 @@ public class DeviceController {
         return new R().put("data",pageDto);
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:add') or hasRole('admin')")
     @PostMapping("/deviceChannel/add")
     public R addDeviceChannel(ChannelVo vo){
         DeviceChannelDto dto = deviceClient.queryDeviceChannel(vo.getChannelNum());
@@ -269,6 +283,7 @@ public class DeviceController {
 
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:edit') or hasRole('admin')")
     @PostMapping("/deviceChannel/edit")
     public R editSeries(ChannelVo vo){
         DeviceChannelDto deviceChannelDto = new DeviceChannelDto();
@@ -277,24 +292,28 @@ public class DeviceController {
         return R.ok();
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:delete') or hasRole('admin')")
     @PostMapping("/deviceChannel/delete")
     public R deleteDeviceChannel(@RequestParam(value = "ids",required = false) List<Long> ids){
         deviceClient.deleteDeviceChannels(ids);
         return R.ok();
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:list') or hasRole('admin')")
     @PostMapping("/deviceChannel/queryDeviceChannelAll")
     public R queryDeviceChannelAll(){
         List<DeviceChannelDto> deviceChannelDtos = deviceClient.queryDeviceChannelAll();
         return R.ok().put("data",deviceChannelDtos);
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:delete') or hasRole('admin')")
     @PostMapping("/deviceChannel/deleteSettingDeviceChannel")
     public R deleteSettingDeviceChannel(Long deviceId){
         deviceClient.deleteSettingDeviceChannel(deviceId);
         return R.ok();
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:delete') or hasRole('admin')")
     @PostMapping("/deviceChannel/updateSettingDeviceChannel")
     public R updateSettingDeviceChannel(DeviceInfoVo vo){
         DeviceInfoDto dto = new DeviceInfoDto();
@@ -303,6 +322,7 @@ public class DeviceController {
         return R.ok();
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:list') or hasRole('admin')")
     @PostMapping("/deviceChannel/queryTotalStatisticsDeviceChannel")
     public R queryTotalStatisticsDeviceChannel(@RequestParam(value="channelIds", required = false) List<Long> channelIds){
 
@@ -320,6 +340,7 @@ public class DeviceController {
         return R.ok().put("data",list);
     }
 
+    @PreAuthorize("hasRole('admin')")
     @PostMapping("/device/uploadDeivceChannelExcel")
     public R uploadDeivceChannelExcel(@RequestBody UploadDeviceChannelExcelVo vo){
         UploadDeviceChannelExcelDto dto = new UploadDeviceChannelExcelDto();
@@ -356,6 +377,7 @@ public class DeviceController {
         return response;
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:list') or hasRole('admin')")
     @RequestMapping("/device/queryDeviceChannelSetting")
     public R queryDeviceChannelSetting(@RequestBody List<String> imeis){
 
@@ -367,6 +389,7 @@ public class DeviceController {
         return R.error(ResultCode.PARAMERROR,"参数错误");
     }
 
+    @PreAuthorize("hasRole('configManagement:deviceChannel:delete') or hasRole('admin')")
     @RequestMapping("/deviceChannel/deleteStatisticsDeviceChannel")
     public R deleteStatisticsDeviceChannel(StatisticsDeviceChannelVo vo){
         if (vo == null){

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,6 +44,7 @@ public class SystemController {
      * @param sort
      * @return
      */
+    @PreAuthorize("hasRole('sys:module:list') or hasRole('admin')")
     @PostMapping("/module/list")
     public R funcList(@RequestParam(required = false) Integer page,
                       @RequestParam(required = false) Integer pageSize,
@@ -78,6 +80,7 @@ public class SystemController {
      * 查询出角色关联的模块
      * @return
      */
+    @PreAuthorize("hasRole('sys:module:list') or hasRole('admin')")
     @PostMapping("/func/listAll")
     public R selectTreeFunc(){
         List<FuncDto> dtos = userClient.funcListAll();
@@ -104,6 +107,7 @@ public class SystemController {
      * 查询出用户关联的模块
      * @return
      */
+    @PreAuthorize("hasRole('sys:module:list') or hasRole('admin')")
     @PostMapping("/func/user/listAll")
     public R selectTreeFuncUser(){
         List<FuncDto> dtos = userClient.funcListAll();
@@ -133,6 +137,7 @@ public class SystemController {
      * @param sort
      * @return
      */
+    @PreAuthorize("hasRole('sys:dept:list') or hasRole('admin')")
     @PostMapping("/dept/list")
     public R deptList(@RequestParam(required = false) Integer page,
                       @RequestParam(required = false) Integer pageSize,
@@ -166,6 +171,7 @@ public class SystemController {
         return new R().put("data",pageDto);
     }
 
+    @PreAuthorize("hasRole('sys:dept:add') or hasRole('admin')")
     @PostMapping("/dept/add")
     public R addDept(DepartmentVo departmentVo){
         DepartmentDto departmentDto = new DepartmentDto();
@@ -181,6 +187,7 @@ public class SystemController {
      * @param departmentVo
      * @return
      */
+    @PreAuthorize("hasRole('sys:dept:edit') or hasRole('admin')")
     @PostMapping("/dept/edit")
     public R editDept(DepartmentVo departmentVo){
 
@@ -198,6 +205,7 @@ public class SystemController {
      * @param ids
      * @return
      */
+    @PreAuthorize("hasRole('sys:dept:delete') or hasRole('admin')")
     @PostMapping("/dept/delete")
     public R deleteDept(@RequestParam(value = "ids",required = false) List<Long> ids){
         userClient.deleteDept(ids);
@@ -209,6 +217,7 @@ public class SystemController {
      * 获取部门下拉框列表
      * @return 返回树形的列表
      */
+    @PreAuthorize("hasRole('sys:dept:list') or hasRole('admin')")
     @PostMapping("/dept/listAll")
     public R selectDeptParent(){
         UserDto userDto = userClient.userInfo(UserUtils.getUserName());
@@ -241,6 +250,7 @@ public class SystemController {
      * 获取部门下拉框列表
      * @return 返回树形的列表
      */
+    @PreAuthorize("hasRole('sys:dept:list') or hasRole('admin')")
     @PostMapping("/dept/listAllTree")
     public R selectTreeDeptParent(){
         UserDto userDto = userClient.userInfo(UserUtils.getUserName());
@@ -266,6 +276,7 @@ public class SystemController {
         return new R().put("data",result);
     }
 
+    @PreAuthorize("hasRole('sys:user:list') or hasRole('admin')")
     @PostMapping("/dept/user/listAllTree")
     public R selectTreeDeptUserParent(){
         UserDto userDto = userClient.userInfo(UserUtils.getUserName());
@@ -299,6 +310,7 @@ public class SystemController {
      * @param sort
      * @return
      */
+    @PreAuthorize("hasRole('sys:role:list') or hasRole('admin')")
     @PostMapping("/role/list")
     public R roleList(@RequestParam(required = false) Integer page,
                       @RequestParam(required = false) Integer pageSize,
@@ -337,6 +349,7 @@ public class SystemController {
      * @param roleId
      * @return
      */
+    @PreAuthorize("hasRole('sys:role:list') or hasRole('admin')")
     @RequestMapping("/role/info")
     public R infoRole(Long roleId){
         RoleDto dto = userClient.infoRole(roleId);
@@ -349,6 +362,7 @@ public class SystemController {
      * @param vo
      * @return
      */
+    @PreAuthorize("hasRole('sys:role:add') or hasRole('admin')")
     @PostMapping("/role/add")
     public R roleAdd(RoleVo vo){
         RoleDto dto = new RoleDto();
@@ -363,6 +377,7 @@ public class SystemController {
      * @param vo
      * @return
      */
+    @PreAuthorize("hasRole('sys:role:edit') or hasRole('admin')")
     @PostMapping("/role/edit")
     public R editRole(RoleVo vo){
 
@@ -377,6 +392,7 @@ public class SystemController {
      * @param ids
      * @return
      */
+    @PreAuthorize("hasRole('sys:role:delete') or hasRole('admin')")
     @PostMapping("/role/delete")
     public R deleteRole(@RequestParam(value = "ids",required = false) List<Long> ids){
         userClient.deleteRole(ids);
@@ -402,6 +418,8 @@ public class SystemController {
      * @param sort
      * @return
      */
+
+    @PreAuthorize("hasRole('sys:user:list') or hasRole('admin')")
     @PostMapping("/user/list")
     public R userList(@RequestParam(required = false) Integer page,
                       @RequestParam(required = false) Integer pageSize,
@@ -438,6 +456,7 @@ public class SystemController {
      * @param username
      * @return
      */
+    @PreAuthorize("hasRole('sys:user:list') or hasRole('admin')")
     @RequestMapping("/user/info")
     public R infoRole(String username){
         UserDto dto = userClient.userInfo(username);
@@ -449,6 +468,7 @@ public class SystemController {
      * @param vo
      * @return
      */
+    @PreAuthorize("hasRole('sys:user:add') or hasRole('admin')")
     @RequestMapping("/user/add")
     public R addUser(UserVo vo){
         UserDto dto = new UserDto();
@@ -463,6 +483,7 @@ public class SystemController {
      * @param vo
      * @return
      */
+    @PreAuthorize("hasRole('sys:user:edit') or hasRole('admin')")
     @PostMapping("/user/update")
     public R editUser(UserVo vo){
         UserDto dto = new UserDto();
@@ -480,6 +501,7 @@ public class SystemController {
      * @param ids
      * @return
      */
+    @PreAuthorize("hasRole('sys:user:delete') or hasRole('admin')")
     @PostMapping("/user/delete")
     public R deleteUser(@RequestParam(value = "ids",required = false) List<Long> ids){
         userClient.deleteUser(ids);

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/UserController.java

@@ -63,8 +63,8 @@ public class UserController {
             userDto.getFuncPerms().forEach(perms -> {
                 sb.append(perms+",");
             });
-            sb.substring(0,sb.length()-2);
-            userInfoVo.setRoles(sb.toString());
+            String rolesStr = sb.substring(0, sb.length() - 1);
+            userInfoVo.setRoles(rolesStr);
         }
 
         userInfoVo.setName(userDto.getUsername());
@@ -74,6 +74,4 @@ public class UserController {
     }
 
 
-
-
 }