From 40848500b3bf9a1b4fc637c224d6e35f07c13159 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十月 2023 16:06:12 +0800
Subject: [PATCH] zjh 2023/10/17--2
---
ltkj-admin/src/test/java/zjhTest.java | 10 +++++-----
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java | 6 ++++++
ltkj-admin/src/main/resources/application-druid.yml | 1 +
ltkj-admin/src/main/resources/application.yml | 10 ++++++----
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
index a2f6f5d..814ba67 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
@@ -1,5 +1,7 @@
package com.ltkj.web.jmreport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.omg.CORBA.Environment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -15,11 +17,13 @@
*/
@RestController
@RequestMapping("/report/jmreport")
+@Api(tags = "PC绔� 绉湪鎶ヨ〃鎺ュ彛闆�")
public class JimuController {
@Value("${jimu.path}")
private String value;
@GetMapping("/index")
+ @ApiOperation(value = "index")
// @PreAuthorize("@ss.hasPermi('report:jmreport:index')")
public String index(){
return value+"/jmreport/list";
@@ -32,12 +36,14 @@
// }
@GetMapping("/view")
+ @ApiOperation(value = "view")
//@PreAuthorize("@ss.hasPermi('report:jimu:view')")
public String view(){
return value+"/jmreport/view";
}
@GetMapping("/exportPdf")
+ @ApiOperation(value = "exportPdf")
public String exportPdf(){
return value+"/jmreport/exportPdfStream";
}
diff --git a/ltkj-admin/src/main/resources/application-druid.yml b/ltkj-admin/src/main/resources/application-druid.yml
index 4a5cddb..19c9b01 100644
--- a/ltkj-admin/src/main/resources/application-druid.yml
+++ b/ltkj-admin/src/main/resources/application-druid.yml
@@ -8,6 +8,7 @@
master:
url: jdbc:mysql://101.42.27.146:3306/ltkj_tj1.0?serverTimezone=GMT%2B8
# url: jdbc:mysql://localhost:3306/ltkj_tj1.0?serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ltkj_tj2.0?serverTimezone=GMT%2B8
username: root
#password: Root_ltkj123
password: Root_ltkj123
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 341a09b..93abbcd 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -12,7 +12,8 @@
# 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
#profile: D:/ltkj/uploadPath
profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
- #
+# profile: http://192.168.0.99:5502/uploadPath
+
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
@@ -179,6 +180,7 @@
photoPath: D:\AppPhoto\uploadPath\
# nginx鍥剧墖鏈嶅姟鍣�
photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+#photoServer: http://192.168.0.99:5502/uploadPath/
# 寰俊灏忕▼搴廰ppid secret
xcx:
@@ -206,9 +208,9 @@
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
-# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-# path: http://192.168.0.99:8080/ltkj-admin/jmreport/view
- path: http://192.168.0.101:5011
+ path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+# path: http://192.168.0.99:8080/ltkj-admin
+# path: http://192.168.0.101:5011
jeecg :
jmreport:
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 7c750b2..2834fd1 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -58,17 +58,17 @@
private String secret;
@Test
public void test() {
- List<DictHosp> list = dictHospService.list();
- for (DictHosp dictHosp : list) {
+// List<DictHosp> list = dictHospService.list();
+// for (DictHosp dictHosp : list) {
// DateTime dateTime1 = DateUtil.offsetMonth(new Date(),6);
- String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dictHosp.getExpirationTime());
- dictHosp.setSecretKey(mallMerchantSecretKey);
+// String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dictHosp.getExpirationTime());
+// dictHosp.setSecretKey(mallMerchantSecretKey);
// dictHosp.setExpirationTime(DateUtil.offsetDay(new Date(),30));
// dictHospService.updateById(dictHosp);
// System.out.println(dateTime1);
// System.out.println("=================================================");
// System.out.println(mallMerchantSecretKey);
- }
+// }
}
--
Gitblit v1.8.0