From 6a93d22890ca92fce02b11eaf2fb910838967700 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 七月 2023 10:18:22 +0800
Subject: [PATCH] 资源类添加args字段
---
src/main/java/com/moon/server/service/sys/ProxyService.java | 10 +++++-----
src/main/resources/mapper/sys/ResMapper.xml | 12 ++++++------
src/main/java/com/moon/server/entity/sys/ResEntity.java | 10 ++++++++++
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moon/server/entity/sys/ResEntity.java b/src/main/java/com/moon/server/entity/sys/ResEntity.java
index 30994cb..2c4407a 100644
--- a/src/main/java/com/moon/server/entity/sys/ResEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/ResEntity.java
@@ -30,6 +30,8 @@
private String url;
+ private String args;
+
private String test;
private String proxy;
@@ -143,6 +145,14 @@
this.url = url;
}
+ public String getArgs() {
+ return args;
+ }
+
+ public void setArgs(String args) {
+ this.args = args;
+ }
+
public String getTest() {
return test;
}
diff --git a/src/main/java/com/moon/server/service/sys/ProxyService.java b/src/main/java/com/moon/server/service/sys/ProxyService.java
index fdaccde..f956b77 100644
--- a/src/main/java/com/moon/server/service/sys/ProxyService.java
+++ b/src/main/java/com/moon/server/service/sys/ProxyService.java
@@ -63,10 +63,7 @@
insertLog(req, ue, resId);
- String url = getSourceUrl(req, entity, token);
- if (isRest) {
- url = url.replace("/wmts/layer/", "/rest/layer/");
- }
+ String url = getSourceUrl(req, entity, token, isRest);
res.setHeader("token", token);
forward(req, res, entity, url);
}
@@ -239,11 +236,14 @@
/**
* 鑾峰彇鍘熷Url
*/
- private String getSourceUrl(HttpServletRequest req, ResEntity entity, String token) {
+ private String getSourceUrl(HttpServletRequest req, ResEntity entity, String token, boolean isRest) {
String proxyUrl = entity.getProxy().replace("{token}", token);
int end = req.getRequestURL().indexOf(proxyUrl) + proxyUrl.length();
String url = entity.getUrl() + req.getRequestURL().substring(end);
+ if (isRest) {
+ url = url.replace("/wmts/layer/", "/rest/layer/");
+ }
if (null != req.getQueryString()) {
url = url + (entity.getUrl().contains("?") ? "&" : "?") + req.getQueryString();
}
diff --git a/src/main/resources/mapper/sys/ResMapper.xml b/src/main/resources/mapper/sys/ResMapper.xml
index 15ffde3..23689b9 100644
--- a/src/main/resources/mapper/sys/ResMapper.xml
+++ b/src/main/resources/mapper/sys/ResMapper.xml
@@ -59,17 +59,17 @@
<insert id="insert" parameterType="com.moon.server.entity.sys.ResEntity">
insert into lf.sys_res
- (pid,cn_name,en_name,type,status,category,firm,url,test,descr,depid,dirid,img,level,sort,create_user,create_time,bak,tab)
+ (pid,cn_name,en_name,type,status,category,firm,url,test,descr,depid,dirid,img,level,sort,create_user,create_time,bak,tab,args)
values
- (#{pid},#{cnName},#{enName},#{type},#{status},#{category},#{firm},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{level},#{sort},#{createUser},now(),#{bak},#{tab})
+ (#{pid},#{cnName},#{enName},#{type},#{status},#{category},#{firm},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{level},#{sort},#{createUser},now(),#{bak},#{tab},#{args})
</insert>
<insert id="inserts">
insert into lf.sys_res
- (pid,cn_name,en_name,type,status,category,firm,url,test,descr,depid,dirid,img,level,sort,create_user,create_time,bak,tab)
+ (pid,cn_name,en_name,type,status,category,firm,url,test,descr,depid,dirid,img,level,sort,create_user,create_time,bak,tab,args)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.cnName},#{item.enName},#{item.type},#{item.status},#{item.category},#{item.firm},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.level},#{item.sort},#{item.createUser},now(),#{item.bak},#{item.tab})
+ (#{item.pid},#{item.cnName},#{item.enName},#{item.type},#{item.status},#{item.category},#{item.firm},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.level},#{item.sort},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args})
</foreach>
</insert>
@@ -86,14 +86,14 @@
<update id="update">
update lf.sys_res
- set pid=#{pid},cn_name=#{cnName},en_name=#{enName},type=#{type},status=#{status},category=#{category},firm=#{firm},url=#{url},test=#{test},proxy=#{proxy},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},level=#{level},sort=#{sort},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab}
+ set pid=#{pid},cn_name=#{cnName},en_name=#{enName},type=#{type},status=#{status},category=#{category},firm=#{firm},url=#{url},test=#{test},proxy=#{proxy},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},level=#{level},sort=#{sort},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args}
where id=#{id}
</update>
<update id="updates">
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_res
- set pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},type=#{item.type},status=#{item.status},category=#{item.category},firm=#{item.firm},url=#{item.url},test=#{item.test},proxy=#{item.proxy},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},level=#{item.level},sort=#{item.sort},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab}
+ set pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},type=#{item.type},status=#{item.status},category=#{item.category},firm=#{item.firm},url=#{item.url},test=#{item.test},proxy=#{item.proxy},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},level=#{item.level},sort=#{item.sort},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args}
where id = #{item.id}
</foreach>
</update>
--
Gitblit v1.9.3