From 742791775204f1d75429a4aeeeeebbd7884eb4b8 Mon Sep 17 00:00:00 2001 From: "862857010@qq.com" <862857010@> Date: Fri, 16 Jun 2023 11:49:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=AF=E7=94=A8=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PublicOpinionMediaInformationController.java | 6 +++--- .../PublicOpinionMediaInformationMapper.xml | 3 ++- .../java/com/ruoyi/framework/config/SecurityConfig.java | 8 ++++---- .../management/electronic-patrol/patrol-task/index.vue | 3 ++- ruoyi-ui/vue.config.js | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cjy-project/src/main/java/com/cjy/publicopiniondatacenter/controller/PublicOpinionMediaInformationController.java b/cjy-project/src/main/java/com/cjy/publicopiniondatacenter/controller/PublicOpinionMediaInformationController.java index c6e52b3b..1e8c048f 100644 --- a/cjy-project/src/main/java/com/cjy/publicopiniondatacenter/controller/PublicOpinionMediaInformationController.java +++ b/cjy-project/src/main/java/com/cjy/publicopiniondatacenter/controller/PublicOpinionMediaInformationController.java @@ -112,12 +112,12 @@ public class PublicOpinionMediaInformationController extends BaseController return toAjax(publicOpinionMediaInformationService.deletePublicOpinionMediaInformationByIds(ids)); } - @RequestMapping(value ="/disabledMedia/{id}") - public AjaxResult disabledMedia(@PathVariable("id") Long id) + @RequestMapping(value ="/disabledMedia/{id}/{status}") + public AjaxResult disabledMedia(@PathVariable("id") Long id,@PathVariable("status") String status) { PublicOpinionMediaInformation publicOpinionMediaInformation= new PublicOpinionMediaInformation(); publicOpinionMediaInformation.setId(id); - publicOpinionMediaInformation.setStatus("1"); + publicOpinionMediaInformation.setStatus(status); return success(publicOpinionMediaInformationService.updatePublicOpinionMediaInformation(publicOpinionMediaInformation)); } } diff --git a/cjy-project/src/main/resources/mapper/publicopiniondatacenter/PublicOpinionMediaInformationMapper.xml b/cjy-project/src/main/resources/mapper/publicopiniondatacenter/PublicOpinionMediaInformationMapper.xml index 501c31f3..b4d269bd 100644 --- a/cjy-project/src/main/resources/mapper/publicopiniondatacenter/PublicOpinionMediaInformationMapper.xml +++ b/cjy-project/src/main/resources/mapper/publicopiniondatacenter/PublicOpinionMediaInformationMapper.xml @@ -39,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mi.create_time, mi.update_by, mi.update_time, - mi.organ_code + mi.organ_code, + mi.status FROM public_opinion_media_information mi LEFT JOIN md_marketing_config sc on mi.source_type_id=sc.id diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 8fda3198..a6b3693b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -22,7 +22,7 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 - * + * * @author ruoyi */ @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) @@ -33,7 +33,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter */ @Autowired private UserDetailsService userDetailsService; - + /** * 认证失败处理类 */ @@ -51,7 +51,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter */ @Autowired private JwtAuthenticationTokenFilter authenticationTokenFilter; - + /** * 跨域过滤器 */ @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/login", "/register", "/captchaImage","/enterprise/loginPageConfig","/app/login").permitAll() + .antMatchers("/device/**","/login", "/register", "/captchaImage","/enterprise/loginPageConfig","/app/login").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue b/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue index 7d47ca05..7a7f216f 100644 --- a/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue +++ b/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue @@ -185,7 +185,8 @@ label="任务事项" prop="taskMatter">
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index bab736dc..81ce7d8a 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -36,8 +36,8 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023! - // target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! - // target: `http://192.168.130.102:8080/`,//用户名:admin 密码Cjy@123abc + // target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! + // target: `http://192.168.0.229:8080/`,//用户名:admin 密码Cjy@123abcc changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''