From 0eee8acf970b2a656b558b5e903c7bda4fb27d6a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 十二月 2022 20:45:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/UserService.java | 9 +++++++++
src/main/java/com/lf/server/helper/RsaHelper.java | 14 ++++++++++++--
src/main/java/com/lf/server/helper/GdalHelper.java | 6 +++---
src/main/java/com/lf/server/controller/other/FloatServerController.java | 2 +-
src/main/java/com/lf/server/service/all/WebSocketService.java | 20 +++++++++-----------
src/main/java/com/lf/server/helper/EnumHelper.java | 1 +
6 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/other/FloatServerController.java b/src/main/java/com/lf/server/controller/other/FloatServerController.java
index 0b7be68..acfcfb9 100644
--- a/src/main/java/com/lf/server/controller/other/FloatServerController.java
+++ b/src/main/java/com/lf/server/controller/other/FloatServerController.java
@@ -52,7 +52,7 @@
res.getWriter().write(strRes);
} catch (Exception ex) {
- String str = ex.getMessage();
+ log.error(ex.getMessage(), ex);
}
}
diff --git a/src/main/java/com/lf/server/helper/EnumHelper.java b/src/main/java/com/lf/server/helper/EnumHelper.java
index b6127b8..824757e 100644
--- a/src/main/java/com/lf/server/helper/EnumHelper.java
+++ b/src/main/java/com/lf/server/helper/EnumHelper.java
@@ -50,6 +50,7 @@
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
+
return result;
}
diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index 4add775..d23594d 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -129,7 +129,7 @@
break;
}
} catch (Exception ex) {
- ex.printStackTrace();
+ log.error(ex.getMessage(), ex);
}
}
@@ -192,8 +192,8 @@
//layerDto.setCount(count);
//layerDto.setMap(mapList);
}
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
} finally {
if (dataSource != null) {
dataSource.delete();
diff --git a/src/main/java/com/lf/server/helper/RsaHelper.java b/src/main/java/com/lf/server/helper/RsaHelper.java
index f7339d2..c6d38e7 100644
--- a/src/main/java/com/lf/server/helper/RsaHelper.java
+++ b/src/main/java/com/lf/server/helper/RsaHelper.java
@@ -1,6 +1,8 @@
package com.lf.server.helper;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import javax.crypto.Cipher;
@@ -30,12 +32,20 @@
*/
private static String publicKey;
+ /**
+ * 瀵嗛挜绠楁硶
+ */
private static final String KEY_ALGORITHM = "RSA";
/**
* RSA瀵嗛挜闀垮害锛�1024 鎴� 2048
*/
private static final int DEFAULT_RSA_KEY_SIZE = 1024;
+
+ /**
+ * 鏃ュ織
+ */
+ private final static Log log = LogFactory.getLog(RsaHelper.class);
/**
* 鐢熸垚鍏閽�
@@ -145,8 +155,8 @@
// 寰楀埌绉侀挜瀛楃涓�
String pri = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded()));
result.put("privateKey", pri);
- } catch (GeneralSecurityException e) {
- e.printStackTrace();
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
}
return result;
diff --git a/src/main/java/com/lf/server/service/all/WebSocketService.java b/src/main/java/com/lf/server/service/all/WebSocketService.java
index 88f792c..82d0338 100644
--- a/src/main/java/com/lf/server/service/all/WebSocketService.java
+++ b/src/main/java/com/lf/server/service/all/WebSocketService.java
@@ -23,21 +23,21 @@
System.out.println("websocket 鍔犺浇");
}
- private static Logger log = LoggerFactory.getLogger(WebSocketService.class);
+ private final static Logger log = LoggerFactory.getLogger(WebSocketService.class);
private static final AtomicInteger ONLINE_COUNT = new AtomicInteger(0);
/**
* 鐢ㄦ潵瀛樻斁姣忎釜瀹㈡埛绔搴旂殑Session瀵硅薄锛堢嚎绋嬪畨鍏⊿et锛�
*/
- private static CopyOnWriteArraySet<Session> SessionSet = new CopyOnWriteArraySet<Session>();
+ private final static CopyOnWriteArraySet<Session> SESSION_SET = new CopyOnWriteArraySet<Session>();
/**
* 杩炴帴寤虹珛鎴愬姛璋冪敤鐨勬柟娉�
*/
@OnOpen
public void onOpen(Session session) {
- SessionSet.add(session);
+ SESSION_SET.add(session);
int cnt = ONLINE_COUNT.incrementAndGet();
log.info("鏈夎繛鎺ュ姞鍏ワ紝褰撳墠杩炴帴鏁颁负锛歿}", cnt);
@@ -49,7 +49,7 @@
*/
@OnClose
public void onClose(Session session) {
- SessionSet.remove(session);
+ SESSION_SET.remove(session);
int cnt = ONLINE_COUNT.decrementAndGet();
log.info("鏈夎繛鎺ュ叧闂紝褰撳墠杩炴帴鏁颁负锛歿}", cnt);
@@ -75,7 +75,6 @@
@OnError
public void onError(Session session, Throwable error) {
log.error("鍙戠敓閿欒锛歿}锛孲ession ID锛� {}", error.getMessage(), session.getId());
- error.printStackTrace();
}
/**
@@ -87,9 +86,8 @@
public static void sendMessage(Session session, String message) {
try {
session.getBasicRemote().sendText(String.format("%s", message));
- } catch (IOException e) {
- log.error("鍙戦�佹秷鎭嚭閿欙細{}", e.getMessage());
- e.printStackTrace();
+ } catch (Exception ex) {
+ log.error("鍙戦�佹秷鎭嚭閿欙細{}", ex.getMessage());
}
}
@@ -100,7 +98,7 @@
* @throws IOException
*/
public static void broadCastInfo(String message) throws IOException {
- for (Session session : SessionSet) {
+ for (Session session : SESSION_SET) {
if (session.isOpen()) {
sendMessage(session, message);
}
@@ -116,7 +114,7 @@
*/
public static void sendMessage(String message, String sessionId) throws IOException {
Session session = null;
- for (Session s : SessionSet) {
+ for (Session s : SESSION_SET) {
if (s.getId().equals(sessionId)) {
session = s;
break;
@@ -126,7 +124,7 @@
if (session != null) {
sendMessage(session, message);
} else {
- log.warn("娌℃湁鎵惧埌浣犳寚瀹欼D鐨勪細璇濓細{}", sessionId);
+ log.info("娌℃湁鎵惧埌浣犳寚瀹欼D鐨勪細璇濓細{}", sessionId);
}
}
}
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index f9bb60e..c84cf69 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -5,7 +5,10 @@
import com.lf.server.helper.RsaHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.sys.UserMapper;
+import com.lf.server.service.all.CommonsFileuploadService;
import com.lf.server.service.all.RedisService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,6 +33,8 @@
@Autowired
TokenService tokenService;
+
+ private final static Log log = LogFactory.getLog(UserService.class);
@Override
public Integer selectCount(String uname) {
@@ -154,6 +159,7 @@
return null;
} catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
return "瑙ｅ瘑澶辫触";
}
}
@@ -182,6 +188,7 @@
return null;
} catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
return "瑙ｅ瘑澶辫触";
}
}
@@ -222,6 +229,7 @@
return null;
} catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
return "瑙ｅ瘑澶辫触";
}
}
@@ -269,6 +277,7 @@
return null;
} catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
return "瑙ｅ瘑澶辫触";
}
}
--
Gitblit v1.9.3