zjh
2023-10-17 40848500b3bf9a1b4fc637c224d6e35f07c13159
zjh 2023/10/17--2
4个文件已修改
27 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-druid.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application.yml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/test/java/zjhTest.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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";
    }
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
ltkj-admin/src/main/resources/application.yml
@@ -12,7 +12,8 @@
  # 用户换头像后的图片存储地址  测试:D:\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/
# 微信小程序appid 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:
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);
        }
//        }
    }