diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java index 600aad5..bf459d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java @@ -27,7 +27,6 @@ public class CallMaterialController { @PostMapping("/queryPoint") @Log("查询区域点位") @ApiOperation("查询区域点位") - @SaIgnore public ResponseEntity queryPoint() { return new ResponseEntity<>(callMaterialService.queryPoint(), HttpStatus.OK); } @@ -35,7 +34,6 @@ public class CallMaterialController { @PostMapping("/confirm") @Log("叫料确定") @ApiOperation("叫料确定") - @SaIgnore public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(callMaterialService.confirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java index b480333..4bd2a63 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java @@ -28,7 +28,6 @@ public class CallVehicleController { @PostMapping("/queryPoint") @Log("查询区域点位") @ApiOperation("查询区域点位") - @SaIgnore public ResponseEntity queryPoint() { return new ResponseEntity<>(callVehicleService.queryPoint(), HttpStatus.OK); } @@ -36,7 +35,6 @@ public class CallVehicleController { @PostMapping("/confirm") @Log("呼叫空托盘确定") @ApiOperation("呼叫空托盘确定") - @SaIgnore public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(callVehicleService.confirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java index d8dd159..4566e4b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java @@ -27,7 +27,6 @@ public class SendMaterialController { @PostMapping("/queryPoint") @Log("查询区域点位") @ApiOperation("查询区域点位") - @SaIgnore public ResponseEntity queryPoint() { return new ResponseEntity<>(sendMaterialService.queryPoint(), HttpStatus.OK); } @@ -35,7 +34,6 @@ public class SendMaterialController { @PostMapping("/confirm") @Log("送料确定") @ApiOperation("送料确定") - @SaIgnore public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(sendMaterialService.confirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java index 9847e46..8ab7355 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java @@ -29,7 +29,6 @@ public class SendVehicleController { @PostMapping("/queryPoint") @Log("查询区域点位") @ApiOperation("查询区域点位") - @SaIgnore public ResponseEntity queryPoint() { return new ResponseEntity<>(sendVehicleService.queryPoint(), HttpStatus.OK); } @@ -37,7 +36,6 @@ public class SendVehicleController { @PostMapping("/confirm") @Log("送空托盘确定") @ApiOperation("送空托盘确定") - @SaIgnore public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(sendVehicleService.confirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml index d5f3408..1d3bb43 100644 --- a/lms/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml @@ -6,9 +6,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:ndxy3_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.121}:${DB_PORT:3306}/${DB_NAME:yy_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:P@ssw0rd} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 # 最小连接数 @@ -157,6 +157,8 @@ sa-token: jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq # token 前缀 token-prefix: Bearer + is-read-cookie: false + is-read-body: false loki: url: http://localhost:3100/loki/api/v1