From e49dc747e78c8429460c0c80405de17372f8c4b2 Mon Sep 17 00:00:00 2001 From: hjc <459774188@qq.com> Date: Thu, 19 Dec 2019 22:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BssVatInvoiceController.java | 2 +- .../controller/api/BssApiBizController.java | 4 +- .../templates/business/enterprise/index.html | 2 +- .../cwhelp/common/config/WebMvcConfig.java | 23 ++++++++++ .../cwhelp/common/filter/ApiLoginFilter.java | 8 ++-- .../interceptor/ApiLoginInterceptor.java | 46 +++++++++++++++++++ .../component/shiro/config/ShiroConfig.java | 1 + .../modules/business/domain/BssGoods.java | 2 +- .../cwhelp/modules/system/domain/User.java | 2 +- .../service/impl/ApiBizServiceImpl.java | 4 +- pom.xml | 7 +++ 11 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 common/src/main/java/com/cwhelp/common/config/WebMvcConfig.java create mode 100644 common/src/main/java/com/cwhelp/common/interceptor/ApiLoginInterceptor.java diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java index d72d94c..85a7206 100644 --- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java +++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java @@ -247,7 +247,7 @@ public class BssVatInvoiceController { good.setUnit(commodityUnits.get(i).getWord()); } if (ToolUtil.checkListSize(commodityNums) && !StringUtil.isBlank(commodityNums.get(i).getWord())) { - good.setNum(Integer.valueOf(commodityNums.get(i).getWord())); + good.setNum(Double.valueOf(commodityNums.get(i).getWord())); } if (ToolUtil.checkListSize(commodityPrices) && commodityPrices.size() > i && !StringUtil.isBlank(commodityPrices.get(i).getWord())) { good.setUnitPrice(commodityPrices.get(i).getWord()); diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/api/BssApiBizController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/api/BssApiBizController.java index 4fad657..01fb9e5 100644 --- a/admin/src/main/java/com/cwhelp/admin/business/controller/api/BssApiBizController.java +++ b/admin/src/main/java/com/cwhelp/admin/business/controller/api/BssApiBizController.java @@ -15,14 +15,13 @@ import com.cwhelp.modules.system.service.ApiBizService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import java.io.File; /** * Created by huangjc on 2019/12/1 0001. */ @RestController -@RequestMapping("/api_biz") +@RequestMapping("/apiBiz") public class BssApiBizController { @Autowired @@ -63,6 +62,7 @@ public class BssApiBizController { return ResultVoUtil.success(ApiConst.API_OPT_SUCCESS_MSG, vatInvoice); } catch (Exception e) { + e.printStackTrace(); return new ResultVo(ApiConst.API_UPLOAD_PICTURE_FAILED_CODE, ApiConst.API_UPLOAD_PICTURE_FAILED_MSG); } diff --git a/admin/src/main/resources/templates/business/enterprise/index.html b/admin/src/main/resources/templates/business/enterprise/index.html index d026fa4..777ba45 100644 --- a/admin/src/main/resources/templates/business/enterprise/index.html +++ b/admin/src/main/resources/templates/business/enterprise/index.html @@ -5,7 +5,7 @@
- 账套信息管理 + 客户公司信息管理
diff --git a/common/src/main/java/com/cwhelp/common/config/WebMvcConfig.java b/common/src/main/java/com/cwhelp/common/config/WebMvcConfig.java new file mode 100644 index 0000000..6a83d7f --- /dev/null +++ b/common/src/main/java/com/cwhelp/common/config/WebMvcConfig.java @@ -0,0 +1,23 @@ +package com.cwhelp.common.config; + +import com.cwhelp.common.interceptor.ApiLoginInterceptor; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.Arrays; + +/** + * Created by huangjc on 2019/12/19 0019. + */ +@SpringBootConfiguration +public class WebMvcConfig implements WebMvcConfigurer { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + + registry.addInterceptor(new ApiLoginInterceptor()).addPathPatterns("/apiBiz/**") + .addPathPatterns("/api/biz/**").excludePathPatterns(Arrays.asList("/css/**", "/js/**", "/images/**", "/lib/**")); + + } +} diff --git a/common/src/main/java/com/cwhelp/common/filter/ApiLoginFilter.java b/common/src/main/java/com/cwhelp/common/filter/ApiLoginFilter.java index a796195..a43c261 100644 --- a/common/src/main/java/com/cwhelp/common/filter/ApiLoginFilter.java +++ b/common/src/main/java/com/cwhelp/common/filter/ApiLoginFilter.java @@ -15,9 +15,9 @@ import java.io.PrintWriter; /** * Created by huangjc on 2019/12/10 0010. */ -@Component -@ServletComponentScan -@WebFilter(filterName = "apiLoginFilter", urlPatterns = {"/api_biz/*", "/api/biz/*"}) +//@Component +//@ServletComponentScan +//@WebFilter(filterName = "apiLoginFilter", urlPatterns = {"/api_biz/*", "/api/biz/*"}) public class ApiLoginFilter implements Filter { @Override @@ -28,7 +28,7 @@ public class ApiLoginFilter implements Filter { HttpSession session = request.getSession(); if(session.getAttribute(token) == null){ response.setStatus(401); - response.setContentType("text/html;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); PrintWriter writer = response.getWriter(); JSONObject json = new JSONObject(); json.put("code","401"); diff --git a/common/src/main/java/com/cwhelp/common/interceptor/ApiLoginInterceptor.java b/common/src/main/java/com/cwhelp/common/interceptor/ApiLoginInterceptor.java new file mode 100644 index 0000000..a1b949d --- /dev/null +++ b/common/src/main/java/com/cwhelp/common/interceptor/ApiLoginInterceptor.java @@ -0,0 +1,46 @@ +package com.cwhelp.common.interceptor; + +import com.alibaba.fastjson.JSONObject; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.PrintWriter; + +/** + * Created by huangjc on 2019/12/19 0019. + */ +@Component +public class ApiLoginInterceptor extends HandlerInterceptorAdapter { + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + + String token = request.getHeader("token"); + HttpSession session = request.getSession(); + if(session.getAttribute(token) == null){ + response.setStatus(401); + response.setContentType("application/json;charset=utf-8"); + PrintWriter writer = response.getWriter(); + JSONObject json = new JSONObject(); + json.put("code","401"); + json.put("msg","请先登录！"); + writer.print(json); + return false; + } + return true; + } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + + } +} diff --git a/component/shiro/src/main/java/com/cwhelp/component/shiro/config/ShiroConfig.java b/component/shiro/src/main/java/com/cwhelp/component/shiro/config/ShiroConfig.java index 8da81b2..d35820c 100644 --- a/component/shiro/src/main/java/com/cwhelp/component/shiro/config/ShiroConfig.java +++ b/component/shiro/src/main/java/com/cwhelp/component/shiro/config/ShiroConfig.java @@ -48,6 +48,7 @@ public class ShiroConfig { LinkedHashMap filterMap = new LinkedHashMap<>(); filterMap.put("/login", "anon"); filterMap.put("/api/me/login", "anon"); + filterMap.put("/apiBiz/**", "anon"); filterMap.put("/logout", "anon"); filterMap.put("/captcha", "anon"); filterMap.put("/noAuth", "anon"); diff --git a/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssGoods.java b/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssGoods.java index a877889..eaf7124 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssGoods.java +++ b/modules/system/src/main/java/com/cwhelp/modules/business/domain/BssGoods.java @@ -32,7 +32,7 @@ public class BssGoods implements Serializable { private Long id; private String name; // 数量 - private Integer num; + private Double num; // 细节金额 @Column(name = "detail_amount") private BigDecimal detailAmount; diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/domain/User.java b/modules/system/src/main/java/com/cwhelp/modules/system/domain/User.java index 701ede6..9ae1105 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/domain/User.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/domain/User.java @@ -72,7 +72,7 @@ public class User implements Serializable { private BssPlatform bssPlatform; - @ManyToMany(fetch = FetchType.LAZY) + @ManyToMany(fetch = FetchType.EAGER) @JoinTable(name = "sys_user_role", joinColumns = @JoinColumn(name="user_id"), inverseJoinColumns = @JoinColumn(name = "role_id")) diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/ApiBizServiceImpl.java b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/ApiBizServiceImpl.java index be6346c..30ed7a1 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/ApiBizServiceImpl.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/ApiBizServiceImpl.java @@ -86,7 +86,7 @@ public class ApiBizServiceImpl implements ApiBizService{ good.setUnit(commodityUnits.get(i).getWord()); } if (ToolUtil.checkListSize(commodityNums) && !StringUtil.isBlank(commodityNums.get(i).getWord())) { - good.setNum(Integer.valueOf(commodityNums.get(i).getWord())); + good.setNum(Double.valueOf(commodityNums.get(i).getWord())); } if (ToolUtil.checkListSize(commodityPrices) && commodityPrices.size() > i && !StringUtil.isBlank(commodityPrices.get(i).getWord())) { good.setUnitPrice(commodityPrices.get(i).getWord()); @@ -128,7 +128,7 @@ public class ApiBizServiceImpl implements ApiBizService{ BssGoods good = new BssGoods(); good.setName(InvoiceTypeEnum.TRAIN_INVOICE.getName()); good.setDetailAmount(new BigDecimal(wordsResult.getTicketRates())); - good.setNum(1); + good.setNum(1d); good.setUnit("张"); good.setUnitPrice(wordsResult.getTicketRates()); goods.add(good); diff --git a/pom.xml b/pom.xml index 73fc737..3ed3b80 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,13 @@ org.springframework.boot spring-boot-starter-web + +