manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2019-04-23 22:57:11 +08:00
parent 59e1792467
commit 1b0099c831
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
View File

@@ -16,7 +16,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import com.jeesite.common.collect.SetUtils; import com.jeesite.common.collect.SetUtils;
@@ -215,7 +214,7 @@ public class PropertiesUtils {
String logPath = null; String logPath = null;
try { try {
// 获取当前classes目录 // 获取当前classes目录
logPath = new DefaultResourceLoader().getResource("/").getFile().getPath(); logPath = ResourceUtils.getResource("/").getFile().getPath();
} catch (Exception e) { } catch (Exception e) {
// 取不到，取当前工作路径 // 取不到，取当前工作路径
logPath = System.getProperty("user.dir"); logPath = System.getProperty("user.dir");

2
modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java
View File

@@ -45,7 +45,7 @@ public class EmpUtils {
User user = UserUtils.getUser(); User user = UserUtils.getUser();
Employee employee = null; Employee employee = null;
if (User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){ if (User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){
employee = (Employee)UserUtils.getUser().getRefObj(); employee = (Employee)user.getRefObj();
} }
if (employee == null){ if (employee == null){
employee = new Employee(); employee = new Employee();