From 6496ae7000936a96b8c1c468c8019f796c9c8a2b Mon Sep 17 00:00:00 2001 From: dftre <3066417822@qq.com> Date: Tue, 7 Jan 2025 11:50:45 +0800 Subject: [PATCH] =?UTF-8?q?NeedBraceRule=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/core/config/SwaggerConfig.java | 2 +- .../oauth/wx/controller/WxLoginController.java | 13 +++++++------ .../java/com/ruoyi/mybatis/domain/TableInfo.java | 8 +++++--- .../com/ruoyi/mybatis/utils/TableContainer.java | 3 ++- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index f4fce2a..c7e11c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.models.media.StringSchema; public class SwaggerConfig { @Bean - public OpenAPI springShopOpenAPI() { + public OpenAPI springShopOpenApi() { Schema codeSchema = new IntegerSchema().example(HttpStatus.SUCCESS); // 示例状态码 Schema msgSchema = new StringSchema().example("操作成功"); // 示例消息 ObjectSchema dataSchema = new ObjectSchema(); // 数据可以是任意类型，这里简单定义为ObjectSchema diff --git a/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/controller/WxLoginController.java b/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/controller/WxLoginController.java index cd0265b..1b2be29 100644 --- a/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/controller/WxLoginController.java +++ b/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/controller/WxLoginController.java @@ -6,13 +6,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.auth.common.domain.OauthUser; +import com.ruoyi.auth.common.service.IOauthUserService; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.auth.common.domain.OauthUser; -import com.ruoyi.auth.common.service.IOauthUserService; import com.ruoyi.oauth.wx.constant.WxMiniAppConstant; import com.ruoyi.oauth.wx.constant.WxPubConstant; import com.ruoyi.oauth.wx.service.Impl.WxLoginServiceImpl; @@ -37,9 +37,10 @@ public class WxLoginController extends BaseController { public AjaxResult loginMiniApp(@PathVariable("source") String source, @PathVariable("code") String code) { String token = null; AjaxResult ajax = AjaxResult.success(); - if ("miniapp".equals(source)) + if ("miniapp".equals(source)) { token = wxLoginServiceImpl.doLoginMiniApp(code); - else if ("pub".equals(source)) { + + } else if ("pub".equals(source)) { token = wxLoginServiceImpl.doLoginPub(code); } else { return error("错误的登录方式"); @@ -58,9 +59,9 @@ public class WxLoginController extends BaseController { oauthUser = new OauthUser(); oauthUser.setUserId(getUserId()); oauthUser.setCode(code); - if ("miniapp".equals(source)) + if ("miniapp".equals(source)) { msg = wxLoginServiceImpl.doRegisterMiniApp(oauthUser); - else if ("pub".equals(source)) { + } else if ("pub".equals(source)) { msg = wxLoginServiceImpl.doRegisterPub(oauthUser); } else { return error("错误的注册方式"); diff --git a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java index c9fff1b..0ebb5df 100644 --- a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java +++ b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java @@ -33,8 +33,9 @@ public class TableInfo { public TableInfo(Class cls) { this.table = AnnotationUtils.findAnnotation(cls, Table.class); - if (this.table == null) + if (this.table == null) { throw new RuntimeException("error , not find tableName"); + } this.tableName = this.table.name(); this.enableTableMap = AnnotationUtils.findAnnotation(cls, EnableTableMap.class); @@ -118,10 +119,11 @@ public class TableInfo { } public String getTableNameFrom() { - if (this.isEnbleMap()) + if (this.isEnbleMap()){ return this.tableName + " " + this.enableTableMap.name(); - else + }else{ return this.tableName; + } } public List getQueryColumnNames() { diff --git a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/TableContainer.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/TableContainer.java index 3790b97..6e490ec 100644 --- a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/TableContainer.java +++ b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/TableContainer.java @@ -22,8 +22,9 @@ public class TableContainer { public static TableInfo getTableInfo(Class clazz) { TableInfo tableInfo = tableInfoMap.get(clazz); - if (tableInfo == null) + if (tableInfo == null) { tableInfo = new TableInfo(clazz); + } return tableInfo; }