From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 04 四月 2023 09:09:07 +0800 Subject: [PATCH] 合并开源主线 --- doc/_content/introduction/deployment.md | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/_content/introduction/deployment.md b/doc/_content/introduction/deployment.md index a04aa45..45c1a83 100644 --- a/doc/_content/introduction/deployment.md +++ b/doc/_content/introduction/deployment.md @@ -27,13 +27,32 @@ ```shell nohup java -jar wvp-pro-*.jar & ``` -war鍖咃細 +**war鍖咃細** 涓嬭浇Tomcat鍚庡皢war鍖呮斁鍏ebapps涓紝鍚姩Tomcat浠ヨВ鍘媤ar鍖咃紝鍋滄Tomcat鍚庯紝鍒犻櫎ROOT鐩綍浠ュ強war鍖咃紝灏嗚В鍘嬪悗鐨剋ar鍖呯洰褰曢噸鍛藉悕涓篟OOT锛屽皢閰嶇疆鏂囦欢涓殑Server.port閰嶇疆涓轰笌Tomcat绔彛涓�鑷� 鐒跺悗鍚姩Tomcat銆� **鍚姩ZLM** ```shell nohup ./MediaServer -d -m 3 & ``` - +### 鍓嶅悗绔垎绂婚儴缃� +鍓嶅悗绔儴缃茬洰鍓嶅湪鏈�鏂扮殑鐗堟湰宸茬粡鏀寔锛岃浣跨敤3鏈�15鏃ヤ箣鍚庣殑鐗堟湰閮ㄧ讲 +鍓嶇缂栬瘧鍚庣殑鏂囦欢鍦╜src/main/resources/static`涓紝灏嗘鐩綍涓嬬殑鏂囦欢閮ㄧ讲銆� +鍓嶅悗绔垎绂婚儴缃叉渶澶х殑闂鏄法鍩熺殑瑙ｅ喅锛屼箣鍓嶇増鏈娇鐢╟ookie瀹屾垚鐧诲綍娴佺▼锛岃�宑ookie鏄笉鍙互鍦ㄥ鏉傝法鍩熶腑浣跨敤鐨勩�傛墍浠ュ綋鍓嶇増鏈娇鐢↗WT鐢熸垚鐨凾OKEN浣滀负璁よ瘉鍑嵁锛� +閮ㄧ讲鍓嶇鍚庨渶瑕佸湪wvp涓厤缃墠绔闂殑鍦板潃浠ュ畬鎴愯法鍩熸祦绋嬨�� +**閰嶇疆鍓嶇鏈嶅姟鍣�** +1. 鍋囧浣犵殑鏈嶅姟鏈夊叕缃戝煙鍚嶄负xxx.com锛屽叕缃慖P涓�11.11.11.11锛� 閭ｄ箞浣犲彲浠ュ湪wvp涓繖鏍烽厤缃細 +```yaml +user-settings: + # 璺ㄥ煙閰嶇疆锛岄厤缃綘璁块棶鍓嶇椤甸潰鐨勫湴鍧�鍗冲彲锛� 鍙互閰嶇疆澶氫釜 + allowed-origins: + - http://xxx.com:8008 + - http://11.11.11.11:8008 +``` +閰嶇疆涓嶆槸蹇呴』鐨勶紝浣犱娇鐢ㄥ摢涓猧p/鍩熷悕璁块棶灏遍厤缃摢涓嵆鍙�備慨鏀归厤缃悗閲嶅惎wvp浠ヤ娇閰嶇疆鐢熸晥銆� +2. 鍦╜src/main/resources/static/static/js/config.js`涓嬮厤缃湇鍔″櫒鐨勫湴鍧�锛屼篃灏辨槸wvp鏈嶅姟鐨勫湴鍧� +```javascript +window.baseUrl = "http://xxx.com:18080" +``` +`杩欓噷鐨勫湴鍧�鏄渶瑕佸鎴风數鑴戣兘璁块棶鍒扮殑锛屽洜涓鸿姹傛槸瀹㈡埛绔數鑴戝彂璧凤紝涓庝唬鐞嗕笉鍚宍 [鎺ュ叆璁惧](./_content/ability/device.md) -- Gitblit v1.8.0