Merge remote-tracking branch 'origin/master_saas' into master_saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

.gitignore

@@ -1,14 +1,37 @@
 *.class
 .metadata
-target
+/target/
 *.classpath
 .settings
 .project
-/p2p-biz/test-output
-bin
-/manage-center/src/main/resources/config/properties/generatorConfig.xml
-.gitignore
-.idea
 *.iml
 /lib/
-rebel.xml
+
+### 忽略子模块的文件 ###
+**/*.ims
+**/*.iml
+**/*.ipr
+**/dep.txt
+**/.mvn/
+**/.idea/
+**/out/
+**/logs/
+**/target/
+**/mvnw
+**/mvnw.cmd
+
+### IntelliJ IDEA ###
+/.idea/
+/out/
+/logs/
+/.mvn/
+!.gitignore
+mvnw
+mvnw.cmd
+*.iws
+*.ipr
+/codegen/src/main/resources/generateConfigration.xml
+**/bootstrap-dev.yml
+**/bootstrap-dev.properties
+/bin/
+**/logback-spring.xml

mec-auth/mec-auth-server/src/main/resources/bootstrap-dev_server.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=fd352683-69df-439a-802f-c44f0c21329c
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=auth
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -329,7 +329,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			loadEmailInfo(senderTenantId);
 			// debugMode = false;
 		}
-		if(StringUtils.isNotEmpty(jpushType) && jpushType == "STUDENT"){
+		if(StringUtils.isNotEmpty(jpushType) && jpushType.equals("STUDENT")){
 			//如果不是缴费信息
 			if(type != STUDENT_PUSH_VIP_BUY){
 				int hour = DateUtil.getHour(new Date());
@@ -373,8 +373,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
-				if (debugMode == true
-						|| messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
+				if (messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
 								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null)) {
 					status = SendStatusEnum.SUCCESSED;
 				} else {
@@ -454,8 +453,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
-				if (debugMode == true
-						|| messageSenderPluginContext.batchSend(MessageSender.JIGUANG, messageConfig.getDescription(),
+				if (messageSenderPluginContext.batchSend(MessageSender.JIGUANG, messageConfig.getDescription(),
 								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,sound,channelId)) {
 					status = SendStatusEnum.SUCCESSED;
 				} else {
@@ -493,7 +491,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
-				if (debugMode == true || messageSenderPluginContext.send(messageSender, receiver, title, content, url,jpushType,"default",null)) {
+				if (messageSenderPluginContext.send(messageSender, receiver, title, content, url,jpushType,"default",null)) {
 					status = SendStatusEnum.SUCCESSED;
 				} else {
 					status = SendStatusEnum.FAILED;

mec-web/src/main/java/com/ym/mec/web/controller/education/EduSendNoticeController.java

@@ -39,8 +39,9 @@ public class EduSendNoticeController extends BaseController {
         for (Integer userId : pushInfo.getUserIds()) {
             userMap.put(userId, userId.toString());
         }
-        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
-        String workOrderUrl = "8?" + baseApiUrl + pushInfo.getWorkOrderUrl();
+        //String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+        //String workOrderUrl = "8?" + baseApiUrl + pushInfo.getWorkOrderUrl();
+        String workOrderUrl = pushInfo.getWorkOrderUrl();
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, pushInfo.getMessageType(), userMap, null, 0, workOrderUrl, "SYSTEM");
         return succeed();
     }