Browse Source

最新代码提交优化

lishiqiang 1 tháng trước cách đây
mục cha
commit
8a97a22ad3

+ 51 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/app/TestController.java

@@ -0,0 +1,51 @@
+package com.yc.ship.module.ota.controller.app;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogRespVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogSaveReqVO;
+import com.yc.ship.module.ota.convert.distrbutor.DistributorConvert;
+import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
+import com.yc.ship.module.ota.dal.dataobject.tradelog.TradeLogDO;
+import com.yc.ship.module.ota.service.distributor.DistributorService;
+import com.yc.ship.module.ota.service.tradelog.TradeLogService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+import static com.yc.ship.framework.common.util.collection.CollectionUtils.convertList;
+import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+
+@Tag(name = "管理后台 - 分销商交易日志")
+@RestController
+@RequestMapping("/test")
+@Validated
+public class TestController {
+
+    @GetMapping("/index")
+    @PermitAll
+    @Operation(summary = "创建分销商交易日志")
+    public CommonResult<Long> index() {
+        return success(1L);
+    }
+
+}

+ 1 - 1
ship-server-web/src/main/java/com/yc/ship/framework/web/config/WebProperties.java

@@ -19,7 +19,7 @@ public class WebProperties {
 
 
 //    @Value("${yudao.web.app-url:'app-api'}")
-    private String appUrl="app-api";
+    private String appUrl="travl-app-api";
 
 //    @Value("${yudao.web.admin-url:ship-api}")
     private String adminUrl = "ship-ota-api";

+ 3 - 2
ship-server-web/src/main/resources/application.yaml

@@ -239,7 +239,7 @@ yudao:
     admin-ui:
       url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址
     admin-url: ship-ota-api
-    app-url: app-api
+    app-url: travl-app-api
   xss:
     enable: false
     exclude-urls: # 如下两个 url,仅仅是为了演示,去掉配置也没关系
@@ -278,7 +278,8 @@ yudao:
     enable: true
     ignore-urls:
       - /jmreport/* # 积木报表,无法携带租户编号
-      - /ship-ota-api/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号
+      - /travl-app-api/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号
+      - /travl-app-api/test/index # 基于名字获取租户,不许带租户编号
     ignore-visit-urls:
       - /admin-api/system/user/profile/**
     ignore-tables: