xsh_1997 пре 3 недеља
родитељ
комит
8f61a362e2

+ 1 - 1
huimv-employment/app/.env.development

@@ -1,2 +1,2 @@
1
-# 开发环境 API 地址
1
+# 开发环境 API 地址(微信小程序等直连;H5 浏览器开发自动走 /api 代理,见 vue.config.js)
2 2
 VUE_APP_BASE_API=http://115.238.57.190:5200/api/v1/mp

+ 1 - 1
huimv-employment/app/api/conversation.js

@@ -70,7 +70,7 @@ export function streamConversationChat(options = {}) {
70 70
 
71 71
 	return streamSseRequest({
72 72
 		url: `/conversations/${conversationId}/chat`,
73
-		data: { message },
73
+		data: { message, disable_thinking: true },
74 74
 		header: {
75 75
 			'X-Agent-Id': agentId
76 76
 		},

+ 18 - 6
huimv-employment/app/common/config.js

@@ -1,10 +1,22 @@
1
-/** 开发环境兜底地址(HBuilderX 编译时可能未注入 .env) */
2
-const DEV_BASE_API = 'http://115.238.57.190:5200/api/v1/mp'
1
+/** 开发环境远程 API(微信小程序 / App 等直连) */
2
+const DEV_REMOTE_API = 'http://115.238.57.190:5200/api/v1/mp'
3 3
 
4
-/** API 基础路径,优先 .env,开发环境兜底 */
5
-export const BASE_API =
6
-	process.env.VUE_APP_BASE_API ||
7
-	(process.env.NODE_ENV !== 'production' ? DEV_BASE_API : '')
4
+/** H5 开发走 devServer 代理,避免浏览器跨域 */
5
+const H5_DEV_PROXY_API = '/api/v1/mp'
6
+
7
+function resolveBaseApi() {
8
+	// H5 开发:请求 /api/... 由 vue.config.js / manifest h5.devServer 转发
9
+	if (process.env.UNI_PLATFORM === 'h5' && process.env.NODE_ENV !== 'production') {
10
+		return H5_DEV_PROXY_API
11
+	}
12
+	return (
13
+		process.env.VUE_APP_BASE_API ||
14
+		(process.env.NODE_ENV !== 'production' ? DEV_REMOTE_API : '')
15
+	)
16
+}
17
+
18
+/** API 基础路径 */
19
+export const BASE_API = resolveBaseApi()
8 20
 
9 21
 /** 本地存储 Token 键名 */
10 22
 export const TOKEN_KEY = 'fe_token'

+ 7 - 4
huimv-employment/app/common/fe.scss

@@ -277,24 +277,27 @@ page {
277 277
 }
278 278
 
279 279
 .fe-chat-bubble {
280
-	flex: 1 1 0;
280
+	flex: 1;
281 281
 	min-width: 0;
282
-	max-width: calc(100% - 88rpx);
283 282
 	padding: 24rpx 32rpx;
284 283
 	border-radius: $fe-radius-lg;
285 284
 	font-size: 28rpx;
286 285
 	line-height: 1.6;
287 286
 	box-sizing: border-box;
288
-	overflow: hidden;
287
+}
288
+
289
+.fe-chat-bubble__text-wrap {
290
+	width: 100%;
291
+	max-width: 100%;
289 292
 }
290 293
 
291 294
 .fe-chat-bubble__text {
292
-	display: block;
293 295
 	width: 100%;
294 296
 	max-width: 100%;
295 297
 	word-wrap: break-word;
296 298
 	word-break: break-word;
297 299
 	white-space: pre-wrap;
300
+	line-height: 1.6;
298 301
 	box-sizing: border-box;
299 302
 }
300 303
 

+ 3 - 1
huimv-employment/app/components/home/EnterpriseHome.vue

@@ -88,7 +88,9 @@
88 88
 								<view class="fe-thinking-dots__dot" />
89 89
 								<view class="fe-thinking-dots__dot" />
90 90
 							</view>
91
-							<text v-else class="fe-chat-bubble__text" user-select>{{ msg.content }}</text>
91
+							<view v-else class="fe-chat-bubble__text-wrap">
92
+								<text class="fe-chat-bubble__text" user-select>{{ msg.content }}</text>
93
+							</view>
92 94
 						</view>
93 95
 					</view>
94 96
 

+ 13 - 0
huimv-employment/app/manifest.json

@@ -68,5 +68,18 @@
68 68
     "uniStatistics" : {
69 69
         "enable" : false
70 70
     },
71
+    "h5" : {
72
+        "devServer" : {
73
+            "port" : 8080,
74
+            "disableHostCheck" : true,
75
+            "proxy" : {
76
+                "/api" : {
77
+                    "target" : "http://115.238.57.190:5200",
78
+                    "changeOrigin" : true,
79
+                    "secure" : false
80
+                }
81
+            }
82
+        }
83
+    },
71 84
     "vueVersion" : "2"
72 85
 }

+ 38 - 0
huimv-employment/app/vue.config.js

@@ -0,0 +1,38 @@
1
+/**
2
+ * H5 开发服务器配置
3
+ * - proxy:解决浏览器跨域
4
+ * - host 0.0.0.0 + public:局域网同事访问时 sockjs 不连 localhost
5
+ */
6
+const os = require('os')
7
+
8
+function getLanIp() {
9
+	const nets = os.networkInterfaces()
10
+	for (const name of Object.keys(nets)) {
11
+		for (const net of nets[name]) {
12
+			if (net.family === 'IPv4' && !net.internal) {
13
+				return net.address
14
+			}
15
+		}
16
+	}
17
+	return '127.0.0.1'
18
+}
19
+
20
+const DEV_PORT = 8080
21
+const LAN_IP = getLanIp()
22
+
23
+module.exports = {
24
+	devServer: {
25
+		host: '0.0.0.0',
26
+		port: DEV_PORT,
27
+		disableHostCheck: true,
28
+		// 热更新 websocket 使用局域网 IP,避免同事浏览器去连他们自己的 localhost
29
+		public: `${LAN_IP}:${DEV_PORT}`,
30
+		proxy: {
31
+			'/api': {
32
+				target: 'http://115.238.57.190:5200',
33
+				changeOrigin: true,
34
+				secure: false
35
+			}
36
+		}
37
+	}
38
+}