From 73d5561cbf2bea50acc22f91050fcc3557d49de4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 17 Aug 2020 09:58:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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..9e8ddbf 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
      */
@@ -279,7 +282,18 @@
      * 自主注册的科室组织id
      */
     public static final Long DEPARTMENT_ORG_ID=15321234571L;
-
+    /**
+     * 自主注册的用户默认给的产品id
+     */
+    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
      */
@@ -334,5 +348,5 @@
     /**
      * 一个科室能最大试用多少次
      */
-    public static final Integer MAX_FREE_COUNT=0;
+    public static final Integer MAX_FREE_COUNT=5;
 }

--
Gitblit v1.8.0