From 9629b1fb5ea0b10322bed089f7b0343e0c3e8c53 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 16:26:16 +0800
Subject: [PATCH] 最新版本
---
h5/main.js | 2 +-
h5/package.json | 6 +++++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java | 2 +-
h5/package-lock.json | 15 +++++----------
h5/manifest.json | 17 +++++++++++++++--
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/h5/main.js b/h5/main.js
index 516531a..2d18e67 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -7,7 +7,7 @@
Vue.config.productionTip = false
-Vue.prototype.$baseUrl = 'http://192.168.0.150:10010/';
+Vue.prototype.$baseUrl = 'api/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
// Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/'
diff --git a/h5/manifest.json b/h5/manifest.json
index c2c0170..1c251c0 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -81,7 +81,20 @@
"h5" : {
"router" : {
"mode" : "hash",
- "base" : "/h5/"
- }
+ "base" : "/"
+ // "base" : "/h5/"
+ },
+ "devServer" : {
+ "port": 8090,
+ "proxy" : {
+ "/api" : { // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
+ "target" : "http://192.168.0.150:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "changeOrigin" : true, // 鍏佽璺ㄥ煙
+ "pathRewrite" : {
+ "^/api" : "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙ｄ腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌＄敤浜�
+ }
+ }
+ }
+ }
}
}
diff --git a/h5/package-lock.json b/h5/package-lock.json
index e16365b..8e41c77 100644
--- a/h5/package-lock.json
+++ b/h5/package-lock.json
@@ -1,23 +1,18 @@
{
- "name": "鏀寔鍒嗛〉Picker",
- "version": "1.0",
+ "name": "鍥剧墖瑁佸壀 鍥涜鎷栧姩 鍥剧墖缂╂斁绉诲姩",
+ "version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
- "qrcodejs2": {
- "version": "0.0.2",
- "resolved": "https://registry.npmmirror.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
- "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
- },
"uniapp-qrcode": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz",
"integrity": "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
},
"uview-ui": {
- "version": "2.0.36",
- "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.36.tgz",
- "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA=="
+ "version": "2.0.37",
+ "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
+ "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ=="
}
}
}
diff --git a/h5/package.json b/h5/package.json
index eb44b0f..4fc6bbe 100644
--- a/h5/package.json
+++ b/h5/package.json
@@ -12,5 +12,9 @@
"鍓嶇缁勪欢",
"閫氱敤缁勪欢"
]
+ },
+ "dependencies": {
+ "uniapp-qrcode": "^1.0.2",
+ "uview-ui": "^2.0.37"
}
-}
\ No newline at end of file
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
index 7bbabeb..056cb99 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
@@ -98,7 +98,7 @@
public static FtpUtil ftp = null;
@ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP")
- @RequestMapping(method= RequestMethod.POST,value="api/uploadFtp.do",headers = "content-type=multipart/form-data")
+ @RequestMapping(method= RequestMethod.POST,value="uploadFtp.do",headers = "content-type=multipart/form-data")
@ResponseBody
public void uploadFtp(HttpServletRequest request, HttpServletResponse response, String folderCode) throws Exception {
System.out.println("涓婁紶涓�");
--
Gitblit v1.9.3