基础服务

pom.xml

@@ -29,6 +29,12 @@
             <artifactId>common-ftp</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-redis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/tofly/base/controller/CommonFtpController.java

@@ -54,6 +54,13 @@ public class CommonFtpController {
         String fileType=remotePath.substring(remotePath.lastIndexOf("."));
         if (StringUtil.isNotEmpty(fileType)) {
             fileType = fileType.toLowerCase();
+        }else{
+            return null;
+        }
+
+        byte[] b= FtpUtil.getByteDataforFile(remotePath);
+        if(b==null){
+            return null;
         }
         switch (fileType) {
             case ".jpg":
@@ -70,7 +77,6 @@ public class CommonFtpController {
                 response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
                 break;
         }
-        byte[] b= FtpUtil.getByteDataforFile(remotePath);
         return b;
     }
 

src/main/java/com/tofly/base/controller/UserController.java

@@ -59,8 +59,8 @@ public class UserController {
     @Autowired
     private MenuService menuService;
 
-//    @Autowired
-//    private  CacheManager cacheManager;
+    @Autowired
+    private  CacheManager cacheManager;
     @Autowired
     private DepartmentService departmentService;
     @Autowired
@@ -705,68 +705,68 @@ public class UserController {
 
     private void updatePwd(String username,String encodePassword){
         //调用清除缓存的方法
-//        Cache cache = cacheManager.getCache("user_details");
-//        if (cache != null && cache.get(username) != null && cache.get(username).get()!=null) {
-//            ToflyUser toflyUser= (ToflyUser) cache.get(username).get();
-//            log.info("password:",toflyUser.getPassword());
-//            //toflyUser.setPassword(encodePassword);
-//            ToflyUser toflyUser1=new ToflyUser(toflyUser.getUserid(),toflyUser.getDepartmentId(),toflyUser.getUserLevel(),
-//                    toflyUser.getRealName(),toflyUser.getDepartemntName(),toflyUser.getAvatar(),
-//                    toflyUser.getUsername(),encodePassword,
-//                    true,true,
-//                    true,true,toflyUser.getAuthorities());
-//            cache.put(username,toflyUser1);
-//        }
+        Cache cache = cacheManager.getCache("user_details");
+        if (cache != null && cache.get(username) != null && cache.get(username).get()!=null) {
+            ToflyUser toflyUser= (ToflyUser) cache.get(username).get();
+            log.info("password:",toflyUser.getPassword());
+            //toflyUser.setPassword(encodePassword);
+            ToflyUser toflyUser1=new ToflyUser(toflyUser.getUserid(),toflyUser.getDepartmentId(),toflyUser.getUserLevel(),
+                    toflyUser.getRealName(),toflyUser.getDepartemntName(),toflyUser.getAvatar(),
+                    toflyUser.getUsername(),encodePassword,
+                    true,true,
+                    true,true,toflyUser.getAuthorities());
+            cache.put(username,toflyUser1);
+        }
     }
 
     private void updateCache(String username,User toflyUserP){
         //调用清除缓存的方法
-//        Cache cache = cacheManager.getCache("user_details");
-//        if (cache != null && cache.get(username) != null && cache.get(username).get()!=null) {
-//            ToflyUser toflyUser= (ToflyUser) cache.get(username).get();
-//            boolean xgflag=false;
-//            String password=toflyUser.getPassword();
-//            if(!StringUtil.isEmpty(toflyUserP.getPassword()) && !toflyUserP.getPassword().equals(password)){
-//                password = toflyUserP.getPassword();
-//                xgflag=true;
-//            }
-//            Long deptid=toflyUser.getDepartmentId();
-//            String deptName=toflyUser.getDepartemntName();
-//            if(toflyUserP.getDepartmentId()!=null && deptid.longValue()!=toflyUserP.getDepartmentId()){
-//                deptid=toflyUserP.getDepartmentId();
-//                deptName=departmentService.getById(deptid).getName();
-//                xgflag=true;
-//            }
-//            String  avatar=toflyUser.getAvatar();
-//            if(!StringUtil.isEmpty(toflyUserP.getAvatar()) && !toflyUserP.getAvatar().equals(avatar)){
-//                avatar=toflyUserP.getAvatar();
-//                xgflag=true;
-//            }
-//
-//            String realName=toflyUser.getRealName();
-//            if(!StringUtil.isEmpty(toflyUserP.getRealName()) && !toflyUserP.getRealName().equals(realName)){
-//                realName=toflyUserP.getRealName();
-//                xgflag=true;
-//            }
-//
-//            String userlevel=toflyUser.getUserLevel();
-//            if(!StringUtil.isEmpty(toflyUserP.getUserLevel()) && !toflyUserP.getUserLevel().equals(userlevel)){
-//                userlevel=toflyUserP.getUserLevel();
-//                xgflag=true;
-//            }
-//
-//            if(xgflag){
-//                ToflyUser toflyUser1=new ToflyUser(toflyUser.getUserid(),deptid,userlevel,
-//                        realName,deptName,avatar,
-//                        toflyUser.getUsername(),password,
-//                        true,true,
-//                        true,true,toflyUser.getAuthorities());
-//                cache.put(username,toflyUser1);
-//            }
-//
-//
-//
-//        }
+        Cache cache = cacheManager.getCache("user_details");
+        if (cache != null && cache.get(username) != null && cache.get(username).get()!=null) {
+            ToflyUser toflyUser= (ToflyUser) cache.get(username).get();
+            boolean xgflag=false;
+            String password=toflyUser.getPassword();
+            if(!StringUtil.isEmpty(toflyUserP.getPassword()) && !toflyUserP.getPassword().equals(password)){
+                password = toflyUserP.getPassword();
+                xgflag=true;
+            }
+            Long deptid=toflyUser.getDepartmentId();
+            String deptName=toflyUser.getDepartemntName();
+            if(toflyUserP.getDepartmentId()!=null && deptid.longValue()!=toflyUserP.getDepartmentId()){
+                deptid=toflyUserP.getDepartmentId();
+                deptName=departmentService.getById(deptid).getName();
+                xgflag=true;
+            }
+            String  avatar=toflyUser.getAvatar();
+            if(!StringUtil.isEmpty(toflyUserP.getAvatar()) && !toflyUserP.getAvatar().equals(avatar)){
+                avatar=toflyUserP.getAvatar();
+                xgflag=true;
+            }
+
+            String realName=toflyUser.getRealName();
+            if(!StringUtil.isEmpty(toflyUserP.getRealName()) && !toflyUserP.getRealName().equals(realName)){
+                realName=toflyUserP.getRealName();
+                xgflag=true;
+            }
+
+            String userlevel=toflyUser.getUserLevel();
+            if(!StringUtil.isEmpty(toflyUserP.getUserLevel()) && !toflyUserP.getUserLevel().equals(userlevel)){
+                userlevel=toflyUserP.getUserLevel();
+                xgflag=true;
+            }
+
+            if(xgflag){
+                ToflyUser toflyUser1=new ToflyUser(toflyUser.getUserid(),deptid,userlevel,
+                        realName,deptName,avatar,
+                        toflyUser.getUsername(),password,
+                        true,true,
+                        true,true,toflyUser.getAuthorities());
+                cache.put(username,toflyUser1);
+            }
+
+
+
+        }
     }
 
 

src/main/resources/bootstrap.yml

@@ -3,9 +3,9 @@ spring:
     nacos:
       config:
         # nacos配置中心指定空间
-        namespace: 3038570d-109a-41aa-9e64-84a53dd01b3a
+        namespace: tofly-sxgk-test
         # nacos部署IP
-        server-addr: 192.168.2.231:8848
+        server-addr: tofly-nacos:8848
 
         # 配置后缀
         file-extension: yaml
@@ -16,10 +16,12 @@ spring:
           dataId: public_config_oracle.yaml
         shared-configs[2]:
           dataId: public_config_ftp.yaml
+        shared-configs[3]:
+          dataId: public_config_redis.yaml
 
       discovery:
-        namespace: 3038570d-109a-41aa-9e64-84a53dd01b3a
-        server-addr: 192.168.2.231:8848
+#        namespace: tofly-sxgk-test
+        server-addr: tofly-nacos:8848
   application:
     # 该应用在nacos配置中的名称
     name: tofly-base