diff --git a/src/main/java/xyz/wbsite/config/CacheConfig.java b/src/main/java/xyz/wbsite/config/CacheConfig.java deleted file mode 100644 index aed761c..0000000 --- a/src/main/java/xyz/wbsite/config/CacheConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -package xyz.wbsite.config; - -import net.sf.ehcache.Cache; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.config.CacheConfiguration; -import net.sf.ehcache.config.DiskStoreConfiguration; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cache.ehcache.EhCacheCacheManager; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableCaching -public class CacheConfig { - - public static final String TOKEN_CACHE = "tokenCache"; - - @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")); - CacheManager cacheManager = CacheManager.create(configuration); - - // 添加token缓存 - cacheManager.addCache(buildTokenCache()); - return new EhCacheCacheManager(cacheManager); - } - - /** - * 构建TokenCache - * - * @return 缓存 - */ - private Cache buildTokenCache() { - CacheConfiguration config = new CacheConfiguration(); - config.setMemoryStoreEvictionPolicy("LFU");//最少使用 - config.setTimeToLiveSeconds(60 * 60);//最长有效时间 - config.setTimeToIdleSeconds(60 * 60);//无访问最长有效时间 - config.setName(TOKEN_CACHE); - return new Cache(config); - } -} diff --git a/src/main/java/xyz/wbsite/task/TokenTask.java b/src/main/java/xyz/wbsite/task/TokenTask.java deleted file mode 100644 index 7dbb187..0000000 --- a/src/main/java/xyz/wbsite/task/TokenTask.java +++ /dev/null @@ -1,40 +0,0 @@ -package xyz.wbsite.task; - -import xyz.wbsite.frame.schedule.RunDelayRepeatTask; - -import java.time.Duration; - -public class TokenTask extends RunDelayRepeatTask { - - @Override - public String taskId() { - return "task1"; - } - - @Override - public Duration interval() { - return Duration.ofMinutes(1); - } - - @Override - public void run() { -// TokensManager tokensManager = LocalData.getBean(TokensManager.class); -// if (tokensManager == null) { -// return; -// } -// -// TokensFindRequest tokensFindRequest = new TokensFindRequest(); -// tokensFindRequest.setPageSize(0); -// tokensFindRequest.setValid(true); -// TokensFindResponse tokensFindResponse = tokensManager.find(tokensFindRequest, LocalData.getSysToken()); -// -// Date current = new Date(); -// for (Tokens tokens : tokensFindResponse.getResult()) { -// if (tokens.getValidTime().before(current)) { -// TokensLogoutRequest tokensLogoutRequest = new TokensLogoutRequest(); -// tokensLogoutRequest.setToken(tokens.getToken()); -// TokensLogoutResponse tokensLogoutResponse = tokensManager.logout(tokensLogoutRequest, LocalData.getSysToken()); -// } -// } - } -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 872448c..264b00e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,8 +12,8 @@ spring.http.encoding.charset=UTF-8 spring.http.encoding.enabled=true server.tomcat.uri-encoding=UTF-8 # 日志配置 -logging.path=D:// -logging.levels=DEBUG +#logging.path=D:// +logging.levels=INFO # SQLite spring.datasource.url=jdbc:sqlite::resource:example.db spring.datasource.driver-class-name=org.sqlite.JDBC spring.datasource.url=jdbc:sqlite:nginx-admin.db?date_string_format=yyyy-MM-dd HH:mm:ss diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 39f7b30..ef263ca 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -99,10 +99,10 @@ - - - - + + + + diff --git a/src/main/resources/start-dev.bat b/src/main/resources/start-dev.bat deleted file mode 100644 index f0acb47..0000000 --- a/src/main/resources/start-dev.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -cd %cd% -start java -Dfile.encoding=UTF-8 -jar nginx-admin-0.0.1-SNAPSHOT.jar --spring.profiles.active=dev \ No newline at end of file diff --git a/src/main/resources/start-prod.bat b/src/main/resources/start-prod.bat deleted file mode 100644 index f3b3495..0000000 --- a/src/main/resources/start-prod.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -cd %cd% -start java -Dfile.encoding=UTF-8 -jar nginx-admin-0.0.1-SNAPSHOT.jar --spring.profiles.active=prod \ No newline at end of file diff --git a/src/main/resources/start.bat b/src/main/resources/start.bat new file mode 100644 index 0000000..9838176 --- /dev/null +++ b/src/main/resources/start.bat @@ -0,0 +1,3 @@ +@echo off +cd %cd% +start java -Xmx256M -Dfile.encoding=UTF-8 -jar nginx-admin-0.0.1-SNAPSHOT.jar \ No newline at end of file diff --git a/src/main/resources/templates/screen/home.ftl b/src/main/resources/templates/screen/home.ftl index bf44991..32c05ac 100644 --- a/src/main/resources/templates/screen/home.ftl +++ b/src/main/resources/templates/screen/home.ftl @@ -92,41 +92,41 @@ type="selection" width="45"> - - + label="名称" + width="80"> + label="端口" + width="80"> + label="路径" + width="100"> + label="类型" + width="80"> + label="备注" + width="100">