fix: change domain
This commit is contained in:
@@ -316,14 +316,14 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
}
|
||||
|
||||
public void createDomainAndDns(String tenentKey) {
|
||||
Credential cred = new Credential("AKIDESceXUSmHvcFnFbqv3Tjnjn02FRZWKwW", "cFyys2FG7sV1Mm6KONVqNuHXjrvoaVSU");
|
||||
Credential cred = new Credential("AKIDxypW8arxqY5ThleNyTtAFUYWM0ShnjSC", "kMo3RhnjV6XowxqaNN9mCTbYP8iDVdWG");
|
||||
DnspodClient dnspodClient = new DnspodClient(cred, "");
|
||||
CreateRecordRequest req = new CreateRecordRequest();
|
||||
req.setDomain("hucs.top");
|
||||
req.setDomain("julyharbor.com");
|
||||
req.setRecordType("A");
|
||||
req.setRecordLine("默认");
|
||||
req.setValue("122.51.20.105");
|
||||
req.setSubDomain(tenentKey + ".july");
|
||||
req.setSubDomain(tenentKey);
|
||||
CreateRecordResponse createRecordResponse;
|
||||
try {
|
||||
createRecordResponse = dnspodClient.CreateRecord(req);
|
||||
|
||||
@@ -58,7 +58,7 @@ public class WxOauthController {
|
||||
@PostMapping("/getConfigAddress")
|
||||
public R getConfigAddress(@RequestBody WxUserQueryAddressVo vo) throws WxErrorException {
|
||||
// 默认回调地址
|
||||
String defaultAddress = "http://july.hucs.top/api/wx/oauth2/clerkLoginCallback";
|
||||
String defaultAddress = "https://julyharbor.com/api/wx/oauth2/clerkLoginCallback";
|
||||
if (!StrUtil.isBlankIfStr(vo.getUrl())) {
|
||||
defaultAddress = vo.getUrl();
|
||||
}
|
||||
@@ -69,7 +69,7 @@ public class WxOauthController {
|
||||
@PostMapping("/getClerkLoginAddress")
|
||||
public R getClerkLoginAddress(@RequestBody WxUserQueryAddressVo vo) {
|
||||
// 默认回调地址
|
||||
String defaultAddress = "http://july.hucs.top/api/wx/oauth2/clerkLoginCallback";
|
||||
String defaultAddress = "https://julyharbor.com/api/wx/oauth2/clerkLoginCallback";
|
||||
if (!StrUtil.isBlankIfStr(vo.getUrl())) {
|
||||
defaultAddress = vo.getUrl();
|
||||
}
|
||||
@@ -162,7 +162,7 @@ public class WxOauthController {
|
||||
@PostMapping("/getCustomLoginAddress")
|
||||
public R getCustomLoginAddress(@RequestBody WxUserQueryAddressVo vo) {
|
||||
// 默认回调地址
|
||||
String defaultAddress = "http://july.hucs.top/api/wx/oauth2/customLoginCallback";
|
||||
String defaultAddress = "https://julyharbor.com/api/wx/oauth2/customLoginCallback";
|
||||
if (!StrUtil.isBlankIfStr(vo.getUrl())) {
|
||||
defaultAddress = vo.getUrl();
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ public class WxCustomMpService {
|
||||
/**
|
||||
* 支付成功回调地址
|
||||
*/
|
||||
public static String NOTIFY_URL = "https://july.hucs.top/api/wx/pay/jsCallback";
|
||||
public static String NOTIFY_URL = "https://julyharbor.com/api/wx/pay/jsCallback";
|
||||
|
||||
|
||||
public WxMpService proxyWxMpService() {
|
||||
@@ -112,7 +112,7 @@ public class WxCustomMpService {
|
||||
public void sendBalanceMessage(PlayOrderInfoEntity order) {
|
||||
PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy());
|
||||
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId());
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getChongzhichenggongTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/user/");
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getChongzhichenggongTemplateId(), customUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/user/");
|
||||
List<WxMpTemplateData> data = new ArrayList<>();
|
||||
data.add(new WxMpTemplateData("time4", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
|
||||
data.add(new WxMpTemplateData("amount2", order.getOrderMoney().toString()));
|
||||
@@ -140,7 +140,7 @@ public class WxCustomMpService {
|
||||
public void sendCreateOrderMessage(String tenantId, String openId, String orderNo, String money, String commodityName) {
|
||||
|
||||
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId);
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getXindingdanshoulitongzhiTemplateId(), openId, "http://" + tenant.getTenantKey() + ".july.hucs.top/clerk/#/orderDetail/");
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getXindingdanshoulitongzhiTemplateId(), openId, "https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/");
|
||||
List<WxMpTemplateData> data = new ArrayList<>();
|
||||
data.add(new WxMpTemplateData("time6", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
|
||||
data.add(new WxMpTemplateData("character_string9", orderNo));
|
||||
@@ -168,7 +168,7 @@ public class WxCustomMpService {
|
||||
PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy());
|
||||
PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy());
|
||||
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getJiedanchenggongtongzhiTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/clerk/#/orderDetail/" + orderInfo.getId());
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getJiedanchenggongtongzhiTemplateId(), clerkUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId());
|
||||
List<WxMpTemplateData> data = new ArrayList<>();
|
||||
data.add(new WxMpTemplateData("character_string1", orderInfo.getOrderNo()));
|
||||
data.add(new WxMpTemplateData("time2", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
|
||||
@@ -180,7 +180,7 @@ public class WxCustomMpService {
|
||||
}
|
||||
|
||||
templateMessage.setToUser(customUserInfo.getOpenid());
|
||||
templateMessage.setUrl("http://" + tenant.getTenantKey() + ".july.hucs.top/user/#/orderDetail/" + orderInfo.getId());
|
||||
templateMessage.setUrl("https://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId());
|
||||
try {
|
||||
proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage);
|
||||
} catch (WxErrorException e) {
|
||||
@@ -195,7 +195,7 @@ public class WxCustomMpService {
|
||||
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(userInfo.getTenantId());
|
||||
String template_id = tenant.getRzsqshtxTemplateId();
|
||||
String tenantKey = tenant.getTenantKey();
|
||||
String url = "http://" + tenantKey + ".july.hucs.top/clerk/";
|
||||
String url = "https://" + tenantKey + ".julyharbor.com/clerk/";
|
||||
|
||||
WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();
|
||||
templateMessage.setTemplateId(template_id);
|
||||
@@ -220,7 +220,7 @@ public class WxCustomMpService {
|
||||
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId);
|
||||
String template_id = tenant.getRzsqAdminTemplateId();
|
||||
String tenantKey = tenant.getTenantKey();
|
||||
String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/admin/clerk-apply-list";
|
||||
String url = "https://" + tenantKey + ".julyharbor.com/clerk/#/admin/clerk-apply-list";
|
||||
List<PlayPersonnelAdminInfoEntity> adminInfoEntityList = playPersonnelAdminInfoService.list(Wrappers.lambdaQuery(PlayPersonnelAdminInfoEntity.class).select(PlayPersonnelAdminInfoEntity::getSysUserId));
|
||||
for (PlayPersonnelAdminInfoEntity adminInfoEntity : adminInfoEntityList) {
|
||||
PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, adminInfoEntity.getSysUserId()), false);
|
||||
@@ -273,7 +273,7 @@ public class WxCustomMpService {
|
||||
if (Objects.isNull(clerkUserInfo)) {
|
||||
continue;
|
||||
}
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdantousuchuliTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/clerk/#/admin/order/complain-list");
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdantousuchuliTemplateId(), clerkUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/admin/order/complain-list");
|
||||
List<WxMpTemplateData> data = new ArrayList<>();
|
||||
data.add(new WxMpTemplateData("character_string", orderInfo.getOrderNo()));
|
||||
data.add(new WxMpTemplateData("time2", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
|
||||
@@ -292,7 +292,7 @@ public class WxCustomMpService {
|
||||
if (order.getPlaceType().equals("1") || order.getPlaceType().equals("2")) {
|
||||
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId());
|
||||
PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy());
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdanwanchengtongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/user/#/orderDetail/" + order.getId());
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdanwanchengtongzhiTemplateId(), customUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + order.getId());
|
||||
List<WxMpTemplateData> data = new ArrayList<>();
|
||||
data.add(new WxMpTemplateData("time18", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
|
||||
data.add(new WxMpTemplateData("character_string8", order.getOrderNo()));
|
||||
@@ -312,7 +312,7 @@ public class WxCustomMpService {
|
||||
|
||||
PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy());
|
||||
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/user/#/orderDetail/" + orderInfo.getId());
|
||||
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), customUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId());
|
||||
List<WxMpTemplateData> data = new ArrayList<>();
|
||||
data.add(new WxMpTemplateData("character_string2", orderInfo.getOrderNo()));
|
||||
data.add(new WxMpTemplateData("thing5", StringUtils.isEmpty(refundReason) ? "已取消" : refundReason));
|
||||
@@ -328,7 +328,7 @@ public class WxCustomMpService {
|
||||
PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy());
|
||||
|
||||
templateMessage.setToUser(clerkUserInfo.getOpenid());
|
||||
templateMessage.setUrl("http://" + tenant.getTenantKey() + ".july.hucs.top/clerk/#/orderDetail/" + orderInfo.getId());
|
||||
templateMessage.setUrl("https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId());
|
||||
try {
|
||||
proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage);
|
||||
} catch (WxErrorException e) {
|
||||
|
||||
Reference in New Issue
Block a user