Merge branch 'dev' into 'mp-server-test'

生产环境不导出幸运数字

See merge request quanshu/mp-server!228

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -24,6 +24,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.ChannelRoleEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.ServerEnvEnum;
 import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.utils.LogUtil;
@@ -68,29 +69,21 @@ public class TicketBoxMgrController extends BaseApiController {
 	@Autowired
 	private ITicketBoxService ticketBoxService;
 
-	@Autowired
-	private IChannelUserRelService channelUserRelService;
-
-	@Autowired
-	private ISysUserService userService;
-
 	@Autowired
 	private ITicketService ticketService;
 
 	@Autowired
 	private MapperFacade mapperFacade;
 
-
-	@Value("${wx-channel.appId}")
-	private String channelAppId;
-
-
 	@Value("${mp.exportUrl}")
 	private String exportUrl;
 
 	@Value("${export.page-size}")
 	private int pageSize;
 
+	@Value("${server.env}")
+	private String env;
+
 	/**
 	 * 查询所有盲票组列表
 	 *
@@ -222,7 +215,9 @@ public class TicketBoxMgrController extends BaseApiController {
 					ticketExcel.setSerialNo(ticket.getSerialNo());
 					ticketExcel.setUrl(exportUrl + ticket.getSerialNo());
 					ticketExcel.setDrawNum(ticket.getDrawNum());
-					ticketExcel.setCipherLuckyNum(RSAUtil.decrypt(ticket.getCipherLuckyNum()));
+					if (!ServerEnvEnum.PROD.getCode().equals(env)) {
+						ticketExcel.setCipherLuckyNum(RSAUtil.decrypt(ticket.getCipherLuckyNum()));
+					}
 					excelList.add(ticketExcel);
 				}
 			}
@@ -308,7 +303,9 @@ public class TicketBoxMgrController extends BaseApiController {
 					ticketExcel.setSerialNo(ticket.getSerialNo());
 					ticketExcel.setUrl(exportUrl + ticket.getSerialNo());
 					ticketExcel.setDrawNum(formatDraw(ticket.getDrawNum()));
-					ticketExcel.setCipherLuckyNum(RSAUtil.decrypt(ticket.getCipherLuckyNum()));
+					if (!ServerEnvEnum.PROD.getCode().equals(env)) {
+						ticketExcel.setCipherLuckyNum(RSAUtil.decrypt(ticket.getCipherLuckyNum()));
+					}
 					excelList.add(ticketExcel);
 				}
 			}

mp-common/src/main/java/com/qs/mp/common/utils/WebhookService.java

@@ -10,14 +10,14 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class WebhookService {
-    
+
     private static Logger logger = LoggerFactory.getLogger(WebhookService.class);
     //private String dingToken = "https://oapi.dingtalk.com/robot/send?access_token=a2f955b2c685e4449ac98fd4a41b9ba1238a6badb58aba4da9c6fc50714fc43d";
     //final static String alertUrl = "https://oapi.dingtalk.com/robot/send?access_token=79bd929c6cdec2150dbd2d5fdb5b4a499c9ad8137da511eab85bc7d381af9d7a";
     //final static String url = "https://oapi.dingtalk.com/robot/send?access_token=a2f955b2c685e4449ac98fd4a41b9ba1238a6badb58aba4da9c6fc50714fc43d";
-    final static String wxLogMonitorUrl = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=ab1d9a09-2425-410e-b3ef-be8ee681146f";
+    final static String wxLogMonitorUrl = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4275487c-8706-4676-ae21-e74db900fcb6";
 
-    private static String  wxRobotUrl = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=1433d0df-6def-4077-b466-e8f79f2fc60c";
+    private static String  wxRobotUrl = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=dd8d3a48-01f2-44b0-b4bb-406e2f466050";
     private static String env;
 
     @Value("${server.env}")
@@ -44,7 +44,7 @@ public class WebhookService {
         if (mobiles != null) {
             at.setAtMobiles(Arrays.asList(mobiles));
         }
-        
+
         request.setAt(at);
         try {
             OapiRobotSendResponse response = client.execute(request);
@@ -58,16 +58,16 @@ public class WebhookService {
 
     public static String sendWXRobot(String url , String msg) {
         //System.out.println("企业微信机器人告警发送：" + msg);
-        String jsonStr = "{\n" + 
-                "        \"msgtype\": \"text\",\n" + 
-                "        \"text\": {\n" + 
+        String jsonStr = "{\n" +
+                "        \"msgtype\": \"text\",\n" +
+                "        \"text\": {\n" +
                 "            \"content\": "+ JSON.toJSONString(msg)+"\n" +
-                "        }\n" + 
+                "        }\n" +
                 "   }";
         //System.out.println(jsonStr);
         return OkHttpUtil.post(url, jsonStr, null);
     }
-    
+
     public static String sendLogAlertMsg(String msg) {
 
         return sendWXRobot(wxLogMonitorUrl,msg);