From a9735c4565ff79d75c254bd9a7f21d290781aee4 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Tue, 16 Sep 2025 17:09:30 +0800 Subject: [PATCH] 1 --- .../base/controller/BaseSiteController.java | 3 +++ .../ruoyi/base/controller/WebController.java | 26 +++++++++++++++++- .../com/ruoyi/busi/domain/BusiThirdItem.java | 3 +++ .../src/main/resources/application-druid.yml | 4 +-- .../src/main/resources/application.yml | 10 +++---- .../mapper/busi/BusiThirdItemMapper.xml | 4 ++- dl_vue/.env.development | 8 +++--- dl_vue/.env.production | 9 ++++--- dl_vue/public/index.html | 27 ------------------- dl_vue/src/App.vue | 25 ----------------- dl_vue/src/store/modules/websocket.js | 16 ++++++----- 11 files changed, 61 insertions(+), 74 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java index 8e98259..9c2e3df 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteController.java @@ -115,6 +115,9 @@ public class BaseSiteController extends BaseController { @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { List list = new ArrayList<>(Arrays.asList(ids)); + if (list.contains("main")){ + return error("请勿删除主站点"); + } return toAjax(baseSiteService.removeByIds(list)); } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java index dd0328d..3604c36 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java @@ -64,6 +64,8 @@ public class WebController extends BaseController { @Autowired private IBusiChatMainService busiChatMainService; @Autowired + private IBusiThirdItemService busiThirdItemService; + @Autowired private IBusiPageService pageService; @Autowired private CommonUtils commonUtils; @@ -373,7 +375,6 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/inquirySet") public R inquirySet(@RequestParam(required = true) String tenantId, HttpServletRequest request) { - String ip = CommonUtils.getIpAddr(request); return R.ok(baseInquiryService.getInquiry(tenantId)); } @@ -526,4 +527,27 @@ public class WebController extends BaseController { } } + /** + * 三方询盘点击记录次数 + * + * @return com.ruoyi.common.core.domain.AjaxResult + * @author vinjor-M + * @date 10:04 2025/7/8 + **/ + @ApiOperation("三方询盘点击记录次数") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "thirdSoft", value = "三方程序类型（Email|WhatsApp|Tel）", required = true, paramType = "body"), + @ApiImplicitParam(name = "tenantId", value = "站点编码", required = true, paramType = "body"), + @ApiImplicitParam(name = "equipment", value = "设备类型(移动端|电脑端)", required = true, paramType = "body") + }) + @PostMapping("/thirdItemSave") + public R thirdItemSave(@ApiIgnore @RequestBody BusiThirdItem thirdItem, HttpServletRequest request) { + thirdItem.setViewType("漂浮询盘"); + Map ipMap = commonUtils.getIPAndCountry(request); + thirdItem.setIp(ipMap.get("ip")); + thirdItem.setNational(ipMap.get("national")); + thirdItem.setOceania(ipMap.get("oceania")); + busiThirdItemService.save(thirdItem); + return R.ok(); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java index 8a99f01..dc91bbe 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java @@ -39,6 +39,9 @@ public class BusiThirdItem extends DlBaseEntity /** 来源国家 */ @Excel(name = "来源国家") private String national; + /** 来源洲 */ + @Excel(name = "来源洲") + private String oceania; /** 所属email/电话/teams账户 */ @Excel(name = "所属email/电话/teams账户") diff --git a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml index 15f87da..208cbef 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml +++ b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml @@ -11,9 +11,9 @@ spring: # password: 123456 # 主库数据源-客户测试服务器 master: - url: jdbc:mysql://1.92.99.15:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://8.220.74.244:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: site - password: 123456 + password: Chengda@2025~ # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/dl_admin/ruoyi-admin/src/main/resources/application.yml b/dl_admin/ruoyi-admin/src/main/resources/application.yml index 348b02e..cbd191b 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/application.yml +++ b/dl_admin/ruoyi-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2025 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: /uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -146,10 +146,10 @@ xss: # 阿里云OSS配置 aliyun: oss: - end-point: oss-cn-qingdao.aliyuncs.com - access-key-id: LTAI5tLThQFWgMLRTf3siNjb - access-key-secret: M5HjOyB8ir5tYEPFOQwImfJNgsumaG - bucket-name: dianliang123 + end-point: oss-eu-central-1.aliyuncs.com + access-key-id: LTAI5tB7zL8KuHDnMsdUhXRy + access-key-secret: bZ28G69DLR6Q3WhvvrWyxWw3lEbfzk + bucket-name: sd-chengda #google ads配置 google: ads: diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml index 621761d..4300177 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml @@ -9,6 +9,7 @@ + @@ -27,7 +28,7 @@ select id, prod_id, - third_soft, national, third_account, view_type, page_url, equipment, ip, tenant_id, creator, create_time, updater, update_time, del_flag + third_soft, national, oceania,third_account, view_type, page_url, equipment, ip, tenant_id, creator, create_time, updater, update_time, del_flag from dl_busi_third_item @@ -39,6 +40,7 @@ and dbpn.title LIKE CONCAT('%',#{entity.prodName},'%') and dbti.third_soft = #{entity.thirdSoft} and dbti.national LIKE CONCAT('%',#{entity.national},'%') + and dbti.national LIKE CONCAT('%',#{entity.oceania},'%') and dbti.third_account LIKE CONCAT('%',#{entity.thirdAccount},'%') and dbti.view_type = #{entity.viewType} and dbti.page_url LIKE CONCAT('%',#{entity.pageUrl},'%') diff --git a/dl_vue/.env.development b/dl_vue/.env.development index e81affd..034a9e5 100644 --- a/dl_vue/.env.development +++ b/dl_vue/.env.development @@ -4,14 +4,14 @@ VUE_APP_TITLE = 成事达管理平台 # 开发环境配置 ENV = 'development' -# 成事达管理平台/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.13:8099' +# 成事达管理平台/生产环境 +VUE_APP_BASE_API = 'https://admin.cdtrucktralier.com' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true # websocket -VUE_APP_WEBSOCKET = 'ws://localhost:8099/ws/asset/' +VUE_APP_WEBSOCKET = 'wss://admin.cdtrucktralier.com/ws/asset/' # 产品、文章预览 -VUE_APP_PREVIEW = 'http://192.168.1.13:3001/admin-preview/' +VUE_APP_PREVIEW = 'https://www.cdtrucktralier.com/admin-preview/' diff --git a/dl_vue/.env.production b/dl_vue/.env.production index fa7d2ed..6bb2393 100644 --- a/dl_vue/.env.production +++ b/dl_vue/.env.production @@ -5,10 +5,13 @@ VUE_APP_TITLE = 成事达管理平台 ENV = 'production' # 成事达管理平台/生产环境 -VUE_APP_BASE_API = 'http://1.92.99.15:8099' +VUE_APP_BASE_API = 'https://admin.cdtrucktralier.com' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true # websocket -VUE_APP_WEBSOCKET = 'ws://1.92.99.15:8099/ws/asset/' +VUE_APP_WEBSOCKET = 'wss://admin.cdtrucktralier.com/ws/asset/' # 产品、文章预览 -VUE_APP_PREVIEW = 'http://www.lighting-it.cn/admin-preview/' +VUE_APP_PREVIEW = 'https://www.cdtrucktralier.com/admin-preview/' diff --git a/dl_vue/public/index.html b/dl_vue/public/index.html index 10225e1..925455c 100644 --- a/dl_vue/public/index.html +++ b/dl_vue/public/index.html @@ -205,31 +205,4 @@ - - - - diff --git a/dl_vue/src/App.vue b/dl_vue/src/App.vue index 5b6a16a..c0aefe8 100644 --- a/dl_vue/src/App.vue +++ b/dl_vue/src/App.vue @@ -4,31 +4,6 @@ - - - -