From db2412261a825653ca9eccc1fca0569f6745f1d7 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 21 Aug 2020 19:57:47 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-config/src/main/resources/application.properties | 2
kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml | 4
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 7
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/Dockerfile | 2
kidgrow-springcloud/kidgrow-springcloud-eureka/Dockerfile | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/Dockerfile | 2
kidgrow-uaa/kidgrow-uaa-server/Dockerfile | 2
kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/Dockerfile | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml | 3
kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml | 43 ++++----
kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile | 2
kidgrow-business/kidgrow-logcenter/Dockerfile | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 113 ++++++++++++++--------
kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfile | 2
kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/pom.xml | 6 +
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 16 ++-
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 9 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/Dockerfile | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java | 21 ++-
19 files changed, 151 insertions(+), 91 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/Dockerfile b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/Dockerfile
index fef5f1e..78e6474 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/Dockerfile
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx256m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-logcenter/Dockerfile b/kidgrow-business/kidgrow-logcenter/Dockerfile
index fef5f1e..f28a337 100644
--- a/kidgrow-business/kidgrow-logcenter/Dockerfile
+++ b/kidgrow-business/kidgrow-logcenter/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx128m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/Dockerfile b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/Dockerfile
index fef5f1e..80fee4b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/Dockerfile
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx400m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
index 49f6395..3d06eac 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
@@ -6,6 +6,7 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.mapper.SysOrganizationMapper;
@@ -241,16 +242,19 @@
SysOrganization sysOrganizationLast = list.get(list.size() - 1);
if (sysOrganizationLast.getOrgLevel() >= 2) {
String orgCodeLast = sysOrganizationLast.getOrgCode();
- //取前部分
- String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 3);
- //取后部分
- Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 3));
- String str = "00";
- str += (codenum + 1);
- String substring = str.substring(str.length() - 3);
- return orgCodeLastQianZhui + substring;
+ if (StringUtils.isNotBlank(orgCodeLast)) {
+ //取前部分
+ String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 3);
+ //取后部分
+ Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 3));
+ String str = "00";
+ str += (codenum + 1);
+ String substring = str.substring(str.length() - 3);
+ return orgCodeLastQianZhui + substring;
+ }
} else {
String orgCodeLast = sysOrganizationLast.getOrgCode();
+ if (StringUtils.isNotBlank(orgCodeLast)) {
//取前部分
String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 7);
//取后部分
@@ -259,6 +263,7 @@
str += (codenum + 1);
String substring = str.substring(str.length() - 7);
return orgCodeLastQianZhui + substring;
+ }
}
} else {
String fucode = sysOrg.getOrgCode();
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 79c10bb..fb96ff6 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -466,8 +466,8 @@
@Override
public ResultBody findCountByMap(Map<String, Object> map) {
- map.put("enable",1);
- map.put("isDel",0);
+ map.put("enable", 1);
+ map.put("isDel", 0);
Integer integer = baseMapper.selectCountByMap(map);
return ResultBody.ok().data(integer);
}
@@ -672,6 +672,10 @@
Long createUserId = CommonConstant.CREATE_USER_ID;
//创建人名称
String createUserName = CommonConstant.CREATE_USER_NAME;
+ //销售服务人员
+ SysUser sysUserSale = baseMapper.selectById(CommonConstant.SALE_USER_ID);
+ //运营服务人员
+ SysUser sysUserOpration = baseMapper.selectById(CommonConstant.OPRATION_USER_ID);
//是否注册用户
Boolean isReg = false;
//业务成功
@@ -679,8 +683,8 @@
//业务失败提示信息
String expMsg = "";
//系统内置的注册医院和科室的组织数据
- Long organizationHos = CommonConstant.HOSPITAL_ORG_ID;
- Long organizationDep = CommonConstant.DEPARTMENT_ORG_ID;
+ Long organizationHos = 0L;
+ Long organizationDep = 0L;
//检查判断是注册 还是添加用户，注册用户先走基本数据建设 医院/科室
SysUserOrg sysUserOrgH = new SysUserOrg();
SysUserOrg sysUserOrgD = new SysUserOrg();
@@ -690,44 +694,72 @@
isReg = true;
if (CheckVerificationCode(ConstantSMS.REGISTER_SMS, userRegVo.getMobile(), userRegVo.getVerification())) {
userRegVo.setDoctorState(true);
- //写医院数据
- SysHospital sysHospital = new SysHospital();
- sysHospital.setHospitalName(userRegVo.getHospitalName());
- sysHospital.setOrgId(organizationHos);
- //注册的用户所在医院默认是试用状态
- sysHospital.setHospitalState(0);
- sysHospital.setCreateUserId(createUserId);
- sysHospital.setCreateUserName(createUserName);
-
- boolean h = hospitalService.save(sysHospital);
- if (h) {
- userRegVo.setHospitalId(sysHospital.getId());
- //保存科室数据
- SysDepartment sysDepartment = new SysDepartment();
- sysDepartment.setOrgId(organizationDep);
- sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
- sysDepartment.setSaleUserId(createUserId);
- sysDepartment.setAccountsCount(1);
- sysDepartment.setSaleUserName(createUserName);
- sysDepartment.setSaleUserTel("0");
- sysDepartment.setServerUserId(createUserId);
- sysDepartment.setServerUserTel("0");
- sysDepartment.setServerUserName(createUserName);
- boolean d = departmentService.save(sysDepartment);
- if (d) {
- userRegVo.setDepartmentId(sysDepartment.getId());
- //自动充入系统指定的试用套餐
- if (!saveProductDetail(sysHospital.getId(), sysDepartment.getId(), sysHospital.getHospitalName(), sysDepartment.getDepartmentName())) {
+ //写医院组织数据
+ SysOrganization sysOrganizationH = new SysOrganization();
+ sysOrganizationH.setOrgLevel(1);
+ sysOrganizationH.setOrgAttr(1);
+ sysOrganizationH.setOrgParentId(CommonConstant.ORG_PARENT_ID);
+ sysOrganizationH.setOrgName(userRegVo.getHospitalName());
+ sysOrganizationH.setCreateUserId(createUserId);
+ sysOrganizationH.setCreateUserName(createUserName);
+ if (organizationService.save(sysOrganizationH)) {
+ //写科室组织数据
+ SysOrganization sysOrganizationD = new SysOrganization();
+ sysOrganizationD.setOrgLevel(2);
+ sysOrganizationD.setOrgAttr(2);
+ sysOrganizationD.setOrgParentId(sysOrganizationH.getId());
+ sysOrganizationD.setOrgName(userRegVo.getDepartmentName());
+ sysOrganizationD.setCreateUserId(createUserId);
+ sysOrganizationD.setCreateUserName(createUserName);
+ if (organizationService.save(sysOrganizationD)) {
+ //写医院组织数据
+ SysHospital sysHospital = new SysHospital();
+ sysHospital.setHospitalName(userRegVo.getHospitalName());
+ sysHospital.setOrgId(sysOrganizationH.getId());
+ //注册的用户所在医院默认是试用状态
+ sysHospital.setHospitalState(0);
+ sysHospital.setCreateUserId(createUserId);
+ sysHospital.setCreateUserName(createUserName);
+ if (hospitalService.save(sysHospital)) {
+ userRegVo.setHospitalId(sysHospital.getId());
+ //保存科室数据
+ SysDepartment sysDepartment = new SysDepartment();
+ sysDepartment.setOrgId(sysOrganizationD.getId());
+ sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
+ sysDepartment.setSaleUserId(sysUserSale.getId());
+ sysDepartment.setAccountsCount(1);
+ sysDepartment.setSaleUserName(sysUserSale.getNickname());
+ sysDepartment.setSaleUserTel(sysUserSale.getMobile());
+ sysDepartment.setServerUserId(sysUserOpration.getId());
+ sysDepartment.setServerUserTel(sysUserOpration.getMobile());
+ sysDepartment.setServerUserName(sysUserOpration.getNickname());
+ sysDepartment.setCreateUserId(createUserId);
+ sysDepartment.setCreateUserName(createUserName);
+ if (departmentService.save(sysDepartment)) {
+ userRegVo.setDepartmentId(sysDepartment.getId());
+ //自动充入系统指定的试用套餐
+ if (!saveProductDetail(sysHospital.getId(),
+ sysDepartment.getId(),
+ sysHospital.getHospitalName(),
+ sysDepartment.getDepartmentName())) {
+ isSuccess = false;
+ expMsg = "试用套餐充值失败";
+ }
+ } else {
+ isSuccess = false;
+ expMsg = "科室数据写入失败";
+ }
+ } else {
isSuccess = false;
- expMsg = "套餐充值失败";
+ expMsg = "医院数据写入失败";
}
} else {
isSuccess = false;
- expMsg = "科室数据写入失败";
+ expMsg = "科室组织数据写入失败";
}
} else {
isSuccess = false;
- expMsg = "医院数据写入失败";
+ expMsg = "医院组织数据写入失败";
}
} else {
return ResultBody.failed("无效的验证码");
@@ -787,18 +819,19 @@
if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
//检查医生职务是否存在
Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("dictionariesName", userRegVo.getDoctorRank());
+ selectMap.put("dictionariesNameAll", userRegVo.getDoctorRank().trim());
List<SysDictionaries> dictionariesList = sysDictionariesService.findAll(selectMap);
boolean dicBool = false;
if (dictionariesList.size() > 0) {
for (int i = dictionariesList.size() - 1; i >= 0; i--) {
- if (dictionariesList.get(i).getDictionariesName().equals(userRegVo.getDoctorRank())) {
+ if (dictionariesList.get(i).getDictionariesName().trim().equals(userRegVo.getDoctorRank().trim())) {
userRegVo.setDoctorRankId(dictionariesList.get(i).getId());
dicBool = true;
break;
}
}
- } else {
+ }
+ else {
//创建字典数据
sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
//将名称汉字转为拼音
@@ -846,8 +879,8 @@
sysDoctor.setDoctorState(!isReg);
sysDoctor.setDoctorTel(userRegVo.getMobile());
sysDoctor.setDoctorName(userRegVo.getNickname());
- sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
- sysDoctor.setServerUserName(isReg ? createUserName : sysUserd.getUsername());
+ sysDoctor.setServerUserId(isReg ? sysUserSale.getId() : sysUserd.getId());
+ sysDoctor.setServerUserName(isReg ? sysUserSale.getNickname() : sysUserd.getUsername());
sysDoctor.setIsAdminUser(false);
sysDoctor.setDoctorCcie(userRegVo.getDoctorCcie());
sysDoctor.setEnabled(true);
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
index b8f51c3..cccb3d5 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
@@ -18,6 +18,9 @@
<if test="p.dictionariesName != null and p.dictionariesName !=''">
and dictionaries_name like '%${p.dictionariesName}%'
</if>
+ <if test="p.dictionariesNameAll != null and p.dictionariesNameAll !=''">
+ and dictionaries_name= #{p.dictionariesNameAll}
+ </if>
<if test="p.dictionariesClassId != null and p.dictionariesClassId !=''">
and dictionaries_class_id = #{p.dictionariesClassId}
</if>
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/Dockerfile b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/Dockerfile
index fef5f1e..80fee4b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/Dockerfile
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx400m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
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 9e8ddbf..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
@@ -274,14 +274,10 @@
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
- */
- public static final Long DEPARTMENT_ORG_ID=15321234571L;
/**
* 自主注册的用户默认给的产品id
*/
@@ -306,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标识
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml
index 3fe6552..f40f53f 100644
--- a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml
+++ b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml
@@ -96,10 +96,10 @@
<discardingThreshold>0</discardingThreshold>
<appender-ref ref="audit_log"/>
</appender>
- <logger name="com.central.log.monitor" level="debug" addtivity="false">
+ <logger name="com.kidgrow.log.monitor" level="debug" addtivity="false">
<appender-ref ref="point_log_async" />
</logger>
- <logger name="com.central.log.service.impl.LoggerAuditServiceImpl" level="debug" addtivity="false">
+ <logger name="com.kidgrow.log.service.impl.LoggerAuditServiceImpl" level="debug" addtivity="false">
<appender-ref ref="audit_log_async" />
</logger>
diff --git a/kidgrow-config/src/main/resources/application.properties b/kidgrow-config/src/main/resources/application.properties
index 630270e..63ecf1e 100644
--- a/kidgrow-config/src/main/resources/application.properties
+++ b/kidgrow-config/src/main/resources/application.properties
@@ -37,6 +37,8 @@
# hystrix.command.default.execution.timeout.enabled: false
#\u8D85\u65F6\u65F6\u957F
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 10000
+#\u9694\u79BB\u7EA7\u522B
+hystrix.command.default.execution.isolation.strategy: SEMAPHORE
##### Redis\u914D\u7F6E
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
diff --git a/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfile b/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfile
index fef5f1e..f28a337 100644
--- a/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfile
+++ b/kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-center-server/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx128m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-springcloud/kidgrow-springcloud-eureka/Dockerfile b/kidgrow-springcloud/kidgrow-springcloud-eureka/Dockerfile
index fef5f1e..f28a337 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-eureka/Dockerfile
+++ b/kidgrow-springcloud/kidgrow-springcloud-eureka/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx128m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/Dockerfile b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/Dockerfile
index fef5f1e..78e6474 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/Dockerfile
+++ b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/Dockerfile
@@ -11,4 +11,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx256m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/pom.xml b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/pom.xml
index 34897b6..cfd0c06 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/pom.xml
+++ b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/pom.xml
@@ -44,6 +44,10 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-mail</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -73,7 +77,7 @@
<dockerfile>Dockerfile</dockerfile>
<repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
<!-- 生成镜像标签 如不指定 默认为latest -->
- <tag>1.0.1</tag>
+ <tag>1.0.2</tag>
<!--<tag>${project.version}</tag>-->
<buildArgs>
<JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>
diff --git a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml
index f57fc83..932f536 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml
@@ -8,6 +8,8 @@
hostname: ${kidgrow.eureka.instance.hostname}
instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port}
prefer-ip-address: true
+ leaseRenewalIntervalInSeconds: 10
+ health-check-url-path: /actuator/health
client:
serviceUrl:
defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone}
@@ -20,6 +22,27 @@
spring:
application:
name: admin
+ boot:
+ admin:
+ ui:
+ title: KidgrowAdmin-Server
+ notify:
+ mail:
+ from: 4345453@qq.com
+ to: 64294050@kidgrow.com,4345453@kidgrow,1024030301@kidgrow.com
+ mail:
+ host: smtp.qq.com
+ default-encoding: utf-8
+ username: 4345453@qq.com
+ password: kqqgvhgskdrpbgia
+ properties:
+ mail:
+ smtp:
+ auth: true
+ starttls:
+ enable: true
+ required: true
+
management:
endpoints:
web:
@@ -28,23 +51,3 @@
endpoint:
health:
show-details: ALWAYS
-
- boot:
- admin:
- notify:
- mail:
- from: china365days@163.com
- to: 4345453@kidgrow.com
- mail:
- host: smtp.163.com
- password: adflks888
- properties:
- mail:
- smtp:
- auth: true
- starttls:
- enable: true
- required: true
- username: china365days@163.com
-
-
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile b/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile
index 535cbca..11fd628 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile
@@ -13,4 +13,4 @@
# 接收指定内存
ENV JAVA_OPTS=$JAVA_OPTS
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx256m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index c05a29b..1c4c1b3 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -36,7 +36,9 @@
ignored-headers: Access-Control-Allow-Credentials,Access-Control-Allow-Origin,Access-Control-Allow-Methods
add-host-header: true
host:
- connectTimeoutMillis: 10000
+# connectTimeoutMillis: 10000
+ socket-timeout-millis: 60000
+ connect-timeout-millis: 60000
routes:
auth:
path: /api-uaa/**
@@ -278,6 +280,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -300,4 +304,5 @@
butler:
auto-generate-from-zuul-routes: true
generate-routes: user,file,log,codegenerator,auth
- apiDocsPath: v2/api-docs
\ No newline at end of file
+ apiDocsPath: v2/api-docs
+
diff --git a/kidgrow-uaa/kidgrow-uaa-server/Dockerfile b/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
index ad8dab4..af7a2e0 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
+++ b/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
@@ -89,4 +89,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx256m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
index 6b920bc..e57d22c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -411,7 +411,7 @@
},
{
field: 'doctorName',
- width: 120,
+ width: 100,
title: '医生姓名',
fixed: 'left'
},
@@ -467,10 +467,11 @@
title: '销售代表'
},
{
- width: 350,
+ width: 300,
align: 'center',
toolbar: '#doctor-table-bar',
- title: '操作'
+ title: '操作',
+ fixed: 'right'
},
]
],
--
Gitblit v1.8.0