From 87564341cba164808fcf723511787eeb6831a439 Mon Sep 17 00:00:00 2001 From: lihao Date: Sat, 20 Aug 2022 12:32:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 197 ++++++++++++------ .../comm/domain/query/BasePageQuery.java | 36 ++++ .../ops/client/comm/domain/{ => vo}/R.java | 32 +-- .../comm/exception/BusinessException.java | 20 ++ .../comm/handler/RestExceptionHandler.java | 26 +++ .../client/comm/service/ResponseService.java | 15 ++ .../ops/client/comm/util/SpringUtils.java | 50 +++++ .../client/controller/ConfInfoController.java | 2 +- .../ops/client/service/ConfInfoService.java | 8 +- .../service/impl/ConfInfoServiceImpl.java | 3 +- src/main/resources/bootstrap-test.yml | 14 ++ .../i18n/message/messages.properties | 1 + .../i18n/message/messages_en.properties | 0 .../i18n/message/messages_zh.properties | 0 14 files changed, 316 insertions(+), 88 deletions(-) create mode 100644 src/main/java/io/github/nginx/ops/client/comm/domain/query/BasePageQuery.java rename src/main/java/io/github/nginx/ops/client/comm/domain/{ => vo}/R.java (57%) create mode 100644 src/main/java/io/github/nginx/ops/client/comm/exception/BusinessException.java create mode 100644 src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java create mode 100644 src/main/java/io/github/nginx/ops/client/comm/service/ResponseService.java create mode 100644 src/main/java/io/github/nginx/ops/client/comm/util/SpringUtils.java create mode 100644 src/main/resources/bootstrap-test.yml create mode 100644 src/main/resources/i18n/message/messages.properties create mode 100644 src/main/resources/i18n/message/messages_en.properties create mode 100644 src/main/resources/i18n/message/messages_zh.properties diff --git a/pom.xml b/pom.xml index 0b74782..5875af8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,13 +15,116 @@ 2.3.7.RELEASE 2.2.2.RELEASE 5.7.22 - 1.2.72 + 2.0.11 2.0.9 0.9.6 - + 3.5.1 + 1.4.2 + 1.1.10 + 2.2.2 + 1.29.0 + 1.6.2 + 5.6.1 + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + + com.github.odiszapc + nginxparser + ${nginxparser.version} + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j-redisson.version} + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + cn.dev33 + sa-token-spring-boot-starter + ${sa-token.version} + + + + cn.dev33 + sa-token-dao-redis-jackson + ${sa-token.version} + + + + com.github.whvcse + easy-captcha + ${easy-captcha.version} + + + + com.github.oshi + oshi-core + ${oshi-core.version} + + + + + + org.projectlombok + lombok + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot @@ -33,63 +136,47 @@ - + - spring-boot-starter-undertow org.springframework.boot + spring-boot-starter-actuator + runtime - - - com.alibaba - fastjson - 1.2.72 - - + - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config + spring-boot-starter-undertow + org.springframework.boot - + - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.fastjson2 + fastjson2 - + - org.projectlombok - lombok + com.github.odiszapc + nginxparser - + - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - + cn.dev33 + sa-token-spring-boot-starter - + - org.springframework.boot - spring-boot-starter-actuator - runtime + cn.dev33 + sa-token-dao-redis-jackson - + - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j.version} + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config - + - com.github.odiszapc - nginxparser - ${nginxparser.version} + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery - cn.hutool hutool-core @@ -100,32 +187,6 @@ - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - cn.hutool - hutool-bom - ${hutool.version} - pom - import - - - - diff --git a/src/main/java/io/github/nginx/ops/client/comm/domain/query/BasePageQuery.java b/src/main/java/io/github/nginx/ops/client/comm/domain/query/BasePageQuery.java new file mode 100644 index 0000000..dd3c291 --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/domain/query/BasePageQuery.java @@ -0,0 +1,36 @@ +package io.github.nginx.ops.client.comm.domain.query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; + +/** + * @author lihao3 + * @since 2022/4/25 + */ +@Getter +@Setter +@ToString +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("通用查询实体类") +public class BasePageQuery implements Serializable { + + /** 页码 */ + @ApiModelProperty("页码") + private Integer pageNum = 1; + /** 页数 */ + @ApiModelProperty("页数") + private Integer pageSize = 20; + /** 排序 */ + @ApiModelProperty("排序") + private String orderBy; +} diff --git a/src/main/java/io/github/nginx/ops/client/comm/domain/R.java b/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java similarity index 57% rename from src/main/java/io/github/nginx/ops/client/comm/domain/R.java rename to src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java index b3f9651..5c68054 100644 --- a/src/main/java/io/github/nginx/ops/client/comm/domain/R.java +++ b/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java @@ -1,5 +1,6 @@ -package io.github.nginx.ops.client.comm.domain; +package io.github.nginx.ops.client.comm.domain.vo; +import io.github.nginx.ops.client.comm.util.SpringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -23,14 +24,12 @@ @ApiModel("通用返回实体类") public class R implements Serializable { - public static final String SUCCESS = "200"; - /** 编码 */ - @ApiModelProperty("返回编码(200代表成功)") + @ApiModelProperty("返回编码") private String code; /** 内容 */ @ApiModelProperty("提示内容") - private String msg; + private String message; /** 反馈时间 */ @ApiModelProperty("反馈时间") private long time; @@ -41,22 +40,31 @@ public class R implements Serializable { @ApiModelProperty("总条数") private long count; - public static R success(String msg) { - return R.builder().code(SUCCESS).msg(msg).time(System.currentTimeMillis()).count(0L).build(); + public static R success(String code) { + return R.builder() + .code(code) + .message(SpringUtils.getMessage(code, (Object) null)) + .time(System.currentTimeMillis()) + .count(0L) + .build(); } - public static R success(String msg, T data) { + public static R success(String code, T data) { return (R) R.builder() - .code(SUCCESS) - .msg(msg) + .code(code) + .message(SpringUtils.getMessage(code, (Object) null)) .time(System.currentTimeMillis()) .data(data) .count(data instanceof Collection ? ((Collection) data).size() : 1L) .build(); } - public static R error(String code, String msg) { - return R.builder().code(code).msg(msg).time(System.currentTimeMillis()).build(); + public static R error(String code) { + return R.builder() + .code(code) + .message(SpringUtils.getMessage(code, (Object) null)) + .time(System.currentTimeMillis()) + .build(); } } diff --git a/src/main/java/io/github/nginx/ops/client/comm/exception/BusinessException.java b/src/main/java/io/github/nginx/ops/client/comm/exception/BusinessException.java new file mode 100644 index 0000000..ffc4b38 --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/exception/BusinessException.java @@ -0,0 +1,20 @@ +package io.github.nginx.ops.client.comm.exception; + +import lombok.Getter; + +/** + * 业务异常 + * + * @author lihao3 + * @since 2022/4/25 + */ +@Getter +public class BusinessException extends RuntimeException { + + /** 异常编号 */ + private final String code; + + public BusinessException(String code) { + this.code = code; + } +} diff --git a/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java b/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java new file mode 100644 index 0000000..f62badd --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java @@ -0,0 +1,26 @@ +package io.github.nginx.ops.client.comm.handler; + +import io.github.nginx.ops.client.comm.domain.vo.R; +import io.github.nginx.ops.client.comm.exception.BusinessException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * @author lihao3 + * @since 2022/4/25 + */ +@Slf4j +@RestControllerAdvice +@RequiredArgsConstructor +public class RestExceptionHandler { + + /** 自定义异常抛出 */ + @ExceptionHandler(BusinessException.class) + public R businessExceptionHandler(BusinessException e) { + R r = R.error(e.getCode()); + log.warn("业务异常警告, 异常编码为:{}, 异常信息为:{}", r.getCode(), r.getMessage()); + return r; + } +} diff --git a/src/main/java/io/github/nginx/ops/client/comm/service/ResponseService.java b/src/main/java/io/github/nginx/ops/client/comm/service/ResponseService.java new file mode 100644 index 0000000..db6569b --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/service/ResponseService.java @@ -0,0 +1,15 @@ +package io.github.nginx.ops.client.comm.service; + +/** + * @author lihao3 + * @date 2022/8/20 + */ +public interface ResponseService { + + /** + * 返回编码 + * + * @return + */ + String getCode(); +} diff --git a/src/main/java/io/github/nginx/ops/client/comm/util/SpringUtils.java b/src/main/java/io/github/nginx/ops/client/comm/util/SpringUtils.java new file mode 100644 index 0000000..1b9b38b --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/util/SpringUtils.java @@ -0,0 +1,50 @@ +package io.github.nginx.ops.client.comm.util; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.servlet.LocaleResolver; + +import javax.servlet.http.HttpServletRequest; +import java.util.Locale; + +/** + * @author lihao3 + * @date 2022/8/20 + */ +@Component +public class SpringUtils implements ApplicationContextAware { + + private static ApplicationContext applicationContext; + + public static T getBean(Class tClass) { + return applicationContext.getBean(tClass); + } + + public static T getBean(String name, Class type) { + return applicationContext.getBean(name, type); + } + + public static HttpServletRequest getCurrentReq() { + ServletRequestAttributes requestAttrs = + (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (requestAttrs == null) { + return null; + } + return requestAttrs.getRequest(); + } + + public static String getMessage(String code, Object... args) { + LocaleResolver localeResolver = getBean(LocaleResolver.class); + Locale locale = localeResolver.resolveLocale(getCurrentReq()); + return applicationContext.getMessage(code, args, locale); + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + SpringUtils.applicationContext = applicationContext; + } +} diff --git a/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java b/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java index 1ca18a6..ea955c4 100644 --- a/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java +++ b/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java @@ -1,7 +1,7 @@ package io.github.nginx.ops.client.controller; import cn.hutool.core.util.ObjectUtil; -import io.github.nginx.ops.client.comm.domain.R; +import io.github.nginx.ops.client.comm.domain.vo.R; import io.github.nginx.ops.client.domain.dto.GenerateConfDTO; import io.github.nginx.ops.client.domain.dto.ReplaceDTO; import io.github.nginx.ops.client.domain.dto.RunConfDTO; diff --git a/src/main/java/io/github/nginx/ops/client/service/ConfInfoService.java b/src/main/java/io/github/nginx/ops/client/service/ConfInfoService.java index f4c5f6b..302d7fd 100644 --- a/src/main/java/io/github/nginx/ops/client/service/ConfInfoService.java +++ b/src/main/java/io/github/nginx/ops/client/service/ConfInfoService.java @@ -36,10 +36,6 @@ public interface ConfInfoService { */ String run(RunConfDTO dto); - /** - * 替换配置文件 - * - * @return - */ - String replace(ReplaceDTO dto); + /** 替换配置文件 */ + void replace(ReplaceDTO dto); } diff --git a/src/main/java/io/github/nginx/ops/client/service/impl/ConfInfoServiceImpl.java b/src/main/java/io/github/nginx/ops/client/service/impl/ConfInfoServiceImpl.java index e311405..4c5edf0 100644 --- a/src/main/java/io/github/nginx/ops/client/service/impl/ConfInfoServiceImpl.java +++ b/src/main/java/io/github/nginx/ops/client/service/impl/ConfInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.github.odiszapc.nginxparser.NgxConfig; import com.github.odiszapc.nginxparser.NgxDumper; import com.github.odiszapc.nginxparser.NgxParam; +import io.github.nginx.ops.client.comm.exception.BusinessException; import io.github.nginx.ops.client.domain.dto.GenerateConfDTO; import io.github.nginx.ops.client.domain.dto.ReplaceDTO; import io.github.nginx.ops.client.domain.dto.RunConfDTO; @@ -147,7 +148,7 @@ public String run(RunConfDTO dto) { } @Override - public String replace(ReplaceDTO dto) { + public void replace(ReplaceDTO dto) { // 清空原路径 FileUtil.clean(dto.getNginxConfPath()); // 复制临时文件到测试目录中 diff --git a/src/main/resources/bootstrap-test.yml b/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..c405ad9 --- /dev/null +++ b/src/main/resources/bootstrap-test.yml @@ -0,0 +1,14 @@ +spring: + cloud: + nacos: + # 注册中心(根据情况修改) + discovery: + enabled: false + # 配置中心(根据情况修改) + config: + enabled: false + +# 测试环境打印SQL脚本 +logging: + level: + io.github.nginx.ops: debug \ No newline at end of file diff --git a/src/main/resources/i18n/message/messages.properties b/src/main/resources/i18n/message/messages.properties new file mode 100644 index 0000000..7284ab4 --- /dev/null +++ b/src/main/resources/i18n/message/messages.properties @@ -0,0 +1 @@ +aaaa \ No newline at end of file diff --git a/src/main/resources/i18n/message/messages_en.properties b/src/main/resources/i18n/message/messages_en.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/i18n/message/messages_zh.properties b/src/main/resources/i18n/message/messages_zh.properties new file mode 100644 index 0000000..e69de29 From 757548085597122ddaba2067d32b9b965c112502 Mon Sep 17 00:00:00 2001 From: lihao Date: Sat, 20 Aug 2022 14:08:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ops/client/comm/config/I18nConfig.java | 40 +++++++++++++ .../nginx/ops/client/comm/domain/vo/R.java | 19 ++++--- .../comm/handler/RestExceptionHandler.java | 8 +++ .../ops/client/comm/util/MessageUtils.java | 57 +++++++++++++++++++ .../client/controller/ConfInfoController.java | 2 +- .../i18n/message/messages.properties | 2 +- .../i18n/message/messages_en.properties | 0 .../i18n/message/messages_en_US.properties | 1 + .../i18n/message/messages_zh.properties | 0 .../i18n/message/messages_zh_CN.properties | 1 + 10 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 src/main/java/io/github/nginx/ops/client/comm/config/I18nConfig.java create mode 100644 src/main/java/io/github/nginx/ops/client/comm/util/MessageUtils.java delete mode 100644 src/main/resources/i18n/message/messages_en.properties create mode 100644 src/main/resources/i18n/message/messages_en_US.properties delete mode 100644 src/main/resources/i18n/message/messages_zh.properties create mode 100644 src/main/resources/i18n/message/messages_zh_CN.properties diff --git a/src/main/java/io/github/nginx/ops/client/comm/config/I18nConfig.java b/src/main/java/io/github/nginx/ops/client/comm/config/I18nConfig.java new file mode 100644 index 0000000..c674cc2 --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/config/I18nConfig.java @@ -0,0 +1,40 @@ +package io.github.nginx.ops.client.comm.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.LocaleResolver; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; +import org.springframework.web.servlet.i18n.SessionLocaleResolver; + +import java.util.Locale; + +/** + * @author lihao3 + * @date 2022/8/20 + */ +@Configuration +public class I18nConfig implements WebMvcConfigurer { + + @Bean + public LocaleResolver localeResolver() { + SessionLocaleResolver session = new SessionLocaleResolver(); + // 默认语言 + session.setDefaultLocale(Locale.SIMPLIFIED_CHINESE); + return session; + } + + @Bean + public LocaleChangeInterceptor localeChangeInterceptor() { + LocaleChangeInterceptor local = new LocaleChangeInterceptor(); + // 参数名 + local.setParamName("lang"); + return local; + } + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(localeChangeInterceptor()); + } +} diff --git a/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java b/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java index 5c68054..54a53a6 100644 --- a/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java +++ b/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java @@ -1,6 +1,6 @@ package io.github.nginx.ops.client.comm.domain.vo; -import io.github.nginx.ops.client.comm.util.SpringUtils; +import io.github.nginx.ops.client.comm.util.MessageUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -24,6 +24,9 @@ @ApiModel("通用返回实体类") public class R implements Serializable { + /** 成功 */ + public static final String SUCCESS = "0000"; + /** 编码 */ @ApiModelProperty("返回编码") private String code; @@ -40,20 +43,20 @@ public class R implements Serializable { @ApiModelProperty("总条数") private long count; - public static R success(String code) { + public static R success(String message) { return R.builder() - .code(code) - .message(SpringUtils.getMessage(code, (Object) null)) + .code(SUCCESS) + .message(message) .time(System.currentTimeMillis()) .count(0L) .build(); } - public static R success(String code, T data) { + public static R success(String message, T data) { return (R) R.builder() - .code(code) - .message(SpringUtils.getMessage(code, (Object) null)) + .code(SUCCESS) + .message(message) .time(System.currentTimeMillis()) .data(data) .count(data instanceof Collection ? ((Collection) data).size() : 1L) @@ -63,7 +66,7 @@ public static R success(String code, T data) { public static R error(String code) { return R.builder() .code(code) - .message(SpringUtils.getMessage(code, (Object) null)) + .message(MessageUtils.getMessage(code)) .time(System.currentTimeMillis()) .build(); } diff --git a/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java b/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java index f62badd..b0c2a28 100644 --- a/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java +++ b/src/main/java/io/github/nginx/ops/client/comm/handler/RestExceptionHandler.java @@ -23,4 +23,12 @@ public R businessExceptionHandler(BusinessException e) { log.warn("业务异常警告, 异常编码为:{}, 异常信息为:{}", r.getCode(), r.getMessage()); return r; } + + // /** 自定义异常抛出 */ + // @ExceptionHandler(Exception.class) + // public R businessExceptionHandler(Exception e) { + // R r = R.error(e.getCode()); + // log.warn("业务异常警告, 异常编码为:{}, 异常信息为:{}", r.getCode(), r.getMessage()); + // return r; + // } } diff --git a/src/main/java/io/github/nginx/ops/client/comm/util/MessageUtils.java b/src/main/java/io/github/nginx/ops/client/comm/util/MessageUtils.java new file mode 100644 index 0000000..a873f79 --- /dev/null +++ b/src/main/java/io/github/nginx/ops/client/comm/util/MessageUtils.java @@ -0,0 +1,57 @@ +package io.github.nginx.ops.client.comm.util; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Component; + +import java.util.Locale; + +/** + * @author lihao3 + * @date 2022/8/20 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class MessageUtils { + + private static MessageSource messageSource; + + public MessageUtils(MessageSource messageSource) { + MessageUtils.messageSource = messageSource; + } + + /** + * @param message 消息所对应的变量名 + * @return 返回不包含变量的对应语言的消息 + * @author qbanxiaoli + * @description 从配置文件中找到message对应语言的消息 + */ + public static String getMessage(String message) { + // 获取当前请求的语言类型 + Locale locale = LocaleContextHolder.getLocale(); + // 返回配置文件中找到message对应语言的消息 + // 如果在指定的locale中没有找到消息，则使用默认的消息。 + return messageSource.getMessage(message, null, message, locale); + } + + /** + * @param message 消息所对应的变量名 + * @return 返回包含变量的对应语言的消息 + * @author qbanxiaoli + * @description 从配置文件中找到message对应语言的消息 + */ + public static String getMessage(String message, Object[] args) { + // 获取当前请求的语言类型 + Locale locale = LocaleContextHolder.getLocale(); + // 返回配置文件中找到message对应语言的消息 + // 如果在指定的locale中没有找到消息，则使用默认的消息。args中的参数将使用标准类库中的MessageFormat来作消息中替换值。 + return messageSource.getMessage(message, args, message, locale); + } + + public static void main(String[] args) { + MessageUtils.getMessage("0000"); + } +} diff --git a/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java b/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java index ea955c4..0011724 100644 --- a/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java +++ b/src/main/java/io/github/nginx/ops/client/controller/ConfInfoController.java @@ -87,6 +87,6 @@ public R> nodeList(String pid) { .build()); } } - return R.success("查询成功", fileVoList); + return R.success("获取成功!", fileVoList); } } diff --git a/src/main/resources/i18n/message/messages.properties b/src/main/resources/i18n/message/messages.properties index 7284ab4..42dd8d7 100644 --- a/src/main/resources/i18n/message/messages.properties +++ b/src/main/resources/i18n/message/messages.properties @@ -1 +1 @@ -aaaa \ No newline at end of file +0000=???? \ No newline at end of file diff --git a/src/main/resources/i18n/message/messages_en.properties b/src/main/resources/i18n/message/messages_en.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/i18n/message/messages_en_US.properties b/src/main/resources/i18n/message/messages_en_US.properties new file mode 100644 index 0000000..b50c730 --- /dev/null +++ b/src/main/resources/i18n/message/messages_en_US.properties @@ -0,0 +1 @@ +0000="select ok" \ No newline at end of file diff --git a/src/main/resources/i18n/message/messages_zh.properties b/src/main/resources/i18n/message/messages_zh.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/i18n/message/messages_zh_CN.properties b/src/main/resources/i18n/message/messages_zh_CN.properties new file mode 100644 index 0000000..42dd8d7 --- /dev/null +++ b/src/main/resources/i18n/message/messages_zh_CN.properties @@ -0,0 +1 @@ +0000=???? \ No newline at end of file From 0e42017e777a20c28bea4c8204e4a58054772829 Mon Sep 17 00:00:00 2001 From: lihao Date: Sat, 20 Aug 2022 17:11:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/nginx/ops/client/comm/domain/vo/R.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java b/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java index 54a53a6..e16334a 100644 --- a/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java +++ b/src/main/java/io/github/nginx/ops/client/comm/domain/vo/R.java @@ -1,6 +1,5 @@ package io.github.nginx.ops.client.comm.domain.vo; -import io.github.nginx.ops.client.comm.util.MessageUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -25,7 +24,9 @@ public class R implements Serializable { /** 成功 */ - public static final String SUCCESS = "0000"; + public static final String SUCCESS = "200"; + /** 成功 */ + public static final String ERROR = "500"; /** 编码 */ @ApiModelProperty("返回编码") @@ -63,11 +64,7 @@ public static R success(String message, T data) { .build(); } - public static R error(String code) { - return R.builder() - .code(code) - .message(MessageUtils.getMessage(code)) - .time(System.currentTimeMillis()) - .build(); + public static R error(String message) { + return R.builder().code(ERROR).message(message).time(System.currentTimeMillis()).build(); } }