czg_team
/
chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

This commit is contained in:
liuyingfang 2023-06-17 16:50:13 +08:00
parent 51537d9421 1efdf1a3f6
commit 2cb6f7de9a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java
View File

@ -1,13 +1,18 @@
package cn.pluss.platform;
import cn.pluss.platform.klk.util.HtmlUtil;
import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
@MapperScan("cn.pluss.platform.mapper")
@ -26,4 +31,12 @@ public class ManageApplication extends SpringBootServletInitializer {
return builder.sources(ManageApplication.class);
}
@Bean
public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
return (args) -> {
logger.info("=========================启动完成==========================");
ctx.getBean(HtmlUtil.class).initHtml();
};
}
}

2
pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java
View File

@ -311,7 +311,7 @@ public class LaKalaInterfaceImpl {
data.put("contactManName", userBrakCard.getPhone());
data.put("channelType", ObjectUtils.isEmpty(mccReflect) ? "7399" : mccReflect.getMccCode());
data.put("phone", userBrakCard.getPhone());
data.put("agencyName", merchantBaseInfo.getBussAuthNum());
data.put("agencyName", merchantBaseInfo.getMerchantName());
// //协议
AttchmentsVo agree_ment = new AttchmentsVo(); //图片set

3
pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/HtmlUtil.java
View File

@ -27,7 +27,8 @@ public class HtmlUtil {
@Autowired
FreeMarkerConfigurer freeMarkerConfigurer;
static Template template =null;
@Bean
public void initHtml(){
try {
template = freeMarkerConfigurer.getConfiguration().getTemplate("indexHTKWECHAT_PAY.html");