diff --git a/dsBase/src/main/java/Tools/Init/clearDataBase.java b/dsBase/src/main/java/Tools/Init/clearDataBase.java index b4ecc45d..a5ff8e0d 100644 --- a/dsBase/src/main/java/Tools/Init/clearDataBase.java +++ b/dsBase/src/main/java/Tools/Init/clearDataBase.java @@ -1,7 +1,7 @@ package Tools.Init; import cn.hutool.core.date.DateTime; -import com.dsideal.dsBase.Start; +import com.dsideal.dsBase.BaseApplication; import com.dsideal.dsBase.Util.CommonUtil; import com.dsideal.dsBase.Util.PkUtil; import com.jfinal.kit.PropKit; @@ -46,7 +46,7 @@ public class clearDataBase { arp.setDialect(new PostgreSqlDialect()); //应用系统Sql模板 - String basePath = Start.class.getClassLoader().getResource(".").getPath(); + String basePath = BaseApplication.class.getClassLoader().getResource(".").getPath(); File sqlDir = new File(basePath + "/Sql"); for (File sqlFile : Objects.requireNonNull(sqlDir.listFiles())) { if (sqlFile.getName().indexOf(".sql") > 0) { diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Start.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java similarity index 91% rename from dsBase/src/main/java/com/dsideal/dsBase/Start.java rename to dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java index cb0a567e..848b113a 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Start.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java @@ -31,10 +31,10 @@ import lombok.SneakyThrows; import java.io.File; import java.util.Objects; -public class Start extends JFinalConfig { +public class BaseApplication extends JFinalConfig { public static void main(String[] args) { PropKit.use("application.properties"); - UndertowServer.create(Start.class, "undertow.properties").start(); + UndertowServer.create(BaseApplication.class, "undertow.properties").start(); } /** @@ -90,7 +90,7 @@ public class Start extends JFinalConfig { me.add(hp); ActiveRecordPlugin arp = new ActiveRecordPlugin(hp); arp.setDialect(new PostgreSqlDialect()); - String basePath = Start.class.getClassLoader().getResource(".").getPath(); + String basePath = BaseApplication.class.getClassLoader().getResource(".").getPath(); File sqlDir = new File(basePath + "/Sql"); for (File sqlFile : Objects.requireNonNull(sqlDir.listFiles())) { if (sqlFile.getName().indexOf(".sql") > 0) { @@ -160,7 +160,7 @@ public class Start extends JFinalConfig { @Override public void onStart() { //打印 启动Logo - String path = Start.class.getClassLoader().getResource("logo.txt").getPath(); + String path = BaseApplication.class.getClassLoader().getResource("logo.txt").getPath(); File file = new File(path); System.out.println(FileUtil.readUtf8String(file)); diff --git a/dsBase/src/main/resources/application.properties b/dsBase/src/main/resources/application.properties index 645021ca..4c068d97 100644 --- a/dsBase/src/main/resources/application.properties +++ b/dsBase/src/main/resources/application.properties @@ -14,10 +14,6 @@ SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM # 首页 first_page=/login.html -# 在线人数统计,超过10分钟算法离线,10分钟以内有调用接口的行为算在线,同时,需要维护已登录在线人数,和未登录在线人数两个数据 -action_set_login=ACTION_SET_LOGIN -action_set_nologin=ACTION_SET_NOLOGIN - # 导出excel 的模板配置路径 excelExportTemplatePathSuffix=/ExcelExportTemplate/ diff --git a/dsBase/src/main/resources/undertow.properties b/dsBase/src/main/resources/undertow.properties index 11216302..bedcf4fd 100644 --- a/dsBase/src/main/resources/undertow.properties +++ b/dsBase/src/main/resources/undertow.properties @@ -1,6 +1,6 @@ # true 值支持热加载 undertow.devMode=false -undertow.port=9000 +undertow.port=8001 undertow.host=0.0.0.0 #undertow.resourcePath=/usr/local/tomcat8/webapps/dsBase,classpath:static undertow.resourcePath=D:/dsWork/dsProject/dsBase/WebRoot,classpath:static diff --git a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java index a59369e0..3bded704 100644 --- a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java +++ b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java @@ -7,6 +7,8 @@ import com.dsideal.gw.Util.CommonUtil; import com.dsideal.gw.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.Prop; +import com.jfinal.kit.PropKit; +import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; import lombok.SneakyThrows; @@ -88,6 +90,9 @@ public class GwApplication extends JFinalConfig { @Override public void configPlugin(Plugins me) { + //加载Redis插件 + RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis.ip"),PropKit.getInt("redis.port"), 10000); + me.add(redis); } /** diff --git a/dsGw/src/main/resources/application_dev.yaml b/dsGw/src/main/resources/application_dev.yaml index cb1ee97b..72e990ab 100644 --- a/dsGw/src/main/resources/application_dev.yaml +++ b/dsGw/src/main/resources/application_dev.yaml @@ -13,6 +13,10 @@ route: dsRes: url: http://ds-res:8002 +# redis +redis: + ip: 10.10.14.14 + port: 18890 # 白名单 whitelist: diff --git a/dsGw/src/main/resources/application_pro.yaml b/dsGw/src/main/resources/application_pro.yaml index e75ed049..9e484338 100644 --- a/dsGw/src/main/resources/application_pro.yaml +++ b/dsGw/src/main/resources/application_pro.yaml @@ -12,6 +12,11 @@ route: dsRes: url: http://ds-res:8002 +# redis +redis: + ip: 10.10.14.14 + port: 18890 + # 白名单 whitelist: # 全局变量获取