diff --git a/src/main/resources/modules/SpringBoot/java/config/CacheConfig.java b/src/main/resources/modules/SpringBoot/java/config/CacheConfig.java
index 6e771e27..8748d31c 100644
--- a/src/main/resources/modules/SpringBoot/java/config/CacheConfig.java
+++ b/src/main/resources/modules/SpringBoot/java/config/CacheConfig.java
@@ -2,7 +2,6 @@ package ${domain}.config;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.DiskStoreConfiguration;
import org.springframework.cache.Cache;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.ehcache.EhCacheCacheManager;
@@ -30,10 +29,8 @@ public class CacheConfig {
@Bean
public EhCacheCacheManager getCacheManager() {
net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
- // todo 需根据服务器物理内存配置
- configuration.setMaxBytesLocalHeap("128M");
configuration.updateCheck(false);
- configuration.addDiskStore(new DiskStoreConfiguration().path("java.io.tmpdir"));
+ configuration.setUpdateCheck(false);
CacheManager cacheManager = CacheManager.create(configuration);
// 添加token缓存
@@ -52,6 +49,9 @@ public class CacheConfig {
config.setTimeToLiveSeconds(60 * 60);//最长有效时间
config.setTimeToIdleSeconds(60 * 60);//无访问最长有效时间
config.setName(TOKEN_CACHE);
+ // 分配最大内存的10%作为token的缓存空间
+ long memory = Runtime.getRuntime().maxMemory();
+ config.setMaxBytesLocalHeap((long) (memory * 0.1f));
return new net.sf.ehcache.Cache(config);
}
}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ResManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ResManagerImpl.java
index c368be30..5fb6ba3c 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ResManagerImpl.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ResManagerImpl.java
@@ -271,7 +271,7 @@ public class ResManagerImpl implements ResManager {
public void saveRes(String res, Token token) {
ResFindRequest resFindRequest = new ResFindRequest();
resFindRequest.setPageSize(0);
- resFindRequest.setResValue(res);
+ resFindRequest.setResValueLike(res);
ResManager resManager = LocalData.getBean(ResManager.class);
ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DataMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DataMapper.xml
new file mode 100644
index 00000000..cb96f0ff
--- /dev/null
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/DataMapper.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml
index 08a17d88..37539625 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml
@@ -4,8 +4,8 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
+
+
`SYS_DICT_ITEM`
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml
index bc16b7ab..6b7d65d8 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
`SYS_RES`
@@ -172,6 +172,9 @@
AND `RES_VALUE` = ${r'#'}{request.resValue}
+
+ AND `RES_VALUE` LIKE CONCAT('%',${r"#"}{request.resValueLike},'%')
+
AND `SUP_CODE` = ${r'#'}{request.supCode}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ResMapper.xml
index e29435f3..9233bf32 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ResMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ResMapper.xml
@@ -171,6 +171,9 @@
AND "RES_VALUE" = ${r'#'}{request.resValue}
+
+ AND "RES_VALUE" LIKE '%'||${r"#"}{request.resValueLike}||'%'
+
AND "SUP_CODE" = ${r'#'}{request.supCode}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml
index 8948fdbf..52383618 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml
@@ -4,6 +4,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+
"SYS_RES"
@@ -27,6 +30,7 @@
+
INSERT INTO
@@ -168,6 +172,9 @@
AND RES_VALUE = ${r"#"}{request.resValue}
+
+ AND RES_VALUE LIKE '%'||${r"#"}{request.resValueLike}||'%'
+
AND SUP_CODE = ${r"#"}{request.supCode}
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java
index fca1eb4d..af9e0e00 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java
@@ -35,6 +35,11 @@ public class ResFindRequest extends BaseFindRequest {
*/
private String resValue;
+ /**
+ * 资源内容模糊
+ */
+ private String resValueLike;
+
/**
* 上级代码
*/
@@ -97,6 +102,14 @@ public class ResFindRequest extends BaseFindRequest {
this.resValue = resValue;
}
+ public String getResValueLike() {
+ return this.resValueLike;
+ }
+
+ public void setResValueLike(String resValueLike) {
+ this.resValueLike = resValueLike;
+ }
+
public String getSupCode() {
return this.supCode;
}
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
index 5981d844..bfb4d289 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
@@ -167,6 +167,14 @@
+
+
+
+
+
+
+
+