Browse Source

XssHttpServletRequestWrapper

fanxp 1 year ago
parent
commit
514e4ad7ea

+ 1 - 1
src/main/java/com/xjrsoft/common/xss/XssHttpServletRequestWrapper.java

@@ -29,7 +29,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
      */
     HttpServletRequest orgRequest;
 
-    private final List<String> ignoreXssUrl = ListUtil.toList("/magic-api/**");
+    private final List<String> ignoreXssUrl = ListUtil.toList("/magic-api/**","/magic/web/**");
     //html过滤
     private final static HTMLFilter HTML_FILTER = new HTMLFilter();
 

+ 5 - 0
src/main/java/com/xjrsoft/config/CommonPropertiesConfig.java

@@ -31,6 +31,11 @@ public class CommonPropertiesConfig {
      */
     private String domainWeb;
 
+    /**
+     * app域名地址
+     */
+    private String domainApp;
+
     private List<String> excludeUrls;
 
     private List<String> whiteList;

+ 4 - 1
src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -13,6 +13,7 @@ import com.xjrsoft.common.sms.SmsSender;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.WeChatUtil;
+import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.oa.entity.Message;
 import com.xjrsoft.module.oa.service.IMessageService;
 import com.xjrsoft.module.organization.entity.User;
@@ -71,6 +72,8 @@ public class SendMessageUtil {
 
         WeChatUtil weChatUtil = SpringUtil.getBean(WeChatUtil.class);
 
+        CommonPropertiesConfig cpConfig = SpringUtil.getBean(CommonPropertiesConfig.class);
+
         //获取用户相关信息
         List<User> userList = redisUtil.get(GlobalConstant.USER_CACHE_KEY, new TypeReference<List<User>>() {
         });
@@ -112,7 +115,7 @@ public class SendMessageUtil {
                 object.put("template_id", "sHsmz7LRj7HLd7GSTS3r2jCLvK-4Wp19iGzEvYK8n_I");
                 object.put("miniprogram", new JSONObject() {{
                     put("appid", weChatUtil.getAppletAppKey());
-                    put("pagepath", StrUtil.format("/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo", param.getTaskId(), param.getProcessId()));
+                    put("pagepath", StrUtil.format("{}/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo",cpConfig.getDomainApp(), param.getTaskId(), param.getProcessId()));
                 }});
                 object.put("client_msg_id", param.getTaskId());
                 object.put("data", data);

+ 1 - 0
src/main/resources/application-dev.yml

@@ -64,6 +64,7 @@ xjrsoft:
     druid-password: admin # druid 监控密码
     default-password: "cqtlzjzx2023" #默认密码(用户重置密码后为该密码)
     domain-api: http://10.150.10.139:8888/api #api域名地址
+    domain-app: http://10.150.10.139:8003/# #app域名地址
     domain-web: http://10.150.10.139:8888 #web域名地址
 #    domain-api: http://127.0.0.1:9000/api #api域名地址
 #    domain-web: http://127.0.0.1:9000 #web域名地址

+ 1 - 0
src/main/resources/application-prod.yml

@@ -62,6 +62,7 @@ xjrsoft:
     druid-password: admin # druid 监控密码
     default-password: "cqtlzjzx2023" #默认密码(用户重置密码后为该密码)
     domain-api: https://zhxy.cqtlzjzx.com/api #api域名地址
+    domain-app: https://zhxy.cqtlzjzx.com/app/# #app域名地址
     domain-web: https://zhxy.cqtlzjzx.com #web域名地址
     white-list:
       - 192.168.0.139