From aba05c3bc6cd5ef5c48b268d557fc85a11ad0fae Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 17:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java | 12 +++---
ycl-server/src/main/resources/application.yml | 15 -------
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java | 2
ycl-server/src/main/resources/application-prod.yml | 16 ++++++++
ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java | 2
ycl-server/src/main/resources/application-dev.yml | 16 ++++++++
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java | 12 +++---
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 2
8 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java
index 25af8b5..87b291f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:publish:list')")
+// @PreAuthorize("@ss.hasPermi('system:publish:list')")
@GetMapping("/list")
public TableDataInfo list(TCheckPublish tCheckPublish)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭鑰冩牳鍙戝竷鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:publish:export')")
+// @PreAuthorize("@ss.hasPermi('system:publish:export')")
@Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TCheckPublish tCheckPublish)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇鑰冩牳鍙戝竷璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:publish:query')")
+// @PreAuthorize("@ss.hasPermi('system:publish:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板鑰冩牳鍙戝竷
*/
- @PreAuthorize("@ss.hasPermi('system:publish:add')")
+// @PreAuthorize("@ss.hasPermi('system:publish:add')")
@Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TCheckPublish tCheckPublish)
@@ -77,7 +77,7 @@
/**
* 淇敼鑰冩牳鍙戝竷
*/
- @PreAuthorize("@ss.hasPermi('system:publish:edit')")
+// @PreAuthorize("@ss.hasPermi('system:publish:edit')")
@Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TCheckPublish tCheckPublish)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎鑰冩牳鍙戝竷
*/
- @PreAuthorize("@ss.hasPermi('system:publish:remove')")
+// @PreAuthorize("@ss.hasPermi('system:publish:remove')")
@Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
index 72b5027..2ef9630 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ璁惧璧勪骇鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:list')")
+// @PreAuthorize("@ss.hasPermi('system:monitor:list')")
@GetMapping("/list")
public TableDataInfo list(TMonitor tMonitor)
{
@@ -43,7 +43,7 @@
/**
* 瀵煎嚭璁惧璧勪骇鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:export')")
+// @PreAuthorize("@ss.hasPermi('system:monitor:export')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TMonitor tMonitor)
@@ -56,7 +56,7 @@
/**
* 鑾峰彇璁惧璧勪骇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:query')")
+// @PreAuthorize("@ss.hasPermi('system:monitor:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -66,7 +66,7 @@
/**
* 鏂板璁惧璧勪骇
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:add')")
+// @PreAuthorize("@ss.hasPermi('system:monitor:add')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TMonitor tMonitor)
@@ -77,7 +77,7 @@
/**
* 淇敼璁惧璧勪骇
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:edit')")
+// @PreAuthorize("@ss.hasPermi('system:monitor:edit')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TMonitor tMonitor)
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎璁惧璧勪骇
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:remove')")
+// @PreAuthorize("@ss.hasPermi('system:monitor:remove')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
index afd09f3..91dc9d6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
@@ -54,7 +54,7 @@
return ywPeopleService.remove(ids);
}
- @PreAuthorize("@ss.hasPermi('unit:people:page')")
+// @PreAuthorize("@ss.hasPermi('unit:people:page')")
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(YwPeopleQuery query) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index dfb341f..102d8ee 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -62,7 +62,7 @@
return ywPointService.remove(ids);
}
- @PreAuthorize("@ss.hasPermi('point:page')")
+// @PreAuthorize("@ss.hasPermi('point:page')")
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(YwPointQuery query) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index 951773b..8ca1397 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -55,7 +55,7 @@
return ywUnitService.remove(ids);
}
- @PreAuthorize("@ss.hasPermi('unit:list')")
+// @PreAuthorize("@ss.hasPermi('unit:list')")
@PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(@RequestBody YwUnitQuery query) {
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index e41423c..08f01db 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -1,3 +1,19 @@
+# 椤圭洰鐩稿叧閰嶇疆
+platform:
+ # 鍚嶇О
+ name: zgyw
+ # 鐗堟湰
+ version: 1.0.0
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2024
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/zgyw/uploadPath锛孡inux閰嶇疆 /home/zgyw/uploadPath锛�
+ profile: D:/zgyw/uploadPath
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: false
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+
+
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 24c5766..70c877d 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -1,3 +1,19 @@
+# 椤圭洰鐩稿叧閰嶇疆
+platform:
+ # 鍚嶇О
+ name: zgyw
+ # 鐗堟湰
+ version: 1.0.0
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2024
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/zgyw/uploadPath锛孡inux閰嶇疆 /home/zgyw/uploadPath锛�
+ profile: /home/zgyw/uploadPath
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: false
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+
+
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
diff --git a/ycl-server/src/main/resources/application.yml b/ycl-server/src/main/resources/application.yml
index 075ca61..7b858c4 100644
--- a/ycl-server/src/main/resources/application.yml
+++ b/ycl-server/src/main/resources/application.yml
@@ -1,17 +1,4 @@
-# 椤圭洰鐩稿叧閰嶇疆
-platform:
- # 鍚嶇О
- name: zgyw
- # 鐗堟湰
- version: 1.0.0
- # 鐗堟潈骞翠唤
- copyrightYear: 2024
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/zgyw/uploadPath锛孡inux閰嶇疆 /home/zgyw/uploadPath锛�
- profile: D:/zgyw/uploadPath
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
+
spring:
# 璧勬簮淇℃伅
--
Gitblit v1.8.0