diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java index b58b099c..326f8e8c 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java @@ -4,6 +4,7 @@ import com.ruoyi.common.security.config.ApplicationConfig; import com.ruoyi.common.security.feign.FeignAutoConfiguration; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScans; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; @@ -24,7 +25,7 @@ import java.lang.annotation.*; // 自动加载类 @Import({ ApplicationConfig.class, FeignAutoConfiguration.class }) //自定义bean扫描,添加xjs路径下的bean -@ComponentScan(basePackages = {"com.ruoyi","com.xjs"}) +@ComponentScans( {@ComponentScan("com.ruoyi"),@ComponentScan("com.xjs")} ) @EnableTransactionManagement public @interface EnableCustomConfig { diff --git a/ruoyi-ui/src/api/srb/core/integral.js b/ruoyi-ui/src/api/srb/core/integral.js new file mode 100644 index 00000000..e9fc3af1 --- /dev/null +++ b/ruoyi-ui/src/api/srb/core/integral.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +// 获取积分列表 +export function getList() { + return request({ + url: '/srb_core//admin/core/integralGrade/list', + method: 'get', + }) +} + +// 删除积分列表 +export function removeById(id) { + return request({ + url: '/srb_core//admin/core/integralGrade/remove/'+id, + method: 'delete', + }) +} + +// 新增积分列表 +export function save(integral) { + return request({ + url: '/srb_core//admin/core/integralGrade/save', + method: 'post', + data:integral + }) +} + + +// 修改积分列表 +export function update(integral) { + return request({ + url: '/srb_core//admin/core/integralGrade/update', + method: 'put', + data:integral + }) +} diff --git a/ruoyi-ui/src/views/srb/integral/add.vue b/ruoyi-ui/src/views/srb/integral/add.vue deleted file mode 100644 index 65ea51ec..00000000 --- a/ruoyi-ui/src/views/srb/integral/add.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/srb/integral/form.vue b/ruoyi-ui/src/views/srb/integral/form.vue new file mode 100644 index 00000000..93fe94d3 --- /dev/null +++ b/ruoyi-ui/src/views/srb/integral/form.vue @@ -0,0 +1,88 @@ + + + diff --git a/ruoyi-ui/src/views/srb/integral/index.vue b/ruoyi-ui/src/views/srb/integral/index.vue index 7acd9e58..fcae8184 100644 --- a/ruoyi-ui/src/views/srb/integral/index.vue +++ b/ruoyi-ui/src/views/srb/integral/index.vue @@ -1,10 +1,85 @@ diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java deleted file mode 100644 index ae439a00..00000000 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.xjs.config; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.LocaleResolver; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Locale; - -/** - * 自定义国际化解析器 - * todo 暂时未配置国际化 - * @author xiejs - * @since 2022-02-09 - */ -@Configuration -public class LocaleResolverConfig implements LocaleResolver { - @Override - public Locale resolveLocale(HttpServletRequest httpServletRequest) { - // 获取页面手动切换传递的语言参数l - String l = httpServletRequest.getParameter("l"); - // 获取请求头自动传递的语言参数Accept-Language - String header = httpServletRequest.getHeader("Accept-Language"); - Locale locale = null; - // 如果手动切换参数不为空,就根据手动参数进行语言切换,否则默认根据请求头信息切换 - if (!StringUtils.isEmpty(l)) { - String[] split = l.split("_"); - locale = new Locale(split[0], split[1]); - } else { - // Accept-Language: en-US,en;q=0.9 - String[] splits = header.split(","); - String[] split = splits[0].split("-"); - locale = new Locale(split[0], split[1]); - } - return locale; - } - - @Override - public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) { - - } - - @Bean - public LocaleResolver localeResolver(){ - return new LocaleResolverConfig(); - } -} diff --git a/xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories b/xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..61822cd7 --- /dev/null +++ b/xjs-business/xjs-business-common/src/main/resources/META-INF/spring.factories @@ -0,0 +1,7 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.xjs.config.FeignConfig,\ + com.xjs.config.JsonConfig,\ + com.xjs.config.MybatisPlusConfig,\ + com.xjs.config.WebMvcConfig + + diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java b/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java index 826542fb..e7d1831e 100644 --- a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java +++ b/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java @@ -63,7 +63,7 @@ public class IntegralGradeController extends MyBaseController { @ApiOperation("保存积分等级") @RequiresPermissions("srb:integralGrade:save") @Log(title = "融-积分管理", businessType = BusinessType.INSERT) - public AjaxResult save(IntegralGrade integralGrade) { + public AjaxResult save(@RequestBody IntegralGrade integralGrade) { return toAjax(integralGradeService.save(integralGrade)); }