xuqiang преди 10 месеца
родител
ревизия
cd31016349

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/po/SysAppManage.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.po;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
@@ -22,4 +23,6 @@ public class SysAppManage extends BaseModel {
 
     private String systemCode;
 
+    @TableField(exist = false)
+    private String downloadUrl;
 }

+ 1 - 1
commons/src/main/java/com/jzg/commons/entity/po/SysVersion.java

@@ -40,6 +40,6 @@ public class SysVersion extends BaseModel {
 
     private String issueFlag;
 
-    private byte  packageType;
+    private String  packageType;
 
 }

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/vo/SysAppManageVo.java

@@ -4,6 +4,12 @@ package com.jzg.commons.entity.vo;
 import com.jzg.commons.core.base.PageRequest;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class SysAppManageVo extends PageRequest {
+
+    @NotBlank(message = "应用名称不能为空")
+    private String appName;
+
 }

+ 17 - 2
gateway/src/main/java/com/jzg/filter/AuthFilter.java

@@ -1,5 +1,6 @@
 package com.jzg.filter;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -8,8 +9,13 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.time.Instant;
+
 @Component
 @Order(0)
+@Slf4j
 public class AuthFilter implements GlobalFilter {
 
     @Autowired
@@ -20,8 +26,17 @@ public class AuthFilter implements GlobalFilter {
         // 获取请求路径和方法
         String path = exchange.getRequest().getPath().value();
 
-        // 如果权限验证通过,继续请求链
-        return chain.filter(exchange);
+        return chain.filter(exchange)
+                .doOnSuccess(v -> {
+                    long cost = Duration.between(Instant.now(), Instant.now()).toMillis();
+                    int statusCode = exchange.getResponse().getStatusCode().value();
+                    log.info("【Gateway响应出口】 请求地址:{} , 耗时: {}ms , 状态码: {} ", path, statusCode, cost);
+                })
+                // 发生异常时记录日志(ERROR级别)
+                .doOnError(e -> {
+                    long cost = Duration.between(Instant.now(), Instant.now()).toMillis();
+                    log.error("【Gateway请求异常】 请求地址:{} , 耗时: {}ms, 异常信息:{} ",path,cost, e);
+                });
     }
 
 }

+ 2 - 0
gateway/src/main/resources/application-dev.yml

@@ -86,6 +86,8 @@ spring:
                   - /userBankCard/**
                   - /receivable/**
                   - /ptlAgreementDispatch/**
+                  - /appManage/**
+                  - /version/**
 
         - id: summary_route
           uri: http://localhost:9898/

+ 2 - 2
platform/src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
     active: dev
   servlet:
     multipart:
-      max-file-size: 5MB
-      max-request-size: 5MB
+      max-file-size: 100MB
+      max-request-size: 100MB
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml

+ 4 - 4
tenant/organization/src/main/java/com/jzg/organization/controller/SysVersionController.java

@@ -30,8 +30,8 @@ public class SysVersionController {
     }
 
     @PostMapping("/delete")
-    public HttpResult delete(@RequestBody SysVersionVo sysVersionVo) {
-        SysVersion sysVersion = sysVersionService.getById(sysVersionVo.getId());
+    public HttpResult delete(@RequestParam String id) {
+        SysVersion sysVersion = sysVersionService.getById(id);
         if (sysVersion == null) {
             HttpResult.error("数据不存在");
         }
@@ -46,8 +46,8 @@ public class SysVersionController {
     }
 
     @GetMapping("/getMaxVersion")
-    public HttpResult getMaxVersion(@RequestParam String appid) {
-        return HttpResult.ok(sysVersionService.getMaxVersion(appid));
+    public HttpResult getMaxVersion(@RequestParam("appid") String appid,@RequestParam("packageType") String packageType) {
+        return HttpResult.ok(sysVersionService.getMaxVersion(appid,packageType));
     }
 
 }

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/SysVersionService.java

@@ -7,7 +7,7 @@ import com.jzg.commons.entity.vo.SysVersionVo;
 
 
 public interface SysVersionService extends IService<SysVersion> {
-    SysVersion getMaxVersion(String appid);
+    SysVersion getMaxVersion(String appid,String packageType);
 
     Page<SysVersion> getSysVersionPageList(Page page, SysVersionVo sysVersionVo);
 }

+ 13 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAppManageServiceImpl.java

@@ -5,20 +5,32 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysAppManage;
+import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.vo.SysAppManageVo;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.organization.mapper.SysAppManageMapper;
+import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.service.SysAppManageService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
 @Service
 public class SysAppManageServiceImpl extends ServiceImpl<SysAppManageMapper, SysAppManage> implements SysAppManageService {
 
+    @Autowired
+    private SysUploadFilesMapper sysUploadFilesMapper;
+
     @Override
     public Page<SysAppManage> queryAppList(SysAppManageVo sysAppManageVo) {
         try {
             LambdaQueryWrapper<SysAppManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            return baseMapper.selectPage(sysAppManageVo.getPage(), lambdaQueryWrapper);
+            Page<SysAppManage> page = baseMapper.selectPage(sysAppManageVo.getPage(), lambdaQueryWrapper);
+            page.getRecords().forEach(item -> {
+                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(item.getAppIcon());
+                item.setDownloadUrl(MinioUtils.getPresignedObjectUrl(sysUploadFiles.getBucketName(), sysUploadFiles.getFileName()));
+            });
+            return page;
         }catch (Exception e){
             e.printStackTrace();
             throw new RuntimeException("查询失败");

+ 6 - 6
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysVersionServiceImpl.java

@@ -10,8 +10,6 @@ import com.jzg.organization.service.SysVersionService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author quchen
  * @date 2025/6/19 9:58
@@ -22,10 +20,12 @@ public class SysVersionServiceImpl extends ServiceImpl<SysVersionMapper, SysVers
     @Resource
     private SysVersionMapper sysVersionMapper;
     @Override
-    public SysVersion getMaxVersion(String appid) {
-        String maxVersion = sysVersionMapper.getMaxVersion(appid);
-        List<SysVersion> list = sysVersionMapper.selectList(new LambdaQueryWrapper<SysVersion>().eq(SysVersion::getVersion, maxVersion));
-        return list.get(0);
+    public SysVersion getMaxVersion(String appid,String packageType) {
+        return  baseMapper.selectOne(new LambdaQueryWrapper<>(SysVersion.class)
+                .eq(SysVersion::getAppId, appid)
+                .eq(SysVersion::getPackageType, packageType)
+                .orderByDesc(SysVersion::getCreateTime)
+                .last("LIMIT 1"));
     }
 
     @Override

+ 1 - 0
tenant/organization/src/main/resources/application.yml

@@ -92,6 +92,7 @@ tenant:
     - wechat_customer_service_recording
     - ins_fee_audit
     - sys_user_jzg_info_bank_card_record
+    - sys_app_manage
 
 
   ignoreLoginNames: