修改获取机构信息为从redis中获取

src/main/java/com/archser/aserver/common/config/MainConfig.java

@@ -55,7 +55,7 @@ public class MainConfig extends JFinalConfig {
     // 设置默认上传文件保存路径 getFile等使用
     me.setBaseUploadPath("upload/temp/");
     // 设置上传最大限制尺寸
-    // me.setMaxPostSize(1024*1024*10);
+//     me.setMaxPostSize(1024*1024*10);
     // 设置默认下载文件路径 renderFile使用
     me.setBaseDownloadPath("download");
     // 设置默认视图类型

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

@@ -266,23 +266,7 @@ public class IndexController extends Controller {
 			if (errorcount != null && errorcount != 0) {
 				this.setErrZero(user);
 			}
-			/**
-			 * 20200706 lidecai 将用户信息保存到Redis start
-			 */
-			Map<Object, Object> userInfo = new HashMap<>();
-			Iterator<Entry<String, Object>> userIterator = user._getAttrsEntrySet().iterator();
-			Entry<String, Object> nextAttr = null;
-			while(userIterator.hasNext()) {
-				 nextAttr = userIterator.next();
-				 userInfo.put(nextAttr.getKey().trim().toLowerCase(), nextAttr.getValue());
-			}
-			try {
-				Redis.use().hmset(username + "_INFO", userInfo);
-				// 设置过期时间
-				Redis.use().expire(username, 60 * 60 * 24);
-			}catch (Exception e) {
-				e.printStackTrace();
-			}
+
 			Boolean aBoolean = userService.verifyPassword(verify);
 			this.renderJson(Ret.ok("token", jws).set("callback", callback).set("verify",aBoolean));
 			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), username + "登录" + app + "成功", app);

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.jfinal.upload.UploadFile;
 import java.io.File;
@@ -39,7 +40,7 @@ public class UserController extends Controller {
 		String username = this.getAttr("username");
     User user = InfoUser.getUser(username);
     user.remove("password");
-		Organ organ = Organ.dao.findById(user.getOrganId());
+    Organ organ = InfoOrgan.getOrgan(user.getOrganId());
 		if (organ != null) {
 			Iterator<Entry<String, Object>> organIterator = organ._getAttrsEntrySet().iterator();
 			Entry<String, Object> organAttr = null;

src/main/java/com/archser/aserver/itask/GoodSync.java

@@ -22,10 +22,13 @@ public class GoodSync implements ITask {
   @Override
   public void run() {
 //    同步用户数据
+    java.lang.System.err.println("同步用户信息");
     User.dao.findAll().forEach(InfoUser::saveUser);
 //    同步系统数据
+    java.lang.System.err.println("同步系统数据");
     System.dao.findAll().forEach(InfoSystem::saveSystem);
 //    同步机构数据
+    java.lang.System.err.println("同步机构数据");
     Organ.dao.findAll().forEach(InfoOrgan::saveOrgan);
   }
 }

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

 package com.archser.aserver.util.redis;
 
+import com.alibaba.fastjson.JSONObject;
 import com.archser.aserver.model.Organ;
 
 
@@ -21,4 +22,19 @@ public class InfoOrgan {
     return RedisConvert.saveObject(ORGAN + organ.getId(), organ);
   }
 
+  /**
+   * 获取机构信息
+   * @param organId
+   * @return
+   */
+  public static Organ getOrgan(Integer organId){
+    Object organObj = RedisConvert.getObject(ORGAN + organId);
+    Organ organ = JSONObject.parseObject(JSONObject.toJSONString(organObj), Organ.class);
+    if(organ  == null ){
+      organ = Organ.dao.findById(organId);
+      saveOrgan(organ);
+    }
+    return JSONObject.parseObject(JSONObject.toJSONString(organObj), Organ.class);
+  }
+
 }