Bläddra i källkod

打包文件修改

anderx 2 år sedan
förälder
incheckning
76adcce0a2

+ 1 - 1
ruoyi-admin/mvn clean package -P prod.cmd

@@ -1,4 +1,4 @@
 cd ../
-mvn install
+mvn install package -P prod
 #cd ./ruoyi-admin
 #mvn clean install package -P prod

+ 4 - 2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,6 +3,7 @@ package com.ruoyi;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -22,8 +23,9 @@ public class RuoYiApplication
 {
     public static void main(String[] args)
     {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
+
+//         System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  启动成功   ლ(´ڡ`ლ)゙  \n");
+        System.out.println("启动成功...\n");
     }
 }

+ 1 - 0
ruoyi-admin/src/main/resources/banner.txt

@@ -1,2 +1,3 @@
 Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
+Project Active: ${spring.profiles.active}

+ 1 - 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -320,11 +320,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         }
         SysDept sysDept = SecurityUtils.getLoginUser().getUser().getDept();
         String[] split = sysDept.getAncestors().split(",");
-        if (SecurityUtils.hashRoles(UserRolesType.CEO.getCode())){
-            if (split.length==2) SecurityUtils.getDeptId();
-            if (split.length>2)return Long.valueOf(split[2]);
-        }
-        if (split.length==2)return Long.valueOf(split[1]);
+        if (split.length==2) return SecurityUtils.getDeptId();
         if (split.length>2)return Long.valueOf(split[2]);
         return null;
     }