From 6f8b26623f6247892dad8acac2a49709a92c754d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 9 Sep 2024 08:22:32 +0800
Subject: [PATCH] 'commit'
---
ds-base/pom.xml | 8 +-
.../java/com/dsideal/base/Util/PkUtil.java | 20 ++---
.../java/com/dsideal/base/Util/RedisKit.java | 84 +++++++++++++++++++
.../com/dsideal/base/baseApplication.java | 4 +-
.../src/main/resource/application.properties | 36 +-------
5 files changed, 98 insertions(+), 54 deletions(-)
create mode 100644 ds-base/src/main/java/com/dsideal/base/Util/RedisKit.java
diff --git a/ds-base/pom.xml b/ds-base/pom.xml
index 968137b9..bef257f4 100644
--- a/ds-base/pom.xml
+++ b/ds-base/pom.xml
@@ -76,6 +76,7 @@
cos
2022.2
+
cn.smallbun.screw
screw-core
@@ -134,13 +135,6 @@
guava
21.0
-
-
-
- com.zaxxer
- HikariCP
- 4.0.3
-
diff --git a/ds-base/src/main/java/com/dsideal/base/Util/PkUtil.java b/ds-base/src/main/java/com/dsideal/base/Util/PkUtil.java
index efc4e42c..568a3bab 100644
--- a/ds-base/src/main/java/com/dsideal/base/Util/PkUtil.java
+++ b/ds-base/src/main/java/com/dsideal/base/Util/PkUtil.java
@@ -2,14 +2,12 @@ package com.dsideal.base.Util;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.redis.Redis;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
-@SuppressWarnings("unchecked")
public class PkUtil {
//在独立的main函数中，使用下面的方式进行声明logback对象
private static Logger log = LoggerFactory.getLogger(PkUtil.class);
@@ -26,12 +24,12 @@ public class PkUtil {
InitIdentityMap();
for (Integer key : identityMap.keySet()) {
//初始化要删除掉
- Redis.use().del(identityMap.get(key) + "_identity_pk_num");
+ RedisKit.Del(identityMap.get(key) + "_identity_pk_num");
String sql = Db.getSql("loginPerson.getMaxPkByIdentityId");
int identity_id = key;
Record record = Db.findFirst(sql, identity_id);
int identity_pk_num = record.getInt("identity_pk_num");
- Redis.use().incrBy(identityMap.get(key) + "_identity_pk_num", identity_pk_num);
+ RedisKit.incrBy(identityMap.get(key) + "_identity_pk_num", identity_pk_num);
log.info("初始化人员身份主键生成器成功：" + identityMap.get(key));
}
}
@@ -42,15 +40,12 @@ public class PkUtil {
* 时间：2018-12-11
*/
public static void InitOrgNumPk() {
- //初始化字典
- InitIdentityMap();
-
//初始化要删除掉
- Redis.use().del("org_pk_num");
+ RedisKit.Del("org_pk_num");
String sql = Db.getSql("organization.getMaxPkByOrg");
Record record = Db.findFirst(sql);
int org_pk_num = record.getInt("org_pk_num");
- Redis.use().incrBy("org_pk_num", org_pk_num);
+ RedisKit.incrBy("org_pk_num", org_pk_num);
}
/**
@@ -59,14 +54,13 @@ public class PkUtil {
* 时间：2018-12-21
*/
public static void InitIdentityMap() {
- if (identityMap.size() == 0) {
+ if (identityMap.isEmpty()) {
identityMap.put(1, "sys");
identityMap.put(2, "shi");
identityMap.put(3, "qu");
identityMap.put(4, "dw");
identityMap.put(5, "tea");
identityMap.put(6, "stu");
- identityMap.put(7, "par");
}
}
@@ -79,7 +73,7 @@ public class PkUtil {
*/
public static long GetPersonNumPk(int identity_id, int count) {
String redisPrefix = identityMap.get(identity_id);
- long maxPk = Redis.use().incrBy(redisPrefix + "_identity_pk_num", count);
+ long maxPk = RedisKit.incrBy(redisPrefix + "_identity_pk_num", count);
return maxPk;
}
@@ -89,6 +83,6 @@ public class PkUtil {
* 时间：2018-11-22
*/
public static long GetOrgNumPk(int count) {
- return Redis.use().incrBy("org_pk_num", count);
+ return RedisKit.incrBy("org_pk_num", count);
}
}
diff --git a/ds-base/src/main/java/com/dsideal/base/Util/RedisKit.java b/ds-base/src/main/java/com/dsideal/base/Util/RedisKit.java
new file mode 100644
index 00000000..801d4e3a
--- /dev/null
+++ b/ds-base/src/main/java/com/dsideal/base/Util/RedisKit.java
@@ -0,0 +1,84 @@
+package com.dsideal.base.Util;
+
+import com.jfinal.plugin.redis.Redis;
+import redis.clients.jedis.Pipeline;
+import redis.clients.jedis.resps.Tuple;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class RedisKit {
+
+ public static String Get(String key) {
+ return Redis.use().call(jedis -> jedis.get(key));
+ }
+
+ public static void Set(String key, String value) {
+ Redis.use().call(jedis -> jedis.set(key, value));
+ }
+
+ public static void Expire(String key, long seconds) {
+ Redis.use().call(jedis -> jedis.expire(key, seconds));
+ }
+
+ public static boolean Exists(String key) {
+ if (Redis.use() != null) return Redis.use().call(jedis -> jedis.exists(key));
+ return false;
+ }
+
+
+ public static void Del(String key) {
+ Redis.use().call(jedis -> jedis.del(key));
+ }
+
+ public static String HGet(String key, String field) {
+ return Redis.use().call(jedis -> jedis.hget(key, field));
+ }
+
+
+ public static Map HGetAll(String key) {
+ return Redis.use().call(jedis -> jedis.hgetAll(key));
+ }
+
+ public static void HSet(String key, String field, String value) {
+ Redis.use().call(jedis -> jedis.hset(key, field, value));
+ }
+
+
+ public static long incrBy(String key, int num) {
+ return Redis.use().call(jedis -> jedis.incrBy(key, num));
+ }
+
+ public static Pipeline getPipline() {
+ return Redis.use().getJedis().pipelined();
+ }
+
+ public static void SAdd(String key, String value) {
+ Redis.use().call(jedis -> jedis.sadd(key, value));
+ }
+
+ public static void SRem(String key, String value) {
+ Redis.use().call(jedis -> jedis.srem(key, value));
+ }
+
+ public static Set SMembers(String key) {
+ return Redis.use().call(jedis -> jedis.smembers(key));
+ }
+
+ public static List zrangeByScoreWithScores(String key, String start, String end) {
+ return Redis.use().call(jedis -> jedis.zrangeByScoreWithScores(key, start, end));
+ }
+
+ public static void zrem(String key, String value) {
+ Redis.use().call(jedis -> jedis.zrem(key, value));
+ }
+
+ public static void zadd(String key, double score, String value) {
+ Redis.use().call(jedis -> jedis.zadd(key, score, value));
+ }
+
+ public static long zcard(String key) {
+ return Redis.use().call(jedis -> jedis.zcard(key));
+ }
+}
\ No newline at end of file
diff --git a/ds-base/src/main/java/com/dsideal/base/baseApplication.java b/ds-base/src/main/java/com/dsideal/base/baseApplication.java
index f32999c8..fcbd8d3f 100644
--- a/ds-base/src/main/java/com/dsideal/base/baseApplication.java
+++ b/ds-base/src/main/java/com/dsideal/base/baseApplication.java
@@ -148,7 +148,7 @@ public class baseApplication extends JFinalConfig {
//加载
me.add(arp);
// 用于缓存模块的redis服务
- RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000);
+ RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000,PropKit.get("redis_password"));
//启动redis组件
me.add(redis);
}
@@ -232,7 +232,7 @@ public class baseApplication extends JFinalConfig {
@Override
public void onStart() {
//打印 启动Logo
- String path = baseApplication.class.getClassLoader().getResource("dsideal.txt").getPath();
+ String path = baseApplication.class.getClassLoader().getResource("logo.txt").getPath();
File file = new File(path);
System.out.println(FileUtil.txt2String(file));
diff --git a/ds-base/src/main/resource/application.properties b/ds-base/src/main/resource/application.properties
index cd129ad5..ebbfe33b 100644
--- a/ds-base/src/main/resource/application.properties
+++ b/ds-base/src/main/resource/application.properties
@@ -3,45 +3,17 @@ driverClassName=com.mysql.cj.jdbc.Driver
user=root
password=DsideaL147258369
jdbcUrl=jdbc:mysql://10.10.14.210:22066/dsexam_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-# redis ip
-redis_ip=10.10.14.199
-# redis port
-redis_port=18890
+# redis
+redis_ip=10.10.14.210
+redis_port=6379
+redis_password=ylt#redis
# ==============================================================
# 生成Token的密码
CookieMd5SingPwd=DsideaL4r5t6y7u
-# MysqlAES加密解密的密码
-AesPwd=DsideaL4r5t6y7u!
-# 在云存储上保存的备份天数
-backup_remain_days=120
-#OBS(华为云云存储)
-obs_accessKeyId=WAFBGJACKDOQZDH1MKZ1
-obs_accessKeySecret=dlWTUbqgCICaYJG3n0Rot4jXaen2HnfFtMVxiPEo
-obs_endpoint=obs.cn-north-1.myhuaweicloud.com
-obs_bucket_name=dsideal
-# 在云存储上备份的路径名称
-baseServiceDbBackup=baseServiceDbBackup/
-# 管理员邮箱
-adminEmailAddress=10402852@qq.com
-# 口令,注意这里是腾讯的授权码，可不是什么 QQ密码或者独立密码！
-# http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=28&&no=1001256
-mail_pass=jfdbifdxsahlbjjf
# 导出excel 的模板配置路径
excelExportTemplatePathSuffix=/ExcelExportTemplate/
# 导入excel 的模板配置路径
ExcelImportTemplatePathSuffix=/ExcelImportTemplate/
-#file下载的前缀
-filePrefix=/FengHuang
-# 授权IP地址
-IP=192.168.100.100,10.10.11.124
-
-# 内网统一认证地址
-SSO_SERVER_NW=http://10.10.11.116:9001/dsssoserver
-# 外网统一认证地址
-SSO_SERVER_WW=http://10.10.11.116:9001/dsssoserver
-
# sso的cookie名称
SSO_SESSIONID=ds_sso_sessionid
-# 内网范围
-IntranetIP=192,172,10,127
\ No newline at end of file