diff --git a/.gitignore b/.gitignore index bb4513f2..446f946a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,4 @@ src/main/java/com/.DS_Store src/main/java/.DS_Store src/main/.DS_Store .DS_Store -/crmebimage/ +/lxkimage/ diff --git a/lxk-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java b/lxk-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java index d33c95ea..981730a2 100644 --- a/lxk-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java +++ b/lxk-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java @@ -132,7 +132,6 @@ public class AdminLoginServiceImpl implements AdminLoginService { @Override public SystemLoginResponse platformLogin(SystemAdminLoginRequest request, String ip) { SystemLoginResponse loginResponse = login(request, RoleEnum.PLATFORM_ADMIN.getValue(), ip); - asyncService.installStatistics(); return loginResponse; } diff --git a/lxk-common/src/main/java/com/zbkj/common/constants/OnePassConstants.java b/lxk-common/src/main/java/com/zbkj/common/constants/OnePassConstants.java index 6d2a48a9..568e5577 100644 --- a/lxk-common/src/main/java/com/zbkj/common/constants/OnePassConstants.java +++ b/lxk-common/src/main/java/com/zbkj/common/constants/OnePassConstants.java @@ -22,8 +22,7 @@ public class OnePassConstants { public static final String ONE_PASS_USER_TOKEN_PREFIX = "Bearer-"; // 一号通请求地址 - public static final String ONE_PASS_API_URL = "https://sms.crmeb.net/api/";// 正式环境 -// public static final String ONE_PASS_API_URL = "http://plat.crmeb.net/api/";// 测试环境 + public static final String ONE_PASS_API_URL = "https://sms.lxk.net/api/";// 正式环境 // 连线可平台通请求地址 public static final String LXK_SERVER_API_URL = "https://saasmall.lianxianke.cn/lxk-api"; diff --git a/lxk-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java b/lxk-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java index 3222047c..ebbb53ec 100644 --- a/lxk-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java +++ b/lxk-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java @@ -188,7 +188,7 @@ public class SysConfigConstants { /** * LXK chat 统计 */ - public static final String JS_CONFIG_CRMEB_CHAT_TONGJI = "lxk_tongji_js"; + public static final String JS_CONFIG_LXK_CHAT_TONGJI = "lxk_tongji_js"; /** * 用户默认头像 diff --git a/lxk-common/src/main/java/com/zbkj/common/enums/Encrypt.java b/lxk-common/src/main/java/com/zbkj/common/enums/Encrypt.java index d02b3a92..bd352d92 100644 --- a/lxk-common/src/main/java/com/zbkj/common/enums/Encrypt.java +++ b/lxk-common/src/main/java/com/zbkj/common/enums/Encrypt.java @@ -1,7 +1,6 @@ package com.zbkj.common.enums; public class Encrypt { - public static final String LXK_COPYRIGHT_URL = "https://authorize.crmeb.net/api/auth_cert_query?domain_name={}&label={}&version={}"; public static final String LXK_COPYRIGHT_URL_DATA = "data"; public static final String LXK_COPYRIGHT_URL_STATUS = "status"; public static final String LXK_COPYRIGHT_URL_COPYRIGHT = "copyright"; diff --git a/lxk-service/src/main/java/com/zbkj/service/service/AsyncService.java b/lxk-service/src/main/java/com/zbkj/service/service/AsyncService.java index 125505b8..52aaaf56 100644 --- a/lxk-service/src/main/java/com/zbkj/service/service/AsyncService.java +++ b/lxk-service/src/main/java/com/zbkj/service/service/AsyncService.java @@ -46,10 +46,6 @@ public interface AsyncService { */ void visitUserCenter(Integer uid); - /** - * 安装统计 - */ - void installStatistics(); /** * 发送充值成功通知 diff --git a/lxk-service/src/main/java/com/zbkj/service/service/impl/AsyncServiceImpl.java b/lxk-service/src/main/java/com/zbkj/service/service/impl/AsyncServiceImpl.java index baeb8fec..42055691 100644 --- a/lxk-service/src/main/java/com/zbkj/service/service/impl/AsyncServiceImpl.java +++ b/lxk-service/src/main/java/com/zbkj/service/service/impl/AsyncServiceImpl.java @@ -223,34 +223,6 @@ public class AsyncServiceImpl implements AsyncService { userVisitRecordService.save(visitRecord); } - /** - * 安装统计 - */ - @Async - @Override - public void installStatistics() { - String isInstall = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_INSTALL_STATISTICS); - if (StrUtil.isNotBlank(isInstall) && isInstall.equals("1")) { - return; - } - String version = lxkConfig.getVersion(); - if (StrUtil.isBlank(version) || !(StrUtil.startWithIgnoreCase(version, "LXK"))) { - return; - } - String apiUrl = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_API_URL); - if (StrUtil.isBlank(apiUrl) || !(StrUtil.startWithIgnoreCase(apiUrl, "http"))) { - return; - } - Map map = new HashMap<>(); - map.put("host", apiUrl); - map.put("version", version); - map.put("https", "https"); - String result = HttpUtil.post("https://shop.crmeb.net/index.php/admin/server.upgrade_api/updatewebinfo", JSONObject.toJSONString(map)); - JSONObject jsonObject = JSONObject.parseObject(result); - if (jsonObject.getInteger("status").equals(200)) { - systemConfigService.updateOrSaveValueByName(SysConfigConstants.CONFIG_INSTALL_STATISTICS, "1"); - } - } /** * 发送充值成功通知