From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +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 | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 dc23334..97ab00f 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
@@ -103,8 +103,11 @@
/**
* 超级管理员用户名
*/
- String ADMIN_USER_NAME = "admin";
-
+ String ADMIN_USER_NAME = "admin-xg";
+ /**
+ * 超级管理的id
+ */
+ Long ADMIN_USER_ID=1000000000000000001L;
/**
* 公共日期格式
*/
@@ -251,7 +254,7 @@
* 生成缩略图需要的图片暂存目录
*/
// public static final String TEMP_IMAGE_PATH="D:/resources/images/";
- public static final String TEMP_IMAGE_PATH="/root/data";
+ public static final String TEMP_IMAGE_PATH="/root/kidgrow";
/**
* 普通医生角色ID
*/
@@ -271,15 +274,22 @@
public static final String HOSPITAL_ADMIN_CODE="hospital_admin";
/**
- * 自主注册医院的组织id
+ * 自主注册医院的上级组织id
*/
- public static final Long HOSPITAL_ORG_ID=15321234570L;
+ public static final Long ORG_PARENT_ID=15321234561L;
/**
- * 自主注册的科室组织id
+ * 自主注册的用户默认给的产品id
*/
- public static final Long DEPARTMENT_ORG_ID=15321234571L;
-
+ public static final Long REG_USER_PRODUCT_ID=1000000000000000001L;
+ /**
+ * 自主注册的用户合同时长 天
+ */
+ public static final Integer REG_USER_CONTRACT_DAY=15;
+ /**
+ * 自主注册的用户合同名
+ */
+ public static final String REG_USER_CONTRACT_NAME="注册用户免费合同";
/**
* 自主注册的创建人id
*/
@@ -292,6 +302,14 @@
* 管理员角色code标识
*/
public static final String SYSTEM_ADMIN_ROLE_CODE="admin";
+ /**
+ * 自主注册的销售服务人员id
+ */
+ public static final Long SALE_USER_ID= 1289806543902457857L;
+ /**
+ * 自主注册的运营人员id
+ */
+ public static final Long OPRATION_USER_ID= 1289806733313032193L;
/**
* 销售主管角色code标识
@@ -334,5 +352,5 @@
/**
* 一个科室能最大试用多少次
*/
- public static final Integer MAX_FREE_COUNT=0;
+ public static final Integer MAX_FREE_COUNT=5;
}
--
Gitblit v1.8.0