From a5a600575d1c827bcd125d2f4cea374d72f5236a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 23 五月 2023 09:55:43 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 2 +-
src/main/java/com/zy/asrs/controller/MatController.java | 6 ++++--
src/main/resources/application.yml | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 0a2cf10..96eff45 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -222,8 +222,10 @@
@RequestMapping(value = "/mat/covert/{id}/auth")
@ManagerAuth
- public R covert(@PathVariable("id") String id) {
- Mat mat = matService.selectByMatnr(String.valueOf(id));
+ public R covert(@PathVariable("id") String id) throws UnsupportedEncodingException{
+ byte[] decode = Base64.getDecoder().decode(id);
+ String id2 = new String(decode, "utf-8");
+ Mat mat = matService.selectByMatnr(id2);
if (mat == null) {
return R.ok();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b83d0c7..02cb0c6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
- url: jdbc:sqlserver://192.168.4.13:1433;databasename=bfasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3622707..ed11081 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -335,7 +335,7 @@
let item = selectList[i];
// 鏌ヨ鐗╂枡璇︽儏
$.ajax({
- url: baseUrl+"/mat/covert/"+item.value+"/auth",
+ url: baseUrl+"/mat/covert/"+btoa(item.value)+"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
--
Gitblit v1.9.1