From f7001f34627fa4002997ad735a7950ce1fbabb7c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 14 七月 2025 14:19:12 +0800
Subject: [PATCH] 解决layer接口的代码冲突
---
se-system/src/main/java/com/terra/system/controller/all/PermsController.java | 4
/dev/null | 135 ---------------------------------
docker/docker-compose.yml | 8 +
docker/nginx/conf/nginx.conf | 49 +++---------
se-system/src/main/java/com/terra/system/controller/data/PublishController.java | 2
se-system/src/main/java/com/terra/system/service/sys/LayerService.java | 4 +
6 files changed, 24 insertions(+), 178 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 99bdcec..39cc616 100644
--- a/docker/docker-compose.yml
+++ b/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:
diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf
index 883ed22..dc00e21 100644
--- a/docker/nginx/conf/nginx.conf
+++ b/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
diff --git a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
index 48c8234..efe838a 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
+++ b/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;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/PublishController.java b/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
index 2053acd..9fa63df 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
+++ b/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;
diff --git a/se-system/src/main/java/com/terra/system/entity/data/LayerEntity.java b/se-system/src/main/java/com/terra/system/entity/data/LayerEntity.java
deleted file mode 100644
index f0d30e0..0000000
--- a/se-system/src/main/java/com/terra/system/entity/data/LayerEntity.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package com.terra.system.entity.data;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * 鍥惧眰
- * @author WWW
- */
-public class LayerEntity implements Serializable {
- private static final long serialVersionUID = -159911666139919168L;
-
- private int id;
-
- private int pid;
-
- private String cnName;
-
- private String enName;
-
- private String url;
-
- private int isLayer;
-
- private int isShow;
-
- private String icon;
-
- private int level;
-
- private int orderNum;
-
- private int status;
-
- private int data;
-
- private String tab;
-
- private int createUser;
-
- private Timestamp createTime;
-
- private int updateUser;
-
- private Timestamp updateTime;
-
- private String bak;
-
- private double elev;
-
- private int resid;
-
- private int type;
-
- private String proxy;
-
- private int category;
-
- private int flag;
-
- private Integer pubid;
-
- private String unit;
-
- public LayerEntity() {
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public int getPid() {
- return pid;
- }
-
- public void setPid(int pid) {
- this.pid = pid;
- }
-
- public String getCnName() {
- return cnName;
- }
-
- public void setCnName(String cnName) {
- this.cnName = cnName;
- }
-
- public String getEnName() {
- return enName;
- }
-
- public void setEnName(String enName) {
- this.enName = enName;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public int getIsLayer() {
- return isLayer;
- }
-
- public void setIsLayer(int isLayer) {
- this.isLayer = isLayer;
- }
-
- public int getIsShow() {
- return isShow;
- }
-
- public void setIsShow(int isShow) {
- this.isShow = isShow;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public int getLevel() {
- return level;
- }
-
- public void setLevel(int level) {
- this.level = level;
- }
-
- public int getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(int orderNum) {
- this.orderNum = orderNum;
- }
-
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
- }
-
- public int getData() {
- return data;
- }
-
- public void setData(int data) {
- this.data = data;
- }
-
- public String getTab() {
- return tab;
- }
-
- public void setTab(String tab) {
- this.tab = tab;
- }
-
- public int getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(int createUser) {
- this.createUser = createUser;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public int getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(int updateUser) {
- this.updateUser = updateUser;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getBak() {
- return bak;
- }
-
- public void setBak(String bak) {
- this.bak = bak;
- }
-
- public double getElev() {
- return elev;
- }
-
- public void setElev(double elev) {
- this.elev = elev;
- }
-
- public int getResid() {
- return resid;
- }
-
- public void setResid(int resid) {
- this.resid = resid;
- }
-
- public int getType() {
- return type;
- }
-
- public void setType(int type) {
- this.type = type;
- }
-
- public String getProxy() {
- return proxy;
- }
-
- public void setProxy(String proxy) {
- this.proxy = proxy;
- }
-
- public int getCategory() {
- return category;
- }
-
- public void setCategory(int category) {
- this.category = category;
- }
-
- public int getFlag() {
- return flag;
- }
-
- public void setFlag(int flag) {
- this.flag = flag;
- }
-
- public Integer getPubid() {
- return pubid;
- }
-
- public void setPubid(Integer pubid) {
- this.pubid = pubid;
- }
-
- public String getUnit() {
- return unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-}
diff --git a/se-system/src/main/java/com/terra/system/mapper/data/LayerMapper.java b/se-system/src/main/java/com/terra/system/mapper/data/LayerMapper.java
deleted file mode 100644
index b97c44b..0000000
--- a/se-system/src/main/java/com/terra/system/mapper/data/LayerMapper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.terra.system.mapper.data;
-
-import com.terra.system.entity.data.LayerEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 鍥惧眰
- * @author WWW
- */
-@Mapper
-@Repository
-public interface LayerMapper {
- public List<LayerEntity> selectLayers(String uid);
-
- public List<LayerEntity> selectProjectLayers(String uid);
-
- public Integer selectCount(String name);
-
- public List<LayerEntity> selectByPage(String name, Integer limit, Integer offset);
-
- public List<LayerEntity> selectAll(Integer flag);
-
- public LayerEntity selectById(int id);
-
- public Integer selectIdByName(String name);
-
- public Integer selectMaxOrderNumByPid(Integer pid);
-
- public LayerEntity selectByResId(Integer resid);
-
- public Integer insert(LayerEntity entity);
-
- public Integer inserts(List<LayerEntity> list);
-
- public Integer delete(int id);
-
- public Integer deletes(List<Integer> ids);
-
- public Integer update(LayerEntity entity);
-
- public Integer updates(List<LayerEntity> list);
-}
diff --git a/se-system/src/main/java/com/terra/system/service/data/LayerService.java b/se-system/src/main/java/com/terra/system/service/data/LayerService.java
deleted file mode 100644
index ccdb29b..0000000
--- a/se-system/src/main/java/com/terra/system/service/data/LayerService.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.terra.system.service.data;
-
-import com.terra.system.entity.all.RedisCacheKey;
-import com.terra.system.entity.all.SettingData;
-import com.terra.system.entity.data.LayerEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.mapper.data.LayerMapper;
-import com.terra.system.service.all.RedisService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 鍥惧眰
- * @author WWW
- */
-@Service
-public class LayerService implements LayerMapper {
- @Resource
- LayerMapper layerMapper;
-
- @Resource
- RedisService redisService;
-
- @Override
- public List<LayerEntity> selectLayers(String uid) {
- String key = RedisCacheKey.permsLayerKey(uid);
- Object obj = redisService.get(key);
- if (obj instanceof List<?>) {
- return (List<LayerEntity>) obj;
- }
-
- List<LayerEntity> list = layerMapper.selectLayers(uid);
- if (list != null && list.size() > 0) {
- redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
- }
-
- return list;
- }
-
- @Override
- public List<LayerEntity> selectProjectLayers(String uid) {
- String key = RedisCacheKey.permsProjectLayerKey(uid);
- Object obj = redisService.get(key);
- if (obj instanceof List<?>) {
- return (List<LayerEntity>) obj;
- }
-
- List<LayerEntity> list = layerMapper.selectProjectLayers(uid);
- if (list != null && list.size() > 0) {
- redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
- }
-
- return list;
- }
-
- @Override
- public Integer selectCount(String name) {
- name = StringHelper.getLikeUpperStr(name);
-
- return layerMapper.selectCount(name);
- }
-
- @Override
- public List<LayerEntity> selectByPage(String name, Integer limit, Integer offset) {
- name = StringHelper.getLikeUpperStr(name);
-
- return layerMapper.selectByPage(name, limit, offset);
- }
-
- @Override
- public List<LayerEntity> selectAll(Integer flag) {
- return layerMapper.selectAll(flag);
- }
-
- @Override
- public LayerEntity selectById(int id) {
- return layerMapper.selectById(id);
- }
-
- @Override
- public Integer selectIdByName(String name) {
- Integer id = layerMapper.selectIdByName(name);
- return null == id ? 0 : id;
- }
-
- @Override
- public Integer selectMaxOrderNumByPid(Integer pid) {
- return layerMapper.selectMaxOrderNumByPid(pid);
- }
-
- @Override
- public LayerEntity selectByResId(Integer resid) {
- return layerMapper.selectByResId(resid);
- }
-
- @Override
- public Integer insert(LayerEntity entity) {
- return layerMapper.insert(entity);
- }
-
- @Override
- public Integer inserts(List<LayerEntity> list) {
- return layerMapper.inserts(list);
- }
-
- @Override
- public Integer delete(int id) {
- return layerMapper.delete(id);
- }
-
- @Override
- public Integer deletes(List<Integer> ids) {
- return layerMapper.deletes(ids);
- }
-
- @Override
- public Integer update(LayerEntity entity) {
- return layerMapper.update(entity);
- }
-
- @Override
- public Integer updates(List<LayerEntity> list) {
- return layerMapper.updates(list);
- }
-
- /**
- * 娓呴櫎缂撳瓨
- */
- public void clearCache() {
- redisService.clearKeys(RedisCacheKey.permsLayerKey(""));
- }
-}
diff --git a/se-system/src/main/java/com/terra/system/service/sys/LayerService.java b/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
index 15c9b5c..3c25a81 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
+++ b/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(""));
+ }
}
--
Gitblit v1.9.3