From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Jul 2020 09:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
index 565de1a..54aef80 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
@@ -35,6 +35,10 @@
* 客户端IP
*/
String USER_AGENT_IP="user_agent_ip";
+ /**
+ * 客户端屏幕分辨率
+ */
+ String USER_AGENT_SYSTEM_SCREEN="user_agent_system_screen";
/**
* 标签 header key
@@ -246,7 +250,8 @@
/**
* 生成缩略图需要的图片暂存目录
*/
- public static final String TEMP_IMAGE_PATH="D:/resources/images/";
+// public static final String TEMP_IMAGE_PATH="D:/resources/images/";
+ public static final String TEMP_IMAGE_PATH="/root/data";
/**
* 普通医生角色ID
*/
@@ -274,4 +279,17 @@
* 自主注册的科室组织id
*/
public static final Long DEPARTMENT_ORG_ID=1273810374550335490L;
+
+ /**
+ * 自主注册的创建人id
+ */
+ public static final Long CREATE_USER_ID= 0L;
+ /**
+ * 自主注册的创建人名称
+ */
+ public static final String CREATE_USER_NAME= "自动创建";
+ /**
+ * 管理员医生角色code标识
+ */
+ public static final String SYSTEM_ADMIN_ROLE_CODE="ADMIN";
}
--
Gitblit v1.8.0