Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!104

mp-admin/src/main/java/com/qs/mp/handler/auth/SignInterceptor.java

@@ -52,7 +52,9 @@ public class SignInterceptor implements HandlerInterceptor {
             String timestamp = request.getHeader("x-zz-timestamp");
             //进行sign验证
             String[] signs = request.getParameterValues("sign");
-            if (request.getRequestURI().indexOf("/wx/urlschema/generate") > 0) {
+
+            if (request.getRequestURI().equals("/api/v1/mp/wx/urlschema/generate")) {
+                // 小程序跳转页面请求
                 LogUtil.debug(logger, "requestURI:" + request.getRequestURI());
                 return true;
             }
@@ -64,13 +66,6 @@ public class SignInterceptor implements HandlerInterceptor {
             if(StringUtils.isBlank(body)){
                 logger.info("request body is null. request url:"+getRequestInfo(request));
                 //response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-                // 上传文件的时候，body里只有文件流，custId在request参数里
-                String custId = request.getParameter("custId");
-                if(!StringUtils.isBlank(custId)){
-                    LoginUser loginUser = hostHolder.getUser();
-//                    loginUser.setCustId(custId);
-                    hostHolder.setUser(loginUser);
-                }
                 return true;
             }
 
@@ -91,20 +86,7 @@ public class SignInterceptor implements HandlerInterceptor {
                 response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
                 return false;
             }*/
-            //特殊处理，通过拦截器注入线程对象属性custId modify by duota 2021.09.09
-            try {
-                if (JSONObject.isValidObject(body)) {
-                    JSONObject jsonObject = JSONObject.parseObject(body);
-                    String custId = jsonObject.getString("custId");
-                    if (!StringUtils.isBlank(custId)) {
-                        LoginUser loginUser = hostHolder.getUser();
-//                        loginUser.setCustId(custId);
-                        hostHolder.setUser(loginUser);
-                    }
-                }
-            }catch (Exception e){
-                LogUtil.error(logger, e, "拦截器处理custId异常，body:{0}", body );
-            }
+
         }
         return true;
     }

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -146,7 +146,7 @@ public class TicketBoxMgrController extends BaseApiController {
 
 	@Log(title = "盲票导入", businessType = BusinessType.IMPORT)
 	@PostMapping("/importTicket")
-	public AjaxResult importTicket(MultipartFile file, boolean updateSupport) {
+	public AjaxResult importTicket(MultipartFile file) {
 		// 获取文件内的盲票数据列表
 		try {
 			ExcelUtil<TicketExcel> util = new ExcelUtil<TicketExcel>(TicketExcel.class);

mp-service/src/main/java/com/qs/mp/framework/service/impl/WxUrlLinkServiceImpl.java

@@ -71,7 +71,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     Map<String, Object> jumpParam = new HashMap<>();
     jumpParam.put("path", path);
     jumpParam.put("query", query);
-    jumpParam.put("env_version", "release");
+    jumpParam.put("env_version", "trial");
     param.put("jump_wxa", jumpParam);
     // 有效时间超过31天的 Link 或永久有效的 Link 为长期有效Link，
     // 单个小程序总共可生成长期有效 Link 上限为10万个，请谨慎调用