From c26a7a536f9b5319185fc806c26ede612dca1fb4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 14 八月 2023 17:45:03 +0800
Subject: [PATCH] 给资源表添加新的字段
---
src/main/java/com/moon/server/entity/sys/RoleResEntity.java | 10 ++++++++++
src/main/resources/mapper/sys/ResMapper.xml | 12 ++++++------
src/main/java/com/moon/server/entity/sys/ResEntity.java | 10 ++++++++++
src/main/resources/application.yml | 13 ++++++++-----
src/main/resources/mapper/sys/RoleResMapper.xml | 2 +-
5 files changed, 35 insertions(+), 12 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 7cf7edd..f54221f 100644
--- a/src/main/java/com/moon/server/entity/sys/ResEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/ResEntity.java
@@ -20,6 +20,8 @@
private int type;
+ private int data;
+
private int category;
private String url;
@@ -97,6 +99,14 @@
this.type = type;
}
+ public int getData() {
+ return data;
+ }
+
+ public void setData(int data) {
+ this.data = data;
+ }
+
public int getCategory() {
return category;
}
diff --git a/src/main/java/com/moon/server/entity/sys/RoleResEntity.java b/src/main/java/com/moon/server/entity/sys/RoleResEntity.java
index d087dca..2ce7302 100644
--- a/src/main/java/com/moon/server/entity/sys/RoleResEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/RoleResEntity.java
@@ -30,6 +30,8 @@
private Integer type;
+ private int data;
+
private Integer pid;
private Integer level;
@@ -121,6 +123,14 @@
this.type = type;
}
+ public int getData() {
+ return data;
+ }
+
+ public void setData(int data) {
+ this.data = data;
+ }
+
public Integer getPid() {
return pid;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7b24574..0b1279f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,10 @@
server:
tomcat:
uri-encoding: UTF-8
- max-connections: 1000
+ max-connections: 5000
+ max-http-form-post-size: 50MB
+ threads:
+ max: 2000
port: 9000
servlet:
context-path: /MoonServer
@@ -15,7 +18,7 @@
host: 192.168.20.83
port: 6369
password: rediS_5L#F4_Server
- timeout: 90000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
+ timeout: 10000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
lettuce:
pool:
max-active: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -117,8 +120,8 @@
remote:
maxTotalConnect: 0
maxConnectPerRoute: 1000
- connectTimeout: 5000
- readTimeout: 1800000
+ connectTimeout: 30000
+ readTimeout: -1
# 绯荤粺閰嶇疆
sys:
@@ -127,7 +130,7 @@
# IIS鐨勪富鏈哄湴鍧�
iisHost: 127.0.0.1
# FME鏈嶅姟鍦板潃
- fmeUrl: http://192.168.20.83:88/
+ fmeUrl: http://192.168.20.205:88/
# 鍑哄浘鏈嶅姟
exportServer: http://127.0.0.1/ExportMap
#exportServer: http://192.168.20.83:80/ExportMap
diff --git a/src/main/resources/mapper/sys/ResMapper.xml b/src/main/resources/mapper/sys/ResMapper.xml
index 4ce5fc9..1e901b0 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
- (cn_name,en_name,status,type,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
+ (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
values
- (#{cnName},#{enName},#{status},#{type},#{category},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{createUser},now(),#{bak},#{tab},#{args})
+ (#{cnName},#{enName},#{status},#{type},#{data},#{category},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{createUser},now(),#{bak},#{tab},#{args})
</insert>
<insert id="inserts">
insert into lf.sys_res
- (cn_name,en_name,status,type,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
+ (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.cnName},#{item.enName},#{item.status},#{item.type},#{item.category},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args})
+ (#{item.cnName},#{item.enName},#{item.status},#{item.type},#{item.data},#{item.category},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args})
</foreach>
</insert>
@@ -86,14 +86,14 @@
<update id="update">
update lf.sys_res
- set cn_name=#{cnName},en_name=#{enName},status=#{status},type=#{type},category=#{category},url=#{url},test=#{test},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args}
+ set cn_name=#{cnName},en_name=#{enName},status=#{status},type=#{type},data=#{data},category=#{category},url=#{url},test=#{test},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},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 cn_name=#{item.cnName},en_name=#{item.enName},status=#{item.status},type=#{item.type},category=#{item.category},url=#{item.url},test=#{item.test},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args}
+ set cn_name=#{item.cnName},en_name=#{item.enName},status=#{item.status},type=#{item.type},data=#{item.data},category=#{item.category},url=#{item.url},test=#{item.test},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args}
where id = #{item.id}
</foreach>
</update>
diff --git a/src/main/resources/mapper/sys/RoleResMapper.xml b/src/main/resources/mapper/sys/RoleResMapper.xml
index 2150780..7e2142c 100644
--- a/src/main/resources/mapper/sys/RoleResMapper.xml
+++ b/src/main/resources/mapper/sys/RoleResMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.moon.server.mapper.sys.RoleResMapper">
<select id="selectResByRole" resultType="com.moon.server.entity.sys.RoleResEntity">
with rs as (select id, resid from lf.sys_role_res where roleid = #{roleid})
- select (select id from rs b where b.resid = a.id) "id", a.id "resid", a.cn_name, a.en_name, a.type, a.tab
+ select (select id from rs b where b.resid = a.id) "id", a.id "resid", a.cn_name, a.en_name, a.type, a.data, a.tab
from lf.sys_res a;
</select>
--
Gitblit v1.9.3