消息订阅模板修改

ldt-core/src/main/java/org/springblade/common/config/mq/RabbitConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  * @description:
  * @since: 10/25/21 -- 2:29 PM
  */
-//@Configuration
+@Configuration
 public class RabbitConfig {
 
 	@Bean

ldt-core/src/main/java/org/springblade/flow/mall/controller/MallAuditController.java

@@ -21,6 +21,7 @@ public class MallAuditController {
 	@RequestMapping(value = "invitationCallback", method = {RequestMethod.POST, RequestMethod.GET})
 	@ApiOperation("商场入驻回调通知")
 	public R invitationCallback() {
+
 		return R.success("操作成功！");
 	}
 

ldt-core/src/main/java/org/springblade/flow/shop/task/QueryAuthStatus.java

@@ -167,7 +167,7 @@ public class QueryAuthStatus {
 
 			//微信模板消息
 			String openId = item.getShop().getOpenId();
-			String contentStr = String.format(MessageTemplate.INVITATION_SIGN.getContentString(),configForShop.getAppName());
+			String contentStr = String.format(MessageTemplate.INVITATION_SIGN.getContentString(),configForShop.getAppName(),"进入小程序完成认证");
 			JSONObject content = JSON.parseObject(contentStr);
 			weChatService.sendTemplateMessage(openId, MessageTemplate.INVITATION_SIGN,content,configForShop.getAuthPage(), MiniProgramType.SHOP);
 

ldt-core/src/main/java/org/springblade/flow/shop/task/callback/ShopInvitationSignCallback.java

@@ -123,7 +123,7 @@ public class ShopInvitationSignCallback implements ShopInvitationCallback {
 	 * */
 	private void sendMessageTemplate(String signUrl, String openId){
 		/*"ofVsB4-Gf4f45altMf0FbMbSCZmU"*/
-		JSONObject data = JSON.parseObject(String.format(MessageTemplate.INVITATION_SIGN.getContentString(), "商户签约邀请","请进入小程序完成签约！"));
+		JSONObject data = JSON.parseObject(String.format(MessageTemplate.INVITATION_SIGN.getContentString(), "商户签约","请进入小程序完成签约！"));
 		//通知用户签约
 		weChatService.sendTemplateMessage(openId,
 			MessageTemplate.INVITATION_SIGN,

ldt-core/src/main/java/org/springblade/risk/log/listener/LdtLogListener.java

@@ -20,13 +20,13 @@ import org.springframework.stereotype.Component;
 @AllArgsConstructor
 public class LdtLogListener {
 
-//	private  RabbitTemplate rabbitTemplate;
+	private  RabbitTemplate rabbitTemplate;
 
 	@Async
 	@EventListener({UsualLogEvent.class})
 	public void saveApiLog(UsualLogEvent event) {
 		String data = JSON.toJSONString(event.getSource());
-//		rabbitTemplate.send("LogDirectExchange","LogDirectRouting",new Message(data.getBytes()));
+		rabbitTemplate.send("LogDirectExchange","LogDirectRouting",new Message(data.getBytes()));
 		System.out.println(data);
 	}
 }

ldt-core/src/main/java/org/springblade/wx/constant/MessageTemplate.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.core.env.Environment;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -36,14 +38,12 @@ public enum MessageTemplate {
 	String contentString;
 
 	public String buildRequestBody(String openId, JSONObject content, String page){
-		HashMap<String, Object> params = new HashMap<>(3);
+		HashMap<String, Object> params = new HashMap<>(4);
 		params.put("touser",openId);
-//		params.put("miniprogram_state","developer");
-		HashMap<String, Object> weappTemplateMsg = new HashMap<>(3);
-		weappTemplateMsg.put("template_id",templateId);
-		weappTemplateMsg.put("data",content);
-		weappTemplateMsg.put("page",page);
-		params.put("weapp_template_msg",weappTemplateMsg);
+		params.put("miniprogram_state","trial");
+		params.put("template_id",this.getTemplateId());
+		params.put("page",page);
+		params.put("data",content);
 		return JSON.toJSONString(params);
 	}
 

ldt-core/src/main/java/org/springblade/yeePay/controller/YeepayController.java

@@ -1,5 +1,7 @@
 package org.springblade.yeePay.controller;
 
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
@@ -8,6 +10,8 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.wx.constant.WeChatApi;
 import org.springblade.wx.utils.UrlTransform;
 import org.springblade.yeePay.common.YeePayConst;
 import org.springblade.yeePay.entity.ConfigAppDto;
@@ -22,6 +26,7 @@ import org.springblade.yeePay.entity.saas.trade.TradeOrderQueryDto;
 import org.springblade.yeePay.service.YeepayCommonService;
 import org.springblade.yeePay.service.YeepaySaasService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -182,7 +187,7 @@ public class YeepayController {
 	@ApiOperation("测试")
 	@ApiLog
 	public R test() {
-		logger.info("ss","sdf");
+		logger.info("log","asdf");
 		return R.success("s");
 	}
 

ldt-risk/dependency-reduced-pom.xml

@@ -131,6 +131,38 @@
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.flink</groupId>
+      <artifactId>flink-java</artifactId>
+      <version>1.14.0</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-math3</artifactId>
+          <groupId>org.apache.commons</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.flink</groupId>
+      <artifactId>flink-streaming-java_2.11</artifactId>
+      <version>1.14.0</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>flink-file-sink-common</artifactId>
+          <groupId>org.apache.flink</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>flink-scala_2.11</artifactId>
+          <groupId>org.apache.flink</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-math3</artifactId>
+          <groupId>org.apache.commons</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

ldt-risk/src/main/java/org/springblade/sink/MongoSink.java

@@ -1,15 +1,12 @@
 package org.springblade.sink;
 
 import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
 import com.mongodb.client.MongoDatabase;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.streaming.api.functions.sink.RichSinkFunction;
 import org.bson.Document;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import org.springblade.utils.MongoUtils;
+
 
 /**
  * @author: lianghanqiang
@@ -18,7 +15,6 @@ import java.util.Objects;
  */
 public class MongoSink extends RichSinkFunction<String> {
 
-	private MongoClient mongoClient;
 	private MongoDatabase mongoDatabase;
 
 	/**
@@ -26,21 +22,7 @@ public class MongoSink extends RichSinkFunction<String> {
 	 */
 	@Override
 	public void open(Configuration parameters) throws Exception {
-		if(Objects.isNull(mongoDatabase)){
-			//通过连接认证获取MongoDB连接
-			ServerAddress serverAddress = new ServerAddress("192.168.1.218",27017);
-			List<ServerAddress> addrs = new ArrayList<ServerAddress>();
-			addrs.add(serverAddress);
-
-			//MongoCredential.createScramSha1Credential()三个参数分别为 用户名 数据库名称 密码
-			MongoCredential credential = MongoCredential.createScramSha1Credential("root", "ldt", "123456".toCharArray());
-			List<MongoCredential> credentials = new ArrayList<MongoCredential>();
-			credentials.add(credential);
-
-			//通过连接认证获取MongoDB连接
-			this.mongoClient = new MongoClient(addrs,credentials);
-			
-		}
+		this.mongoDatabase = MongoUtils.getMongoDatabase("ldt");
 		super.open(parameters);
 	}
 
@@ -60,7 +42,6 @@ public class MongoSink extends RichSinkFunction<String> {
 	 */
 	@Override
 	public void close() throws Exception {
-		this.mongoClient.close();
 		super.close();
 	}
 }

ldt-risk/src/main/java/org/springblade/utils/MongoUtils.java

@@ -5,11 +5,13 @@ import com.alibaba.fastjson.JSON;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoDatabase;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 
 /**
@@ -22,33 +24,47 @@ import java.util.Properties;
 public class MongoUtils {
 
 	private static MongoClient mongoClient;
+	private static MongoDatabase mongoDatabase;
 
-	static {
-		ClassPathResource resource = new ClassPathResource("mongo.properties");
-		Properties properties = new Properties();
-		try {
-			properties.load(resource.getStream());
-			//通过连接认证获取MongoDB连接
-			ServerAddress serverAddress = new ServerAddress("192.168.1.218",27017);
-			List<ServerAddress> addrs = new ArrayList<ServerAddress>();
-			addrs.add(serverAddress);
-
-			//MongoCredential.createScramSha1Credential()三个参数分别为 用户名 数据库名称 密码
-			MongoCredential credential = MongoCredential.createScramSha1Credential("root", "ldt", "123456".toCharArray());
-			List<MongoCredential> credentials = new ArrayList<MongoCredential>();
-			credentials.add(credential);
-
-			//通过连接认证获取MongoDB连接
-			mongoClient = new com.mongodb.MongoClient(addrs,credentials);
-			System.out.println(JSON.toJSONString(properties));
-		} catch (IOException e) {
-			log.error("============================== error start ( Mongo connect error ) =====================");
-			e.printStackTrace();
-			log.error("============================== error end   ( Mongo connect error ) =====================");
+
+	public static MongoDatabase getMongoDatabase(String databaseName){
+		if(Objects.isNull(mongoClient)){
+			ClassPathResource resource = new ClassPathResource("mongo.properties");
+			Properties properties = new Properties();
+			try {
+				properties.load(resource.getStream());
+
+				String host = properties.getProperty("host");
+				int port = Integer.parseInt(properties.getProperty("port","27017"));
+				String userName = properties.getProperty("userName");
+				String password = properties.getProperty("password");
+				String database = properties.getProperty("database");
+
+				//通过连接认证获取MongoDB连接
+				ServerAddress serverAddress = new ServerAddress(host,port);
+				List<ServerAddress> addrs = new ArrayList<ServerAddress>();
+				addrs.add(serverAddress);
+
+				//MongoCredential.createScramSha1Credential()三个参数分别为 用户名 数据库名称 密码
+				MongoCredential credential = MongoCredential.createScramSha1Credential(userName, database, password.toCharArray());
+				List<MongoCredential> credentials = new ArrayList<MongoCredential>();
+				credentials.add(credential);
+
+				//通过连接认证获取MongoDB连接
+				mongoClient = new com.mongodb.MongoClient(addrs,credentials);
+				System.out.println(JSON.toJSONString(properties));
+			} catch (IOException e) {
+				log.error("============================== error start ( Mongo connect error ) =====================");
+				e.printStackTrace();
+				log.error("============================== error end   ( Mongo connect error ) =====================");
+			}
 		}
+		return mongoClient.getDatabase(databaseName);
 	}
 
-	public static void main(String[] args) {
-		new MongoUtils();
+
+	public static void main(String[] args){
+		MongoDatabase ldt = MongoUtils.getMongoDatabase("ldt");
+		System.out.println(ldt);
 	}
 }

ldt-risk/src/main/resources/mongo.properties

@@ -6,3 +6,5 @@ userName=root
 password=123456
 #数据库
 database=ldt
+#主机地址
+host=192.168.1.218