Merge branch 'sit' into uat-20260202

alien-api/src/main/resources/bootstrap-prod.yml

@@ -1,3 +1,29 @@
+# UAT 环境：以下为本地默认值，Nacos 或环境变量可覆盖
+# Nacos 不可用时仍可启动；支付宝相关需在 Nacos 或 env 中配置真实值后方可正常支付/退款
+#feign:
+#  alienStore:
+#    url: http://192.168.2.251:13004
+#  alienSecond:
+#    url: http://192.168.2.251:13005
+
+app:
+  business:
+    appId: uat-placeholder-appId
+    appPrivateKey: placeholder-private-key
+    appPublicKey: placeholder-public-key
+    win:
+      appCertPath: C:/alien/aliPayCert/appCert.crt
+      alipayPublicCertPath: C:/alien/aliPayCert/alipayPublicCert.crt
+      alipayRootCertPath: C:/alien/aliPayCert/alipayRootCert.crt
+    linux:
+      appCertPath: /usr/local/alien/aliPayCert/appCert.crt
+      alipayPublicCertPath: /usr/local/alien/aliPayCert/alipayPublicCert.crt
+      alipayRootCertPath: /usr/local/alien/aliPayCert/alipayRootCert.crt
+
+ali:
+  aes:
+    encryptKey: uat-placeholder-encrypt-key
+
 spring:
   application:
     name: alien-api
@@ -6,17 +32,23 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true

alien-api/src/main/resources/bootstrap-uat.yml

@@ -26,7 +26,7 @@ ali:
 
 spring:
   application:
-    name: alien-lawyer
+    name: alien-api
 
   cloud:
     nacos:

alien-dining/src/main/resources/bootstrap-prod.yml

@@ -6,19 +6,23 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: 120.26.186.130:8848
-        username: dev
+        server-addr: 192.168.2.251:8848
+        username: nacos
         password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
         refresh-enabled: true
-        server-addr: 120.26.186.130:8848
-        username: dev
+        server-addr: 192.168.2.251:8848
+        username: nacos
         password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
         shared-configs:
           - data-id: common.yml
             group: DEFAULT_GROUP

alien-gateway/src/main/resources/bootstrap-prod.yml

@@ -6,18 +6,24 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
         refresh-enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true

alien-job/src/main/resources/bootstrap-prod.yml

@@ -6,17 +6,23 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true

alien-lawyer/src/main/resources/bootstrap-prod.yml

@@ -1,3 +1,29 @@
+# UAT 环境：以下为本地默认值，Nacos 或环境变量可覆盖
+# Nacos 不可用时仍可启动；支付宝相关需在 Nacos 或 env 中配置真实值后方可正常支付/退款
+feign:
+  alienStore:
+    url: http://192.168.2.251:13004
+  alienSecond:
+    url: http://192.168.2.251:13005
+
+app:
+  business:
+    appId: uat-placeholder-appId
+    appPrivateKey: placeholder-private-key
+    appPublicKey: placeholder-public-key
+    win:
+      appCertPath: C:/alien/aliPayCert/appCert.crt
+      alipayPublicCertPath: C:/alien/aliPayCert/alipayPublicCert.crt
+      alipayRootCertPath: C:/alien/aliPayCert/alipayRootCert.crt
+    linux:
+      appCertPath: /usr/local/alien/aliPayCert/appCert.crt
+      alipayPublicCertPath: /usr/local/alien/aliPayCert/alipayPublicCert.crt
+      alipayRootCertPath: /usr/local/alien/aliPayCert/alipayRootCert.crt
+
+ali:
+  aes:
+    encryptKey: uat-placeholder-encrypt-key
+
 spring:
   application:
     name: alien-lawyer
@@ -6,17 +32,23 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true

alien-second/src/main/resources/bootstrap-prod.yml

@@ -6,17 +6,23 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true

alien-store-platform/src/main/resources/bootstrap-prod.yml

@@ -6,17 +6,23 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true

alien-store/src/main/java/shop/alien/store/controller/UdianQaController.java

@@ -0,0 +1,76 @@
+package shop.alien.store.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import shop.alien.entity.result.R;
+import shop.alien.store.util.ai.AiAuthTokenUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 优店 QA（智能客服）相关代理接口，路径与第三方 AI 服务对齐。
+ */
+@Slf4j
+@Api(tags = {"优店QA"})
+@CrossOrigin
+@RestController
+@RequestMapping("/udian_qa")
+@RequiredArgsConstructor
+@RefreshScope
+public class UdianQaController {
+
+    private final RestTemplate restTemplate;
+    private final AiAuthTokenUtil aiAuthTokenUtil;
+
+    @Value("${ai.service.udian-qa-chat-history-url:http://124.93.18.180:9000/ai/smart-customer/api/v1/udian_qa/chat-history}")
+    private String udianQaChatHistoryUrl;
+
+    @ApiOperation("根据会话ID查询聊天历史（对外 GET，对内 POST 转发上游）")
+    @GetMapping("/chat-history")
+    public R chatHistory(@RequestParam(value = "session_id", required = false) String sessionId) {
+        if (StringUtils.isBlank(sessionId)) {
+            return R.fail("session_id不能为空");
+        }
+
+        Map<String, Object> requestBody = new HashMap<>(2);
+        requestBody.put("session_id", sessionId);
+
+        HttpHeaders aiHeaders = new HttpHeaders();
+        String accessToken = aiAuthTokenUtil.getAccessToken();
+        aiHeaders.setContentType(MediaType.APPLICATION_JSON);
+        aiHeaders.set("Authorization", "Bearer " + accessToken);
+
+        HttpEntity<Map<String, Object>> request = new HttpEntity<>(requestBody, aiHeaders);
+        try {
+            log.info("调用优店QA聊天历史接口 入参------{}", requestBody);
+            ResponseEntity<String> response = restTemplate.postForEntity(udianQaChatHistoryUrl, request, String.class);
+            String respBody = response.getBody();
+            log.info("调用优店QA聊天历史接口 返回------{}", respBody);
+            if (StringUtils.isBlank(respBody)) {
+                return R.fail("上游返回为空");
+            }
+            JSONObject json = JSONObject.parseObject(respBody);
+            return R.data(json);
+        } catch (Exception e) {
+            log.error("调用优店QA聊天历史接口 异常------", e);
+            return R.fail("请求失败");
+        }
+    }
+}

alien-store/src/main/resources/bootstrap-prod.yml

@@ -6,18 +6,24 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        password: Alien123456
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        metadata:
+          env: produ
 
       #配置中心
       config:
         enabled: true
         refresh-enabled: true
-        server-addr: localhost:8848
+        server-addr: 192.168.2.251:8848
         username: nacos
-        password: ngfriend198092
+        password: Alien123456
         group: DEFAULT_GROUP
         file-extension: yml
-        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f
+        namespace: 5ab49ede-88f1-4af2-8e24-44a9d7be265b
+        shared-configs:
+          - data-id: common.yml
+            group: DEFAULT_GROUP
+            refresh: true