소스 검색

取消PUT和DELETE请求

gao.qiang 1 년 전
부모
커밋
c477207b79
27개의 변경된 파일47개의 추가작업 그리고 204개의 파일을 삭제
  1. 0 8
      business-service/src/main/java/com/ozs/service/OssService.java
  2. 0 72
      business-service/src/main/java/com/ozs/service/impl/OssServiceImpl.java
  3. 0 35
      business-service/src/main/java/com/ozs/utils/ConstantPropertiesUtils.java
  4. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java
  5. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java
  6. 1 1
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseTerminalController.java
  7. 1 1
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java
  8. 1 1
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java
  9. 1 2
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmTemporaryController.java
  10. 3 3
      vehicle-admin/src/main/java/com/ozs/web/controller/monitor/CacheController.java
  11. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java
  12. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java
  13. 1 1
      vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysUserOnlineController.java
  14. 0 27
      vehicle-admin/src/main/java/com/ozs/web/controller/oss/OssController.java
  15. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/MonitorSystemController.java
  16. 3 3
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysConfigController.java
  17. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java
  18. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java
  19. 3 3
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java
  20. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java
  21. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysNoticeController.java
  22. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysPostController.java
  23. 2 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysProfileController.java
  24. 7 7
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java
  25. 4 4
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java
  26. 0 7
      vehicle-admin/src/main/resources/application.yml
  27. 0 7
      vehicle-sdk/src/main/resources/application.yml

+ 0 - 8
business-service/src/main/java/com/ozs/service/OssService.java

@@ -1,8 +0,0 @@
-package com.ozs.service;
-
-import org.springframework.web.multipart.MultipartFile;
-
-public interface OssService {
-    //上传头像到oss
-    String uploadFileAvatar(MultipartFile file);
-}

+ 0 - 72
business-service/src/main/java/com/ozs/service/impl/OssServiceImpl.java

@@ -1,72 +0,0 @@
-package com.ozs.service.impl;
-
-
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.ozs.service.OssService;
-import com.ozs.utils.ConstantPropertiesUtils;
-import org.joda.time.DateTime;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.UUID;
-
-@Service
-public class OssServiceImpl implements OssService {
-
-    //上传头像到oss
-    @Override
-    public String uploadFileAvatar(MultipartFile file) {
-        //工具类获取值
-        String endpoint = ConstantPropertiesUtils.END_POINT;
-        String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
-        String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
-        String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
-
-
-        try {
-            // 创建OSSClient实例。
-            OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
-
-            //获取上传文件输入流
-            InputStream inputStream = file.getInputStream();
-
-            //获取文件名称
-            String fileName = file.getOriginalFilename();
-
-            //1.在文件名称里面添加随机唯一的值
-            String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-            fileName = uuid + fileName;
-
-
-            //2.把文件按照日期进行分类
-            //2019/11/12/
-            //获取当前日期
-            String datePath = new DateTime().toString("yyyy/MM/dd");
-            //拼接
-            //2019/11/12/esds56501.jpg
-            fileName=datePath+"/"+fileName;
-
-            //调用oss方法实现上传
-            //第一个参数 Bucket名称
-            //第二个参数 上传到oss文件路径和文件名称
-            //第三个参数 上传文件输入流
-            ossClient.putObject(bucketName, fileName, inputStream);
-
-            // 关闭OSSClient。
-            ossClient.shutdown();
-
-            //把上传之后文件路径返回
-            //需要把上传到阿里云oss路径手动拼接出来
-            //https://hxs-1010.oss-cn-beijing.aliyuncs.com/1607084234471.jpg
-            String url = "https://" + bucketName + "." + endpoint + "/" + fileName;
-
-            return url;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

+ 0 - 35
business-service/src/main/java/com/ozs/utils/ConstantPropertiesUtils.java

@@ -1,35 +0,0 @@
-package com.ozs.utils;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-//当项目已启动,spring接口,spring加载之后,执行接口一个方法
-@Component
-public class ConstantPropertiesUtils implements InitializingBean {
-
-    //读取配置文件内容
-    @Value("${aliyun.oss.file.endpoint}")
-    private String endpoint;
-    @Value("${aliyun.oss.file.keyid}")
-    private String keyId;
-    @Value("${aliyun.oss.file.keysecret}")
-    private String keySecret;
-    @Value("${aliyun.oss.file.bucketname}")
-    private String bucketName;
-
-
-    //定义公开静态常量
-    public static String END_POINT;
-    public static String ACCESS_KEY_ID;
-    public static String ACCESS_KEY_SECRET;
-    public static String BUCKET_NAME;
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        END_POINT = endpoint;
-        ACCESS_KEY_ID = keyId;
-        ACCESS_KEY_SECRET = keySecret;
-        BUCKET_NAME = bucketName;
-    }
-}

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -279,7 +279,7 @@ public class BaseCameraManagementController extends BaseController {
      * @param accountManagementIds
      * @return
      */
-    @DeleteMapping("/{accountManagementIds}")
+    @RequestMapping("/remove/{accountManagementIds}")
     @ApiOperation("删除相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.DELETE)
     @Transactional
@@ -411,7 +411,7 @@ public class BaseCameraManagementController extends BaseController {
      * @param baseCameraManagement
      * @return
      */
-    @PutMapping("/editAccountManagement")
+    @PostMapping("/editAccountManagement")
     @ApiOperation("修改相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -145,7 +145,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @param lineIds
      * @return
      */
-    @DeleteMapping("/{lineIds}")
+    @RequestMapping("/remove/{lineIds}")
     @ApiOperation("删除线路管理表信息")
     @Log(title = "线路台账管理", businessType = BusinessType.DELETE)
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
@@ -226,7 +226,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @param baseRailwayManagement
      * @return
      */
-    @PutMapping("/editRailwayManagement")
+    @RequestMapping("/editRailwayManagement")
     @ApiOperation("修改线路管理表信息")
     @Log(title = "线路台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {

+ 1 - 1
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseTerminalController.java

@@ -109,7 +109,7 @@ public class BaseTerminalController extends BaseController {
      * @return
      */
     @ApiOperation(value = "车载终端信息表 删除")
-    @DeleteMapping("/vehicleTerminaleDelete/{ids}")
+    @RequestMapping("/vehicleTerminaleDelete/{ids}")
     @Log(title = "车载终端管理", businessType = BusinessType.DELETE)
     public AjaxResult vehicleDelete(@PathVariable List<Long> ids) {
         if (StringUtils.isEmptySunhh(ids)) {

+ 1 - 1
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -224,7 +224,7 @@ public class BaseVehicleController extends BaseController {
      * @return
      */
     @ApiOperation(value = "机车信息表 删除")
-    @DeleteMapping("/vehicleDelete/{ids}")
+    @RequestMapping("/vehicleDelete/{ids}")
     @Log(title = "机车信息管理", businessType = BusinessType.DELETE)
     public AjaxResult vehicleDelete(@PathVariable List<Long> ids) {
         if (StringUtils.isEmptySunhh(ids)) {

+ 1 - 1
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -402,7 +402,7 @@ public class MsgAlarmController extends BaseController {
         return msgAlarmService.getDate(msgAlarmVo);
     }
 
-    @PutMapping(value = "/updateIsRelease")
+    @RequestMapping(value = "/updateIsRelease")
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult updateIsRelease(@RequestParam(value = "id") Long id) {

+ 1 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmTemporaryController.java

@@ -46,7 +46,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -179,7 +178,7 @@ public class MsgAlarmTemporaryController extends BaseController {
      * @param msgAlarmTemporary
      * @return
      */
-    @PutMapping("/editMsgAlarmTemporary")
+    @RequestMapping("/editMsgAlarmTemporary")
     @ApiOperation("修改报警信息临时表信息")
     @Log(title = "报警信息临时表管理", businessType = BusinessType.UPDATE)
     public AjaxResult editMsgAlarmTemporary(@RequestBody MsgAlarmTemporary msgAlarmTemporary) {

+ 3 - 3
vehicle-admin/src/main/java/com/ozs/web/controller/monitor/CacheController.java

@@ -84,7 +84,7 @@ public class CacheController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    @DeleteMapping("/clearCacheName/{cacheName}")
+    @RequestMapping("/clearCacheName/{cacheName}")
     public AjaxResult clearCacheName(@PathVariable String cacheName)
     {
         Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
@@ -93,7 +93,7 @@ public class CacheController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    @DeleteMapping("/clearCacheKey/{cacheKey}")
+    @RequestMapping("/clearCacheKey/{cacheKey}")
     public AjaxResult clearCacheKey(@PathVariable String cacheKey)
     {
         redisTemplate.delete(cacheKey);
@@ -101,7 +101,7 @@ public class CacheController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    @DeleteMapping("/clearCacheAll")
+    @RequestMapping("/clearCacheAll")
     public AjaxResult clearCacheAll()
     {
         Collection<String> cacheKeys = redisTemplate.keys("*");

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java

@@ -102,7 +102,7 @@ public class SysLoginInfoController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{infoIds}")
+    @RequestMapping("/{infoIds}")
     public AjaxResult remove(@PathVariable Long[] infoIds)
     {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
@@ -110,7 +110,7 @@ public class SysLoginInfoController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
+    @RequestMapping("/clean")
     public AjaxResult clean()
     {
         logininforService.cleanLogininfor();

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -102,7 +102,7 @@ public class SysOperlogController extends BaseController {
 
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    @DeleteMapping("/{operIds}")
+    @RequestMapping("/{operIds}")
     public AjaxResult remove(@PathVariable Long[] operIds)
     {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
@@ -110,7 +110,7 @@ public class SysOperlogController extends BaseController {
 
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    @DeleteMapping("/clean")
+    @RequestMapping("/clean")
     public AjaxResult clean()
     {
         operLogService.cleanOperLog();

+ 1 - 1
vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysUserOnlineController.java

@@ -80,7 +80,7 @@ public class SysUserOnlineController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
-    @DeleteMapping("/{tokenId}")
+    @RequestMapping("/{tokenId}")
     public AjaxResult forceLogout(@PathVariable String tokenId)
     {
         redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);

+ 0 - 27
vehicle-admin/src/main/java/com/ozs/web/controller/oss/OssController.java

@@ -1,27 +0,0 @@
-package com.ozs.web.controller.oss;
-
-import com.ozs.common.core.domain.R;
-import com.ozs.service.OssService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-
-@RestController
-@RequestMapping("/service/fileoss")
-//@CrossOrigin  //跨域
-public class OssController {
-
-    @Autowired
-    private OssService ossService;
-
-    //上传头像的方法
-    @PostMapping
-    public R uploadOssFile(MultipartFile file) {//MultipartFile获取上传文件
-        //返回上传到oss的路径
-        String url = ossService.uploadFileAvatar(file);
-        return R.ok(url);
-    }
-}

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/MonitorSystemController.java

@@ -133,7 +133,7 @@ public class MonitorSystemController extends BaseController {
      * @return
      */
     @Log(title = "监测系统-删除", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @RequestMapping("/delete/{ids}")
     @ApiOperation(value = "监测系统-删除")
     public AjaxResult delete(@PathVariable Long[] ids) {
         monitorSystemService.deleteByIds(ids);
@@ -147,7 +147,7 @@ public class MonitorSystemController extends BaseController {
      * @return
      */
     @Log(title = "监测系统-修改", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/update")
     @ApiOperation(value = "监测系统-修改")
     public AjaxResult update(@RequestBody MonitorSystem monitorSystem) {
         if (UserConstants.EXCEPTION.equals(monitorSystemService.checkSystemOnline(monitorSystem))) {

+ 3 - 3
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysConfigController.java

@@ -91,7 +91,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -107,7 +107,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{configIds}")
+    @RequestMapping("/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
     {
         configService.deleteConfigByIds(configIds);
@@ -119,7 +119,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/refreshCache")
+    @RequestMapping("/refreshCache")
     public AjaxResult refreshCache()
     {
         configService.resetConfigCache();

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -129,7 +129,7 @@ public class SysDeptController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysDept dept) {
         Long deptId = dept.getDeptId();
         //deptService.checkDeptDataScope(deptId);
@@ -158,7 +158,7 @@ public class SysDeptController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deptId}")
+    @RequestMapping("/remove/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {
             return warn("存在下级部门,不允许删除");

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -139,7 +139,7 @@ public class SysDictDataController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
         dict.setUpdateBy(getUsername());
@@ -151,7 +151,7 @@ public class SysDictDataController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictCodes}")
+    @RequestMapping("remove/{dictCodes}")
     public AjaxResult remove(@PathVariable Long[] dictCodes)
     {
         dictDataService.deleteDictDataByIds(dictCodes);

+ 3 - 3
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java

@@ -113,7 +113,7 @@ public class SysDictTypeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/update")
     public AjaxResult edit(@Validated @RequestBody SysDictType dict) {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
             return error("修改字典'" + dict.getDictType() + "'失败,字典类型已存在");
@@ -130,7 +130,7 @@ public class SysDictTypeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictIds}")
+    @RequestMapping("/remove/{dictIds}")
     public AjaxResult remove(@PathVariable Long[] dictIds)
     {
         dictTypeService.deleteDictTypeByIds(dictIds);
@@ -142,7 +142,7 @@ public class SysDictTypeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/refreshCache")
+    @GetMapping("/refreshCache")
     public AjaxResult refreshCache()
     {
         dictTypeService.resetDictCache();

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java

@@ -99,7 +99,7 @@ public class SysMenuController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
@@ -117,7 +117,7 @@ public class SysMenuController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{menuId}")
+    @RequestMapping("/remove/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {
             return warn("存在子菜单,不允许删除");

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysNoticeController.java

@@ -65,7 +65,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)
     {
         notice.setUpdateBy(getUsername());
@@ -77,7 +77,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{noticeIds}")
+    @RequestMapping("/{noticeIds}")
     public AjaxResult remove(@PathVariable Long[] noticeIds)
     {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysPostController.java

@@ -86,7 +86,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -106,7 +106,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{postIds}")
+    @RequestMapping("/remove/{postIds}")
     public AjaxResult remove(@PathVariable Long[] postIds)
     {
         return toAjax(postService.deletePostByIds(postIds));

+ 2 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysProfileController.java

@@ -51,7 +51,7 @@ public class SysProfileController extends BaseController
      * 修改用户
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/update")
     public AjaxResult updateProfile(@RequestBody SysUser user) {
         LoginUser loginUser = getLoginUser();
         SysUser sysUser = loginUser.getUser();
@@ -85,7 +85,7 @@ public class SysProfileController extends BaseController
      * 重置密码
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
+    @RequestMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
         LoginUser loginUser = getLoginUser();

+ 7 - 7
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -139,7 +139,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysRole role) {
 //        roleService.checkRoleAllowed(role);
 //        roleService.checkRoleDataScope(role.getRoleId());
@@ -181,7 +181,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/dataScope")
+    @RequestMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
@@ -193,7 +193,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @RequestMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
@@ -206,7 +206,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{roleIds}")
+    @RequestMapping("/remove/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
@@ -252,7 +252,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authUser/cancel")
+    @RequestMapping("/authUser/cancel")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
@@ -262,7 +262,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authUser/cancelAll")
+    @RequestMapping("/authUser/cancelAll")
     public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
@@ -272,7 +272,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authUser/selectAll")
+    @RequestMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));

+ 4 - 4
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -314,7 +314,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{Ids}")
+    @RequestMapping("/remove/{Ids}")
     public AjaxResult remove(@PathVariable Long[] Ids) {
         if (ArrayUtils.contains(Ids, getId())) {
             return error("当前用户不能删除");
@@ -363,7 +363,7 @@ public class SysUserController extends BaseController {
      * 修改密码
      */
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePassWord")
+    @RequestMapping("/updatePassWord")
     public AjaxResult updatePassWord(@RequestBody SysUser user) {
         LoginUser loginUser = getLoginUser();
         if (!SecurityUtils.matchesPassword(user.getPassword(), loginUser.getPassword())) {
@@ -392,7 +392,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @RequestMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
 //        userService.checkUserDataScope(user.getId());
@@ -420,7 +420,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authRole")
+    @RequestMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
 //        userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);

+ 0 - 7
vehicle-admin/src/main/resources/application.yml

@@ -166,13 +166,6 @@ minio:
   accessKey: admin #访问的key
   secretKey: jt73W-+xhd5 #访问的秘钥
   
-aliyun:
-    oss:
-      file:
-        endpoint: oss-cn-beijing.aliyuncs.com
-        keyid: LTAI5tGRWozi6CLywJSXMkTh
-        keysecret: LhJI1KcaN84MjLvtHzDX3KpXeBnT2p
-        bucketname: hxs-1010
 
 artemis:
   host: 10.48.253.21:1443

+ 0 - 7
vehicle-sdk/src/main/resources/application.yml

@@ -169,13 +169,6 @@ minio:
 sdk:
   publish: http://10.48.36.43:18810/sdk/publish
   
-aliyun:
-  oss:
-    file:
-      endpoint: oss-cn-beijing.aliyuncs.com
-      keyid: LTAI5tGRWozi6CLywJSXMkTh
-      keysecret: LhJI1KcaN84MjLvtHzDX3KpXeBnT2p
-      bucketname: hxs-1010  
 
 artemis:
   host: 10.48.253.21:1443