2 Коммиты 798588425e ... 48025d77da

Автор SHA1 Сообщение Дата
  hill.liu 48025d77da merge baseInfoCOntroller месяцев назад: 6
  hill.liu 034e50d97f 1.文档跨域问题,WebConfiguration修改文档的目录。2.application.xml中需改path-url.3.修改生产环境打印机IP. 4. 修改查询操作日志条件 месяцев назад: 6

+ 7 - 1
src/main/java/com/sy/coinage/config/WebConfiguration.java

@@ -44,7 +44,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/file/**").addResourceLocations("file:upload/file/");
-        registry.addResourceHandler("/docs/**").addResourceLocations("file:upload/docs/");
+        registry.addResourceHandler("/atta/**").addResourceLocations("file:upload/atta/");
         registry.addResourceHandler("/template/**").addResourceLocations("file:upload/template/");
         registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/favicon.ico").addResourceLocations("classpath:/META-INF/resources/");
@@ -68,8 +68,14 @@ public class WebConfiguration implements WebMvcConfigurer {
                                         "Authorization", "Access-Control-Request-Method",
                                         "Access-Control-Request-Headers")
                         .allowCredentials(true).maxAge(3600);
+//        registry.addMapping("/**").allowedOriginPatterns("*")
+//                .allowedMethods("*")
+//                .allowedHeaders("*")
+//                .allowCredentials(true).maxAge(3600);
     }
 
+
+
     // 配置响应FastJson序列化
     @Bean
     public MyMessageConverter converter() {

+ 1 - 1
src/main/java/com/sy/coinage/log/controller/OperateLogController.java

@@ -40,7 +40,7 @@ public class OperateLogController {
     @PostMapping("/list")
     public IPage<OperateLog> list(@RequestBody OperateLogListReq req, @CurrentUser CacheUserVO user) {
         LambdaQueryWrapper<OperateLog> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(OperateLog::getTenantId, user.getTenantId());
+//        queryWrapper.eq(OperateLog::getTenantId, user.getTenantId());
         if (req.getStartDate() != null) {
             queryWrapper.ge(OperateLog::getStartTime, DateUtils.getDayStartTime(req.getStartDate()));
         }

+ 1 - 1
src/main/resources/application-prod.yml

@@ -25,5 +25,5 @@ spring:
 swagger:
   enable: false
 printer:
-  ipAddress: 192.168.6.228
+  ipAddress: 10.89.12.58
   port: 9100

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

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: local
   application:
     name: tenant_coinage
   mvc:
@@ -47,7 +47,7 @@ spring:
         allow: ""
         deny: ""
 server:
-  port: 8000
+  port: 9000
   servlet:
     context-path: /coinage
   compression: