使用公共包方法

src/main/java/com/archser/aserver/common/config/plugins/RedisConfig.java

-package com.archser.aserver.common.config.plugins;
-
-import com.archser.aserver.plugin.redis.RedisSentinelPlugin;
-import com.jfinal.config.Plugins;
-import com.jfinal.kit.Prop;
-import com.jfinal.plugin.redis.RedisPlugin;
-import java.util.HashSet;
-import java.util.Set;
-import redis.clients.jedis.HostAndPort;
-
-/**
- * TODO 自定义Redis配置，提取逻辑判断，避免在主类中掺杂大量代码
- * @author 李德才
- * @version V2.0
- * @date 2021/3/4 9:02
- */
-
-public class RedisConfig {
-
-
-  public RedisConfig(Plugins plugins, Prop prop) {
-    String redisUrl = prop.get("redis.url");
-    //    哨兵配置
-    if (redisUrl.contains(",")) {
-      Set<HostAndPort> sentinels = new HashSet<HostAndPort>();
-      String[] split = redisUrl.split(",");
-      int port = 26379;
-      for (String item : split) {
-        if (item.contains(":")) {
-          port = Integer.parseInt(item.split(":")[1]);
-        }
-        sentinels.add(new HostAndPort(item.split(":")[0], port));
-      }
-      RedisSentinelPlugin redisSentinelPlugin = new RedisSentinelPlugin(
-          prop.get("redisSentinel.CacheName", "redisSentinel"),
-          prop.get("redisSentinel.masterName", "mymaster"),
-          sentinels, prop.get("redis.password", "archser_redis"));
-      plugins.add(redisSentinelPlugin);
-    } else {
-      //    普通Redis单实例配置
-      RedisPlugin redis = new RedisPlugin("redis", prop.get("redis.url"),
-          prop.getInt("redis.port", 6379),
-          prop.get("redis.password"));
-      plugins.add(redis);
-    }
-  }
-
-
-}

src/main/java/com/archser/aserver/controller/SettingController.java

 package com.archser.aserver.controller;
 
+import com.archser.commons.services.LogService;
 import com.archser.aserver.util.FinalStringUtil;
 import com.jfinal.kit.PropKit;
 import java.io.File;
@@ -9,9 +10,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
-import com.archser.aserver.interceptor.JwtInterceptor;
 import com.archser.aserver.model.Config;
-import com.archser.aserver.service.LogService;
 import com.archser.aserver.service.SystemService;
 import com.archser.aserver.validator.SettingValidator;
 import com.jfinal.aop.Before;

src/main/java/com/archser/aserver/controller/SystemController.java

 package com.archser.aserver.controller;
 
+
 import com.archser.aserver.interceptor.JwtInterceptor;
 import com.archser.aserver.model.System;
-import com.archser.aserver.service.LogService;
 import com.archser.aserver.service.SystemService;
 import com.archser.aserver.util.FinalStringUtil;
 import com.archser.aserver.util.JwtUtils;
-import com.archser.aserver.util.redis.InfoSystem;
-import com.archser.aserver.util.redis.RedisConvert;
+import com.archser.commons.db.InfoSystem;
+import com.archser.commons.model.AsSystem;
+import com.archser.commons.services.LogService;
+import com.archser.plugin.thread.ApplicationThreadPool;
 import com.jfinal.aop.Before;
 import com.jfinal.aop.Clear;
 import com.jfinal.aop.Inject;
 import com.jfinal.core.Controller;
-import com.jfinal.kit.PropKit;
 import com.jfinal.kit.Ret;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.tx.Tx;
 
-import com.jfinal.plugin.redis.Redis;
 import java.util.List;
 
 /**
@@ -48,7 +48,7 @@ public class SystemController extends Controller {
 	 */
 	@Before(Tx.class)
 	public void addorEdit() {
-		System system = getModel(System.class, "", true);
+		AsSystem system = getModel(AsSystem.class, "", true);
 		if (system == null) {
 			renderJson(Ret.fail("msg", "请填写完整数据"));
 			return ;
@@ -64,9 +64,9 @@ public class SystemController extends Controller {
 			logService.saveAsLog("operate",
 					"修改-" + system.getName() + "-系统模块成功", FinalStringUtil.UPDATE);
 		}
-		new Thread(() ->{
+		ApplicationThreadPool.execute(() ->{
 			InfoSystem.saveSystem(system);
-		}).start();
+		});
 	}
 
 	/**
@@ -90,9 +90,9 @@ public class SystemController extends Controller {
 		if (success) {
 			renderJson(Ret.ok());
 			String finalSystemName = systemName;
-			new Thread(() ->{
+			ApplicationThreadPool.execute(() ->{
 				InfoSystem.deleteSystem(finalSystemName);
-			}).start();
+			});
 			logService.saveAsLog("operate", "删除" + systemName, FinalStringUtil.DELETE);
 		} else {
 			renderJson(Ret.fail("msg", "删除数据出错"));

src/main/java/com/archser/aserver/controller/UserController.java

 package com.archser.aserver.controller;
 
-import com.archser.aserver.util.redis.InfoOrgan;
-import com.archser.aserver.util.redis.InfoUser;
+import com.archser.commons.db.InfoOrgan;
+import com.archser.commons.db.InfoUser;
+import com.archser.commons.model.AsOrgan;
+import com.archser.commons.model.AsUser;
+import com.archser.plugin.thread.ApplicationThreadPool;
 import com.jfinal.upload.UploadFile;
 import java.io.File;
 import java.io.FileInputStream;
@@ -38,9 +41,9 @@ public class UserController extends Controller {
 	 */
 	public void info() {
 		String username = this.getAttr("username");
-		User user = InfoUser.getUser(username);
+		AsUser user = InfoUser.getUser(username);
 		user.remove("password");
-		Organ organ = InfoOrgan.getOrgan(user.getOrganId());
+		AsOrgan organ = InfoOrgan.getOrgan(user.getOrganId());
 		if (organ != null) {
 			Iterator<Entry<String, Object>> organIterator = organ._getAttrsEntrySet().iterator();
 			Entry<String, Object> organAttr = null;
@@ -55,7 +58,7 @@ public class UserController extends Controller {
        * @author 李德才
        * @date 2021/1/8 17:07
        */
-      Organ userFondOrgan = userService.getUserFondOrgan(user);
+      AsOrgan userFondOrgan = userService.getUserFondOrgan(user);
       if(userFondOrgan != null) {
 				user.put("organ_name", userFondOrgan.getName());
 			}
@@ -84,7 +87,7 @@ public class UserController extends Controller {
    * 修改用户
    */
 	public void updateUser() {
-		User user = this.getModel(User.class, "user", true);
+		AsUser user = this.getModel(AsUser.class, "user", true);
 		if (user == null) {
 			renderJson("msg", "数据参数错误，请重新修改");
 			return;
@@ -110,7 +113,7 @@ public class UserController extends Controller {
       this.renderJson(Ret.ok("list", null));
       return;
     }
-    User user = InfoUser.getUser(username);
+    AsUser user = InfoUser.getUser(username);
     int userId = user.getId();
     List<Record> records = Db.find(Db.getSql("getRolesByUserId"), userId);
     List<Integer> ids = new ArrayList<Integer>();
@@ -152,9 +155,9 @@ public class UserController extends Controller {
         if (imgBase != null) {
           user.setImage(imgBase);
           user.update();
-          new Thread(() -> {
+          ApplicationThreadPool.execute(() -> {
             InfoUser.saveUser(InfoUser.getUser(username).setImage(imgBase));
-          }).start();
+          });
         }
       } catch (Exception e) {
         e.printStackTrace();
@@ -181,7 +184,7 @@ public class UserController extends Controller {
 
   public void getImage() {
     String username = this.getAttr("username");
-    User user = InfoUser.getUser(username);
+    AsUser user = InfoUser.getUser(username);
     byte[] image = user.getImage();
     if (image == null) {
       renderJson(Ret.ok("baseStr", image));

src/main/java/com/archser/aserver/util/redis/RedisConvert.java

-package com.archser.aserver.util.redis;
-
-import com.jfinal.kit.JsonKit;
-import com.jfinal.plugin.redis.Redis;
-import java.util.Map;
-
-
-/**
- * Redis常用工具类 20201126  lidecai
- */
-public class RedisConvert {
-
-  /**
-   * 单独存储对象属性
-   *
-   * @param key
-   * @param attribute
-   * @param value
-   */
-  public static void saveObjectAttr(String key, String attribute, String value) {
-    Redis.use().hset(key, attribute, value);
-  }
-
-  /**
-   * 单独获取对象属性
-   *
-   * @param key
-   * @param attribute
-   * @return
-   */
-  public static Object getObjectAttr(String key, String attribute) {
-    return Redis.use().hget(key, attribute);
-  }
-
-  /**
-   * 存储整个对象
-   *
-   * @param key
-   * @param object
-   */
-  public static boolean saveObject(String key, Object object) {
-    String hamlet = Redis.use().hmset(key, objectToMap(object));
-    return hamlet.equalsIgnoreCase("Ok");
-  }
-
-  /**
-   * 获取整个对象
-   *
-   * @param key
-   * @return
-   */
-  public static Object getObject(String key) {
-    return Redis.use().hgetAll(key);
-  }
-
-
-  public static Long deleteKey(String key) {
-    return Redis.use().del(key);
-  }
-
-
-  /**
-   * 对象转map
-   *
-   * @param obj
-   * @return
-   */
-  public static Map objectToMap(Object obj) {
-    return JsonKit.parse(JsonKit.toJson(obj), Map.class);
-  }
-
-}