feats

deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling-httpTrigger.json

@@ -21,7 +21,7 @@
       "authType": "anonymous"
     },
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2022-07-18T02:03:46Z",
+    "lastModifiedTime": "2022-07-18T07:56:57Z",
     "name": "httpTrigger"
   }
 }

deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling.json

@@ -8,13 +8,13 @@
     "timeout": 30,
     "initializer": "",
     "initializationTimeout": 3,
-    "codeSize": 69213899,
-    "codeChecksum": "3724623036147462201",
+    "codeSize": 69219873,
+    "codeChecksum": "8933832746482495729",
     "memorySize": 1024,
     "gpuMemorySize": null,
     "environmentVariables": {},
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2022-07-18T02:03:42Z",
+    "lastModifiedTime": "2022-07-18T07:56:50Z",
     "instanceConcurrency": 1,
     "instanceSoftConcurrency": null,
     "customContainerConfig": null,

deploy/.s/1636896505560465-cn-shanghai-stategrid-service.json

@@ -12,7 +12,7 @@
     },
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
     "createdTime": "2022-02-26T04:50:56Z",
-    "lastModifiedTime": "2022-07-18T02:03:46Z",
+    "lastModifiedTime": "2022-07-18T07:56:57Z",
     "vpcConfig": {
       "vpcId": "",
       "vSwitchIds": [],

deploy/.s/invoice-filling.stategrid.njyunzhi.com.json

@@ -33,5 +33,5 @@
     ]
   },
   "createdTime": "2022-07-18T02:03:47Z",
-  "lastModifiedTime": "2022-07-18T02:03:47Z"
+  "lastModifiedTime": "2022-07-18T07:56:57Z"
 }

src/main/java/com/njyunzhi/invoice/config/FilterConfig.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.invoice.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "yz.filter")
+public class FilterConfig {
+    List<String> annList;
+}

src/main/java/com/njyunzhi/invoice/config/SaTokenConfigure.java

@@ -1,39 +1,42 @@
 package com.njyunzhi.invoice.config;
 
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.filter.SaServletFilter;
 import cn.dev33.satoken.jwt.StpLogicJwtForStateless;
+import cn.dev33.satoken.router.SaHttpMethod;
+import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpLogic;
+import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.njyunzhi.invoice.common.ResponseBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Configuration
-public class SaTokenConfigure implements WebMvcConfigurer {
-
-    // 注册拦截器
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-
-        List<String> anonList = new ArrayList<>();
-        anonList.add("/swagger-ui/**");
-        anonList.add("/swagger-resources/**");
-        anonList.add("/v2/**");
-        anonList.add("/wxpay/notify/**");
-        anonList.add("/alipay/notify/**");
-        anonList.add("/**/sms-captcha");
-        anonList.add("/**/**/sms-captcha");
-        anonList.add("/**/preload");
-        anonList.add("/**/login");
-        anonList.add("/**/**/login");
-
-        // 注册Sa-Token的路由拦截器
-        registry.addInterceptor(new SaRouteInterceptor())
-                .addPathPatterns("/**")
-                .excludePathPatterns(anonList.toArray(new String[0]));
+public class SaTokenConfigure {
+
+    @Autowired
+    FilterConfig filterConfig;
+
+    @Bean
+    public SaServletFilter getSaServletFilter() {
+        SaServletFilter saServletFilter = new SaServletFilter();
+        saServletFilter.addInclude("/**");
+        saServletFilter.addExclude(filterConfig.getAnnList().toArray(new String[0]));
+        saServletFilter.setAuth(auth -> {
+            // OPTIONS 请求不校验, 主要是为了解决跨域问题
+            SaRouter.notMatch(SaHttpMethod.OPTIONS).check(r -> StpUtil.checkLogin());
+        });
+
+        saServletFilter.setError(err -> {
+            SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
+            SaHolder.getResponse().setStatus(200);
+            String jsonStr = JSONObject.toJSONString(ResponseBean.error(err.getMessage()));
+            return jsonStr;
+        });
+
+        return saServletFilter;
     }
 
 

src/main/java/com/njyunzhi/invoice/config/cros/CorsConfig.java

@@ -0,0 +1,38 @@
+package com.njyunzhi.invoice.config.cros;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.web.servlet.config.annotation.CorsRegistration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@SpringBootConfiguration
+public class CorsConfig implements WebMvcConfigurer {
+
+    @Autowired
+    CorsProperties crosProperties;
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        if (null == crosProperties.getEnabled() || !crosProperties.getEnabled()) return;
+
+//        //添加映射路径
+        CorsRegistration registration = registry.addMapping("/**");
+        //是否发送Cookie
+//        registration.allowCredentials(true);
+        // 域名
+        registration.allowedOrigins(toArray(crosProperties.getOrigins()));
+        //放行哪些请求方式
+        registration.allowedMethods(toArray(crosProperties.getMethods()));
+        //放行哪些原始请求头部信息
+        registration.allowedHeaders("*");
+        //暴露哪些原始请求头部信息
+        registration.exposedHeaders(toArray(crosProperties.getExposedHeaders()));
+    }
+
+    private String[] toArray(List<String> list) {
+        return list.toArray(new String[0]);
+    }
+}

src/main/java/com/njyunzhi/invoice/config/cros/CorsProperties.java

@@ -0,0 +1,17 @@
+package com.njyunzhi.invoice.config.cros;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "cors")
+public class CorsProperties {
+    Boolean enabled;
+    List<String> origins;
+    List<String> methods;
+    List<String> exposedHeaders;
+}

src/main/java/com/njyunzhi/invoice/exception/ErrorHandle.java

@@ -0,0 +1,19 @@
+package com.njyunzhi.invoice.exception;
+
+import com.njyunzhi.invoice.common.ResponseBean;
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@RestController
+public class ErrorHandle implements ErrorController {
+    @RequestMapping("/error")
+    public ResponseBean error(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setStatus(200);
+        return ResponseBean.error("系统错误");
+    }
+}

src/main/java/com/njyunzhi/invoice/exception/GlobalExceptionHandler.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 public class GlobalExceptionHandler {
 
     @ResponseBody
-    @ExceptionHandler(Exception.class)
+    @ExceptionHandler
     public ResponseBean handleException(Exception e){
         e.printStackTrace();
 

src/main/resources/application-dev.yml

@@ -21,3 +21,18 @@ wx:
         secret: 1111 # 公众号的appsecret
         token: 111 # 接口配置里的Token值
         aesKey: 111 # 接口配置里的EncodingAESKey值
+
+### 跨域
+cors:
+  enabled: true
+  origins:
+    - "http://localhost:8000"
+  exposedHeaders:
+    - Authorization
+    - Content-Disposition
+  methods:
+    - GET
+    - POST
+    - PUT
+    - DELETE
+    - OPTIONS

src/main/resources/application-prod.yml

@@ -7,3 +7,19 @@ spring:
     url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/invoice_fill?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: invoice_fill
     password: invoice_fill@ABCD1234
+
+### 跨域
+cors:
+  enabled: true
+  origins:
+    - http://h5.njyunzhi.com
+    - https://h5.njyunzhi.com
+  exposedHeaders:
+    - Authorization
+    - Content-Disposition
+  methods:
+    - GET
+    - POST
+    - PUT
+    - DELETE
+    - OPTIONS

src/main/resources/application.yml

@@ -16,6 +16,12 @@ logging:
 yz:
   mp:
     openidAPI: https://api.h5.njyunzhi.com/mp/openid?code=%s
+  filter:
+    annList:
+      - "/swagger-ui/**"
+      - "/swagger-resources/**"
+      - "/v2/**"
+      - "/**/login"
 
 ###
 mybatis-plus: