diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index a1ac55f..01b4484 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -88,7 +88,6 @@ public class LoginController { //CacheManager.removeCacheByObject(user); //记住 MyCookieUtil.remember(request, response); - //清除用户登录错误次数缓存 CacheManager.clearOnly(powerUser.getUserName()); //存session密码置空 diff --git a/power-admin/src/main/java/com/manage/util/JedisPoolUtil.java b/power-admin/src/main/java/com/manage/util/JedisPoolUtil.java index 0b0812a..d69e13e 100644 --- a/power-admin/src/main/java/com/manage/util/JedisPoolUtil.java +++ b/power-admin/src/main/java/com/manage/util/JedisPoolUtil.java @@ -54,11 +54,9 @@ public class JedisPoolUtil { public static void close(Jedis jedis){ if(jedis != null){ if (jedis.isConnected()) { - try { - System.out.println("退出" + jedis.toString() + ":" + jedis.quit()); + try { jedis.disconnect(); } catch (Exception e) { - System.out.println("退出失败"); e.printStackTrace(); } } diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties index 6828044..f97f9fb 100644 --- a/power-admin/src/main/resources/config/config.properties +++ b/power-admin/src/main/resources/config/config.properties @@ -9,8 +9,12 @@ TOKEN_EXPIRE_TIME = 1200000 ##################################################\u670D\u52A1\u5668ip########################################################## #\u901A\u7528\u670D\u52A1\u5668IP\u4E0E\u901A\u7528\u670D\u52A1\u5668\u7AEF\u53E3 -SERVER_IP = 10.6.1.127 -SERVER_PORT = 8080 +#SERVER_IP = 10.6.1.127 +#SERVER_PORT = 9001 + + +SERVER_IP = localhost +SERVER_PORT = 8082 #power\u6743\u9650\u7CFB\u7EDFip POWER_IP = ${SERVER_IP} @@ -20,17 +24,17 @@ POWER_PORT = ${SERVER_PORT} #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip EMRMEDICALRECORD_IP = ${SERVER_IP} #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3 -EMRMEDICALRECORD_PORT = ${SERVER_PORT} +EMRMEDICALRECORD_PORT = 8083 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip EMRRECORD_IP = ${SERVER_IP} #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3 -EMRRECORD_PORT = ${SERVER_PORT} +EMRRECORD_PORT =8085 #\u75C5\u6848\u590D\u5370\u9884\u7EA6ip EMRAPPLYCOPY_IP = ${SERVER_IP} #\u75C5\u6848\u590D\u5370\u9884\u7EA6\u7AEF\u53E3 -EMRAPPLYCOPY_PORT = 80 +EMRAPPLYCOPY_PORT = ${SERVER_PORT} #\u75C5\u6848\u7B7E\u6536ip EMRFILES_IP = ${SERVER_IP} @@ -58,7 +62,7 @@ EMRFILES__SYSFLAG = emr_files EMRFILES_URLHEAD = http://${EMRFILES_IP}:${EMRFILES_PORT}/${EMRFILES__SYSFLAG} #####################################################\u5176\u4ED6############################################## #webSocket\u670D\u52A1\u5668\u5730\u5740 -WEBSOCKET_URLHEAD = ${POWER_IP}:8088 +WEBSOCKET_URLHEAD = ${POWER_IP}:8089 #\u901A\u77E5\u5B57\u7B26\u4E32\u95F4\u9694\u7B26 STR_SPLIT = *^:|,. diff --git a/power-admin/src/main/resources/config/jdbc.properties b/power-admin/src/main/resources/config/jdbc.properties index f0b1c4a..95be325 100644 --- a/power-admin/src/main/resources/config/jdbc.properties +++ b/power-admin/src/main/resources/config/jdbc.properties @@ -1,7 +1,7 @@ jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8 +jdbc.url=jdbc\:mysql\://localhost\:3306/zj_power?useUnicode\=true&characterEncoding\=utf-8 jdbc.username=root -jdbc.password=docus702 +jdbc.password=root #hibernate config hibernate.dialect = org.hibernate.dialect.MySQLDialect