解决layer接口的代码冲突

13693261870

9 天以前 f7001f34627fa4002997ad735a7950ce1fbabb7c

解决layer接口的代码冲突

 docker/docker-compose.yml

@@ -77,8 +77,7 @@
      - redis
      - nacos
    networks:
      - network-se
    restart: always
      - network-jhs
  # system
  system:
    image: openjdk8-422-gdal:3.5.2
@@ -92,11 +91,13 @@
      - postgis
      - nacos
      - redis
    networks:
      - network-jhs
  # nginx
  nginx:
    image: nginx:1.29
    ports:
      - 8081:80
      - 80:80
    environment:
      TZ: Asia/Shanghai
    volumes:
@@ -106,6 +107,7 @@
      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
    depends_on:
      - gateway
      - system
    networks:
      - network-jhs
networks:

 docker/nginx/conf/nginx.conf

@@ -5,59 +5,34 @@
}

http {
    include       mime.types;
    default_type  application/octet-stream;
    sendfile        on;
    keepalive_timeout  65;
    include           mime.types;
    default_type      application/octet-stream;
    sendfile          on;
    keepalive_timeout 65;

    server {
        listen       80;
        server_name  localhost;
        listen        80;
        server_name   localhost;

        location / {
            root    /usr/share/nginx/html;
            try_files $uri $uri/ /index.html;
            index  index.html index.htm;
            root      /usr/share/nginx/html;
            try_files $uri $uri/ /index.html /sso/index.html;
            index     index.html index.htm;
        }
        
        location /sso {
            alias    /usr/share/nginx/html/sso;
            alias     /usr/share/nginx/html/sso;
            try_files $uri $uri/ /sso/;
            #index  index.html index.htm;
        }
        
        location /sys {
            alias    /usr/share/nginx/html/sys;
            try_files $uri $uri/ /sys/;
            #index  index.html index.htm;
        }

        location /se-file/ {
        location /api/ {
            proxy_set_header Host $http_host;
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header REMOTE-HOST $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            
            #proxy_pass http://se-file:9300/;
            proxy_pass http://se-system:9201/;
        }
        
        location /prod-api/ {
            proxy_set_header Host $http_host;
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header REMOTE-HOST $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            
            proxy_pass http://se-gateway:8080/;
        }

        location /wgcloud {
            proxy_set_header Host $http_host;
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header REMOTE-HOST $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            
            proxy_pass http://se-wgcloud:9999/wgcloud;
            proxy_pass http://gateway:8001/;
        }

        # actuator

 se-system/src/main/java/com/terra/system/controller/all/PermsController.java

@@ -2,12 +2,12 @@

import com.terra.system.annotation.SysLog;
import com.terra.system.entity.all.*;
import com.terra.system.entity.data.LayerEntity;
import com.terra.system.entity.sys.LayerEntity;
import com.terra.system.entity.sys.MenuEntity;
import com.terra.system.entity.sys.ResEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
import com.terra.system.service.data.LayerService;
import com.terra.system.service.sys.LayerService;
import com.terra.system.service.sys.MenuService;
import com.terra.system.service.sys.TokenService;
import io.swagger.annotations.Api;

 se-system/src/main/java/com/terra/system/controller/data/PublishController.java

@@ -11,10 +11,10 @@
import com.terra.system.helper.PathHelper;
import com.terra.system.helper.StringHelper;
import com.terra.system.helper.WebHelper;
import com.terra.system.service.data.LayerService;
import com.terra.system.service.data.MetaService;
import com.terra.system.service.data.PublishService;
import com.terra.system.service.data.RasterService;
import com.terra.system.service.sys.LayerService;
import com.terra.system.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

 se-system/src/main/java/com/terra/system/entity/data/LayerEntity.java

文件已删除

 se-system/src/main/java/com/terra/system/mapper/data/LayerMapper.java

文件已删除

 se-system/src/main/java/com/terra/system/service/data/LayerService.java

文件已删除

 se-system/src/main/java/com/terra/system/service/sys/LayerService.java

@@ -122,4 +122,8 @@
    public Integer updates(List<LayerEntity> list) {
        return layerMapper.updates(list);
    }

    public void clearCache() {
        redisService.clearKeys(RedisCacheKey.permsLayerKey(""));
    }
}