fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/ReportController.java

@@ -5,7 +5,7 @@ import org.fouram.core.base.controller.BaseController;
 import org.fouram.core.util.AppUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.LoggerUtil;
-import org.fouram.service.CheckTaskService;
+import org.fouram.job.CheckTaskJob;
 import org.fouram.service.WxCheckService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -20,7 +20,7 @@ public class ReportController extends BaseController {
 	@Autowired
 	private WxCheckService wxCheckService;
 	@Autowired
-	private CheckTaskService checkTaskService;
+	private CheckTaskJob checkTaskJob;
 
 	/**
 	 * http://localhost:8080/sapcms/report/saveReportData?checkinDay=2020-07-27
@@ -36,7 +36,7 @@ public class ReportController extends BaseController {
 				return AppUtil.error("参数checkinDay为空");
 			}
 			for(String day : checkinDay.split(",")) {
-				checkTaskService.executeBiz(day, "23");
+				checkTaskJob.executeBiz(day, "23");
 				LoggerUtil.info("saveReportData->" + day);
 			}
 			return AppUtil.success();

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/core/WXCpMessage.java

@@ -17,8 +17,8 @@ public class WXCpMessage {
 	static {
 		WxCpDefaultConfigImpl configStorage = new WxCpDefaultConfigImpl();
 		configStorage.setCorpId(ConfConfig.getConfigString("wxCp.corpId"));
-		configStorage.setCorpSecret(ConfConfig.getConfigString("wxCp.massage.secret"));
-		configStorage.setAgentId(ConfConfig.getConfigInteger("wxCp.massage.agentId"));
+		configStorage.setCorpSecret(ConfConfig.getConfigString("wxCp.message.secret"));
+		configStorage.setAgentId(ConfConfig.getConfigInteger("wxCp.message.agentId"));
 		// 初始化基础service
 		service.setWxCpConfigStorage(configStorage);
 	}

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpMessageUtil.java

@@ -1,18 +1,12 @@
 package org.fouram.core.plugin.weixin.cp.util;
 
-import java.util.List;
-
 import org.fouram.core.plugin.weixin.cp.core.WXCpMessage;
-import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.LoggerUtil;
 
-import com.google.common.collect.Lists;
-
 import me.chanjar.weixin.common.api.WxConsts.KefuMsgType;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 import me.chanjar.weixin.cp.bean.WxCpMessageSendResult;
-import me.chanjar.weixin.cp.bean.article.NewArticle;
 
 /**
  * 企业微信用户工具类
@@ -21,15 +15,12 @@ import me.chanjar.weixin.cp.bean.article.NewArticle;
  */
 public class WXCpMessageUtil {
 
-	public static void sendQuitUserMsg(String title) throws WxErrorException {
+	public static void send(String content, String toUser) throws WxErrorException {
 		try {
 			WxCpMessage message = new WxCpMessage();
-			message.setToUser(ConfConfig.getConfigString("wxCp.massage.toUser"));
-			message.setMsgType(KefuMsgType.NEWS);
-			NewArticle article = NewArticle.builder().title(title)
-					.url(ConfConfig.getConfigString("wxCp.massage.quitUserUrl")).build();
-			List<NewArticle> articles = Lists.newArrayList(article);
-			message.setArticles(articles);
+			message.setToUser(toUser);
+			message.setMsgType(KefuMsgType.TEXT);
+			message.setContent(content);
 			WxCpMessageSendResult sendResult = WXCpMessage.service.messageSend(message);
 			LoggerUtil.info(sendResult.toString());
 		} catch (WxErrorException e) {
@@ -38,6 +29,6 @@ public class WXCpMessageUtil {
 	}
 
 	public static void main(String[] args) throws WxErrorException {
-		sendQuitUserMsg("test");
+		send("test\njjjjjj\n<a href=\"http://www.baidu.com\">百度一下</a>", "1000001");
 	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/service/CheckTaskService.java

@@ -1,14 +1,22 @@
-package org.fouram.service;
+package org.fouram.job;
 
 import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.LoggerUtil;
+import org.fouram.service.SapCheckdateService;
+import org.fouram.service.SapEmployeeTimeService;
+import org.fouram.service.SapUserService;
+import org.fouram.service.WxApprovalInfoService;
+import org.fouram.service.WxCheckOptionService;
+import org.fouram.service.WxCheckService;
+import org.fouram.service.WxDepartService;
+import org.fouram.service.WxUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
-public class CheckTaskService {
+public class CheckTaskJob {
 
 	@Autowired
 	private WxUserService wxUserService;

code/sapparent/sapservice/src/main/java/org/fouram/job/MessageJob.java

@@ -0,0 +1,13 @@
+package org.fouram.job;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class MessageJob {
+
+	public void taskBiz() {
+		System.out.println(111);
+	}
+}

code/sapparent/sapservice/src/main/resources/env/develop/config.properties

@@ -1,21 +1,25 @@
-env = product
+env = develop
+
+#fouram
+wxCp.corpId = ww51602aeb8dab7a95
+
+wxCp.corpSecret = 0i1jzYxLcriGTXhoatAGYaCFUXshfASbavRScZQxVmI
+
+wxCp.message.agentId = 1000003
+wxCp.message.secret = Sf9mHYuIeAFyqvyoDnTXAH2hlly7kWq6LoIYGCuTZUM
+wxCp.message.quitUserUrl = https://www.baidu.com
 
-#prod
-wxCp.corpId = ww911e29458d3a46fd
-wxCp.corpSecret = amUNgH2lo-szEYkLmClZN2jMYcDu0NnXIAtWfW729P4
-wxCp.massage.agentId = 1000009
-wxCp.massage.secret = a0HDbErBYZxL43yLIzTZ_9Q5q4eFf2EHSi67TWP1RbE
-wxCp.massage.toUser = dd4d61108fecaa34918a555fd1d8cce1
-wxCp.massage.quitUserUrl = https://www.baidu.com
 wxCp.oa.agentId = 3010011
-wxCp.oa.secret = iD6-Kv41i4S50bEZcwa9v5A22tDuwbkeuCar41y_9Ic
+wxCp.oa.secret = wSzjASahMpA7FoLEpQr_aRvoOY3DwES4Mnh57xGD0OY
 wxCp.oaApproval.agentId = 3010040
-wxCp.oaApproval.secret = -_Sf2jg42PZEQ1OVoLncisqTmASwQTmabDzqTz7kLfw
+wxCp.oaApproval.secret = E6Q2TzX39tkZngtyiECwKACM-wBUKVu-0juxG23yIXs
 
 wxCp.mailList.corpSecret = aI66cnVoFAd381rgd3NpyZaEP2qnuZJ2ogpZKWmz9qg
 wxCp.redirectUri = http://cmcadressbook.suggest.vip/sapcms
 wxCp.mailList.userId = 1,2,3,4,5,6,7,8,9,10,dd4d61108fecaa34918a555fd1d8cce1,1102
 
+#test
+#sapApi.user = APIADMIN@cmccoltdD:1234567
 #prod
 sapApi.user = API01@cmccoltd:cmccoltd123
 

code/sapparent/sapservice/src/main/resources/env/product/config.properties

@@ -3,10 +3,12 @@ env = product
 #prod
 wxCp.corpId = ww911e29458d3a46fd
 wxCp.corpSecret = amUNgH2lo-szEYkLmClZN2jMYcDu0NnXIAtWfW729P4
-wxCp.massage.agentId = 1000009
-wxCp.massage.secret = a0HDbErBYZxL43yLIzTZ_9Q5q4eFf2EHSi67TWP1RbE
-wxCp.massage.toUser = dd4d61108fecaa34918a555fd1d8cce1
-wxCp.massage.quitUserUrl = https://www.baidu.com
+
+wxCp.message.agentId = 1000009
+wxCp.message.secret = a0HDbErBYZxL43yLIzTZ_9Q5q4eFf2EHSi67TWP1RbE
+wxCp.message.toUser = dd4d61108fecaa34918a555fd1d8cce1
+wxCp.message.quitUserUrl = https://www.baidu.com
+
 wxCp.oa.agentId = 3010011
 wxCp.oa.secret = iD6-Kv41i4S50bEZcwa9v5A22tDuwbkeuCar41y_9Ic
 wxCp.oaApproval.agentId = 3010040

code/sapparent/sapservice/src/main/resources/spring/quartz.xml

@@ -26,10 +26,21 @@
 		<property name="cronExpression" value="0 30 * * * ?" />
 	</bean>
 	
+	<bean id="messageJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">  
+		<property name="targetObject" ref="messageService" />  
+		<property name="targetMethod" value="taskBiz" />  
+		<property name="concurrent" value="false" />
+	</bean>
+	<bean id="messageTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">  
+		<property name="jobDetail" ref="messageJob" />
+		<property name="cronExpression" value="0 30 * * * ?" />
+	</bean>
+	
 	<bean id="schedulerFactorys" autowire="no" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers">
 			<list>
 				<ref bean="syncCheckTrigger" />
+				<ref bean="messageTrigger" />
 			</list>
 		</property>
 	</bean>