1

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<String> list = new ArrayList<>(Arrays.asList(ids));
+        if (list.contains("main")){
+            return error("请勿删除主站点");
+        }
         return toAjax(baseSiteService.removeByIds(list));
     }
 }

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<BaseInquiry> 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<String> thirdItemSave(@ApiIgnore @RequestBody BusiThirdItem thirdItem, HttpServletRequest request) {
+        thirdItem.setViewType("漂浮询盘");
+        Map<String, String> 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();
+    }
 }

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账户")

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:
                 # 从数据源开关/默认关闭

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
+    end-point: oss-eu-central-1.aliyuncs.com
-    access-key-id: LTAI5tLThQFWgMLRTf3siNjb
+    access-key-id: LTAI5tB7zL8KuHDnMsdUhXRy
-    access-key-secret: M5HjOyB8ir5tYEPFOQwImfJNgsumaG
+    access-key-secret: bZ28G69DLR6Q3WhvvrWyxWw3lEbfzk
-    bucket-name: dianliang123
+    bucket-name: sd-chengda
 #google ads配置
 google:
   ads:

dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml

@@ -9,6 +9,7 @@
         <result property="prodId" column="prod_id"/>
         <result property="thirdSoft" column="third_soft"/>
         <result property="national" column="national"/>
+        <result property="oceania" column="oceania"/>
         <result property="thirdAccount" column="third_account"/>
         <result property="viewType" column="view_type"/>
         <result property="pageUrl" column="page_url"/>
@@ -27,7 +28,7 @@
     <sql id="selectBusiThirdItemVo">
         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
     </sql>
 
@@ -39,6 +40,7 @@
             <if test="entity.prodName != null  and entity.prodName != ''">and dbpn.title LIKE CONCAT('%',#{entity.prodName},'%')</if>
             <if test="entity.thirdSoft != null  and entity.thirdSoft != ''">and dbti.third_soft = #{entity.thirdSoft}</if>
             <if test="entity.national != null  and entity.national != ''">and dbti.national LIKE CONCAT('%',#{entity.national},'%')</if>
+            <if test="entity.oceania != null  and entity.oceania != ''">and dbti.national LIKE CONCAT('%',#{entity.oceania},'%')</if>
             <if test="entity.thirdAccount != null  and entity.thirdAccount != ''">and dbti.third_account LIKE CONCAT('%',#{entity.thirdAccount},'%')</if>
             <if test="entity.viewType != null  and entity.viewType != ''">and dbti.view_type = #{entity.viewType}</if>
             <if test="entity.pageUrl != null  and entity.pageUrl != ''">and dbti.page_url LIKE CONCAT('%',#{entity.pageUrl},'%')</if>

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/'

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/'

dl_vue/public/index.html

@@ -205,31 +205,4 @@
         </div>
 	</div>
   </body>
-  <!-- 客服聊天窗口代码 -->
-  <script>
-    window.difyChatbotConfig = {
-      token: 'BC985VI4DnedSaIQ',
-      baseUrl: 'http://101.245.103.204',
-      systemVariables: {
-        // user_id: 'YOU CAN DEFINE USER ID HERE',
-        // conversation_id: 'YOU CAN DEFINE CONVERSATION ID HERE, IT MUST BE A VALID UUID',
-      },
-    }
-  </script>
-  <script
-    src="http://101.245.103.204/embed.min.js"
-    id="BC985VI4DnedSaIQ"
-    defer>
-  </script>
-  <style>
-    #dify-chatbot-bubble-button {
-      background-color: #1C64F2 !important;
-      z-index: 50 !important;
-    }
-    #dify-chatbot-bubble-window {
-      width: 24rem !important;
-      height: 40rem !important;
-      z-index: 50 !important;
-    }
-  </style>
 </html>

dl_vue/src/App.vue

@@ -4,31 +4,6 @@
     <theme-picker />
   </div>
 </template>
-<!-- 客服聊天窗口代码 -->
-<script>
-window.difyChatbotConfig = {
-  token: 'BC985VI4DnedSaIQ',
-  baseUrl: 'http://101.245.103.204',
-  systemVariables: {
-    // user_id: 'YOU CAN DEFINE USER ID HERE',
-    // conversation_id: 'YOU CAN DEFINE CONVERSATION ID HERE, IT MUST BE A VALID UUID',
-  },
-}
-</script>
-<script
-  src="http://101.245.103.204/embed.min.js"
-  id="BC985VI4DnedSaIQ"
-  defer>
-</script>
-<style>
-#dify-chatbot-bubble-button {
-  background-color: #1C64F2 !important;
-}
-#dify-chatbot-bubble-window {
-  width: 24rem !important;
-  height: 40rem !important;
-}
-</style>
 <script>
 import ThemePicker from "@/components/ThemePicker";
 import Cookies from "js-cookie";

dl_vue/src/store/modules/websocket.js

@@ -23,14 +23,18 @@ const websocket = {
           console.log(e.data)
         }else {
           console.log(e.data,'消息内容')
+          let messageData;
           //这里捕获消息
-          const messageData = JSON.parse(e.data)
+          try {
+            messageData = JSON.parse(e.data)
             // 触发事件通知
             EventBus.$emit('newMessage', messageData);
             //存储消息
             state.message.push(messageData);
+          }catch (e) {
+            console.log("无法识别的消息");
+          }
         }
-
       };
       state.socket.onerror= function () {
         console.log("WebSocket连接发生错误");