Bläddra i källkod

1、post请求用body体
2、通用返回体

machaoyi 1 år sedan
förälder
incheckning
255bf8c8cb

+ 19 - 31
.idea/workspace.xml

@@ -4,36 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/config/MybatisPlusConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/config/SaTokenConfigure.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/config/SwaggerConfig.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/entity/FramePage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/handler/GlobalExceptionHandler.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/system/entity/UserForm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/system/web/login.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/controller/SysUserController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/SysUser.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/mapper/SysUserMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/mapper/SysUserMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/SysUserService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/ApiResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/JwtUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/PasswordEncoderUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/resources/application.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/resources/data-h2.sql" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/resources/schema-h2.sql" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="基础框架配置">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/controller/SysUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/SysUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/mapper/SysUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/mapper/SysUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/SysUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -139,8 +116,17 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1704693898384</updated>
-      <workItem from="1704693899463" duration="37720000" />
+      <workItem from="1704693899463" duration="40238000" />
     </task>
+    <task id="LOCAL-00001" summary="基础框架配置">
+      <option name="closed" value="true" />
+      <created>1704846411609</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1704846411609</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -148,5 +134,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="基础框架配置" />
+    <option name="LAST_COMMIT_MESSAGE" value="基础框架配置" />
   </component>
 </project>

+ 2 - 5
application/src/main/java/com/ctsi/system/web/login.java

@@ -7,10 +7,7 @@ import com.ctsi.user.service.SysUserService;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.utils.PasswordEncoderUtil;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.GetMapping;
-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.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -21,7 +18,7 @@ public class login {
     @Resource
     private SysUserService sysUserService;
     @PostMapping(value = "/login",name = "登录")
-    public ApiResult auth(UserForm userForm){
+    public ApiResult auth(@RequestBody UserForm userForm){
         SysUser User =  sysUserService.queryByUserName(userForm.getUsername());
         if(User == null){
             return ApiResult.failure("用户不存在",null);

+ 44 - 16
application/src/main/java/com/ctsi/user/controller/SysUserController.java

@@ -1,27 +1,30 @@
 package com.ctsi.user.controller;
 
-import cn.dev33.satoken.annotation.SaCheckLogin;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.entity.FramePage;
+import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 import com.ctsi.user.entity.SysUser;
 import com.ctsi.user.service.SysUserService;
 
+import javax.annotation.Resource;
+
  /**
  * 用户表;(sys_user)表控制层
- * @author : http://www.chiner.pro
- * @date : 2024-1-9
+ * @author : machaoyi
+ * @date : 2024-1-10
  */
 @Api(tags = "用户表对象功能接口")
 @RestController
 @RequestMapping("/sysUser")
 public class SysUserController{
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
+    private static final Logger log = LoggerFactory.getLogger(SysUserController.class);
     
     /** 
      * 通过ID查询单条数据 
@@ -31,8 +34,13 @@ public class SysUserController{
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ResponseEntity<SysUser> queryById(Long id){
-        return ResponseEntity.ok(sysUserService.queryById(id));
+    public ApiResult<SysUser> queryById(Long id){
+        try {
+            return ApiResult.success(sysUserService.queryById(id));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("查询失败",null);
+        }
     }
     
     /** 
@@ -43,8 +51,13 @@ public class SysUserController{
      */
     @ApiOperation("分页查询")
     @GetMapping
-    public ResponseEntity<Page<SysUser>> paginQuery(SysUser sysUser, FramePage framePage){
-        return ResponseEntity.ok(sysUserService.paginQuery(sysUser, framePage.getPageNum(), framePage.getPageSize()));
+    public ApiResult<Page<SysUser>> paginQuery(SysUser sysUser, FramePage framePage){
+        try {
+            return ApiResult.success(sysUserService.paginQuery(sysUser, framePage.getPageNum(), framePage.getPageSize()));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("分页查询失败",null);
+        }    
     }
     
     /** 
@@ -55,8 +68,13 @@ public class SysUserController{
      */
     @ApiOperation("新增数据")
     @PostMapping
-    public ResponseEntity<SysUser> add(@RequestBody SysUser sysUser){
-        return ResponseEntity.ok(sysUserService.insert(sysUser));
+    public ApiResult<SysUser> add(@RequestBody SysUser sysUser){
+        try {
+            return ApiResult.success(sysUserService.insert(sysUser));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("新增数据失败",null);
+        }
     }
     
     /** 
@@ -67,8 +85,13 @@ public class SysUserController{
      */
     @ApiOperation("更新数据")
     @PutMapping
-    public ResponseEntity<SysUser> edit(@RequestBody SysUser sysUser){
-        return ResponseEntity.ok(sysUserService.update(sysUser));
+    public ApiResult<SysUser> edit(@RequestBody SysUser sysUser){
+        try {
+            return ApiResult.success(sysUserService.update(sysUser));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("更新数据失败",null);
+        }
     }
     
     /** 
@@ -79,7 +102,12 @@ public class SysUserController{
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping
-    public ResponseEntity<Boolean> deleteById(Long id){
-        return ResponseEntity.ok(sysUserService.deleteById(id));
+    public ApiResult<Boolean> deleteById(Long id){
+        try {
+            return ApiResult.success(sysUserService.deleteById(id));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("删除数据失败",null);
+        }
     }
 }

+ 2 - 2
application/src/main/java/com/ctsi/user/entity/SysUser.java

@@ -9,8 +9,8 @@ import java.io.Serializable;
 
  /**
  * 用户表;
- * @author : http://www.chiner.pro
- * @date : 2024-1-9
+ * @author : machaoyi
+ * @date : 2024-1-10
  */
 @ApiModel(value = "用户表",description = "")
 @TableName("sys_user")

+ 2 - 2
application/src/main/java/com/ctsi/user/mapper/SysUserMapper.java

@@ -10,8 +10,8 @@ import com.ctsi.user.entity.SysUser;
 
  /**
  * 用户表;(sys_user)表数据库访问层
- * @author : http://www.chiner.pro
- * @date : 2024-1-9
+ * @author : machaoyi
+ * @date : 2024-1-10
  */
 @Mapper
 public interface SysUserMapper  extends BaseMapper<SysUser>{

+ 2 - 2
application/src/main/java/com/ctsi/user/service/SysUserService.java

@@ -5,8 +5,8 @@ import com.ctsi.user.entity.SysUser;
 
  /**
  * 用户表;(sys_user)表服务接口
- * @author : http://www.chiner.pro
- * @date : 2024-1-9
+ * @author : machaoyi
+ * @date : 2024-1-10
  */
 public interface SysUserService{
     

+ 2 - 2
application/src/main/java/com/ctsi/user/service/impl/SysUserServiceImpl.java

@@ -13,8 +13,8 @@ import com.ctsi.user.mapper.SysUserMapper;
 import com.ctsi.user.service.SysUserService;
  /**
  * 用户表;(sys_user)表服务实现类
- * @author : http://www.chiner.pro
- * @date : 2024-1-9
+ * @author : machaoyi
+ * @date : 2024-1-10
  */
 @Service
 public class SysUserServiceImpl implements SysUserService{