From 29d7756959bcee992a2ceeb76d24d2d245521d47 Mon Sep 17 00:00:00 2001 From: lecjy <5655726966@qq.com> Date: Sun, 28 Jan 2024 10:34:21 +0800 Subject: [PATCH] #1001 Signed-off-by: lecjy <5655726966@qq.com> --- .husky/pre-commit | 1 + containerization/docker-compose.yml | 33 +--- .../mysql/v9.init.sql | 0 .../openresty/conf.d/default.conf | 147 +++++------------- cskefu-backend/README.md | 18 +-- .../pom.xml | 2 +- .../CskefuWechatChannelApplication.java | 0 .../cskefu/wechat/CustomWebMvcConfigurer.java | 0 .../com/cskefu/wechat/MessageSendRequest.java | 0 .../com/cskefu/wechat/MessageTypeEnum.java | 0 .../cskefu/wechat/RecallMessageRequest.java | 0 .../cskefu/wechat/WechatCallbackChatbot.java | 0 .../wechat/WechatCallbackIndependent.java | 0 .../cskefu/wechat/WechatCallbackUnion.java | 0 .../cskefu/wechat/WechatKefuController.java | 0 .../cskefu/wechat/WechatKefuServiceImpl.java | 0 .../cskefu/wechat/message/CardMessage.java | 0 .../cskefu/wechat/message/EventMessage.java | 0 .../cskefu/wechat/message/FileMessage.java | 0 .../cskefu/wechat/message/ImageMessage.java | 0 .../cskefu/wechat/message/LinkMessage.java | 0 .../wechat/message/LocationMessage.java | 0 .../cskefu/wechat/message/MenuMessage.java | 0 .../cskefu/wechat/message/MessageItem.java | 0 .../cskefu/wechat/message/MessageRequest.java | 0 .../wechat/message/MessageResponse.java | 0 .../wechat/message/MiniprogramMessage.java | 0 .../wechat/message/ShopOrderMessage.java | 0 .../wechat/message/ShopProductMessage.java | 0 .../cskefu/wechat/message/TextMessage.java | 0 .../cskefu/wechat/message/VideoMessage.java | 0 .../cskefu/wechat/message/VoiceMessage.java | 0 .../wechat/response/AccessTokenResponse.java | 0 .../wechat/response/AsyncMessageResponse.java | 0 .../com/cskefu/wechat/response/Response.java | 0 .../wechat/response/SendMessageResponse.java | 0 .../com/cskefu/wechat/utils/AesException.java | 0 .../com/cskefu/wechat/utils/ByteGroup.java | 0 .../com/cskefu/wechat/utils/JacksonUtils.java | 0 .../com/cskefu/wechat/utils/MessageCrypt.java | 0 .../com/cskefu/wechat/utils/PKCS7Encoder.java | 0 .../java/com/cskefu/wechat/utils/SHA1.java | 0 .../com/cskefu/wechat/utils/XMLParse.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/smart-doc.json | 0 cskefu-backend/cskefu-channel/pom.xml | 2 +- .../cskefu-gateway/cskefu-web-gateway/pom.xml | 73 --------- .../cskefu/CskefuWebGatewayApplication.java | 34 ---- .../src/main/resources/application.properties | 16 -- .../src/main/resources/bootstrap.properties | 16 -- .../src/main/resources/smart-doc.json | 17 -- cskefu-backend/cskefu-gateway/pom.xml | 19 --- cskefu-backend/pom.xml | 1 - 53 files changed, 48 insertions(+), 331 deletions(-) rename cskefu-backend/v9.mysql.init.sql => containerization/mysql/v9.init.sql (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/pom.xml (98%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/CskefuWechatChannelApplication.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/CustomWebMvcConfigurer.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/MessageSendRequest.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/MessageTypeEnum.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/RecallMessageRequest.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/WechatCallbackChatbot.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/WechatCallbackIndependent.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/WechatCallbackUnion.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/WechatKefuController.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/WechatKefuServiceImpl.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/CardMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/EventMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/FileMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/ImageMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/LinkMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/LocationMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/MenuMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/MessageItem.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/MessageRequest.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/MessageResponse.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/MiniprogramMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/ShopOrderMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/ShopProductMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/TextMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/VideoMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/message/VoiceMessage.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/response/AccessTokenResponse.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/response/AsyncMessageResponse.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/response/Response.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/response/SendMessageResponse.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/AesException.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/ByteGroup.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/JacksonUtils.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/MessageCrypt.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/PKCS7Encoder.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/SHA1.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/java/com/cskefu/wechat/utils/XMLParse.java (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/resources/application.properties (100%) rename cskefu-backend/cskefu-channel/{cskefu-channel-wechat-service => cskefu-channel-service}/src/main/resources/smart-doc.json (100%) delete mode 100644 cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml delete mode 100644 cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java delete mode 100644 cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties delete mode 100644 cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/bootstrap.properties delete mode 100644 cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/smart-doc.json delete mode 100644 cskefu-backend/cskefu-gateway/pom.xml diff --git a/.husky/pre-commit b/.husky/pre-commit index cd304a2e..f310df25 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1,2 @@ +#!/usr/bin/env sh cd ./cskefu-frontend && pnpm run lint \ No newline at end of file diff --git a/containerization/docker-compose.yml b/containerization/docker-compose.yml index df358f70..489203a9 100644 --- a/containerization/docker-compose.yml +++ b/containerization/docker-compose.yml @@ -15,6 +15,7 @@ services: volumes: - ./mysql/data:/var/lib/mysql - ./mysql/nacos.sql:/docker-entrypoint-initdb.d/nacos.sql + - ./mysql/v9.init.sql:/docker-entrypoint-initdb.d/v9.init.sql command: --max_allowed_packet=32505856 # https://hub.docker.com/r/nacos/nacos-server @@ -109,40 +110,8 @@ services: - ./openresty/certs:/certs - ./openresty/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf depends_on: - - cskefu-web-gateway - cskefu-websocket-service - cskefu-web-gateway: - image: cskefu/cskefu-web-gateway - # container_name: cskefu-web-gateway - restart: always - # ports: - # - "${CSKEFU_WEB_GATEWAY_PORT:-8080}:8080" - expose: - - 8080 - volumes: - - ./cskefu/logs:/cskefu/logs - - ./bootstrap.properties:/app/resources/bootstrap.properties - - ./logback-spring.xml:/app/resources/logback-spring.xml - deploy: - replicas: 3 - environment: - - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn" - - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO} - - SPRING_APPLICATION_NAME=cskefu-web-gateway - - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8 - - SPRING_DATASOURCE_USERNAME=root - - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456} - # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100 - - SPRING_DATA_REDIS_HOST=redis - - SPRING_DATA_REDIS_PORT=6379 - - SPRING_RABBITMQ_ADDRESSES=rabbitmq - - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672} - - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848 - depends_on: - - cskefu-auth-service - - cskefu-manager-service - cskefu-manager-service: image: cskefu/cskefu-manager-service # container_name: cskefu-manager-service diff --git a/cskefu-backend/v9.mysql.init.sql b/containerization/mysql/v9.init.sql similarity index 100% rename from cskefu-backend/v9.mysql.init.sql rename to containerization/mysql/v9.init.sql diff --git a/containerization/openresty/conf.d/default.conf b/containerization/openresty/conf.d/default.conf index 9e9b82fa..5f54937c 100644 --- a/containerization/openresty/conf.d/default.conf +++ b/containerization/openresty/conf.d/default.conf @@ -21,143 +21,57 @@ http { #keepalive_timeout 0; keepalive_timeout 65; - #gzip on; init_by_lua_block { - instanceQueue = {} + instance_map = {} + balancer = require "ngx.balancer" + nkeys = require "table.nkeys" cjson = require "cjson" } - upstream cskefu_web_gateway { - server 0.0.0.1; - balancer_by_lua_block { - local balancer = require "ngx.balancer" - local instance = table.remove(instanceQueue, 1) - local ok, err = balancer.set_current_peer(instance["ip"], instance["port"]) - if not ok then - ngx.log(ngx.ERR, "failed to set the current peer: ", err) - return ngx.exit(500) - end - } - } - - upstream cskefu_websocket_service { - server 0.0.0.1; - balancer_by_lua_block { - local balancer = require "ngx.balancer" - local instance = table.remove(instanceQueue, 1) - local ok, err = balancer.set_current_peer(instance["ip"], instance["port"]) - if not ok then - ngx.log(ngx.ERR, "failed to set the current peer: ", err) - return ngx.exit(500) - end - } - } - server { root /usr/share/nginx/html; client_max_body_size 100M; - location /api/ { + location ~* /api/.*?/(.*) { access_by_lua_block { + local prefix = ngx.var.uri:match("^/api/([^/]+)/") + local service_name = 'cskefu-'..prefix..'-service' local cjson = require "cjson" - local queueLength = table.getn(instanceQueue) + if not instance_map[service_name] then + instance_map[service_name] = {} + end + local queue_length = table.nkeys(instance_map[service_name]) local mapper = {} - if queueLength > 0 then - for i = 1, queueLength do - local id = instanceQueue[i]["ip"]..":"..instanceQueue[i]["port"] - mapper[id] = i - end + for i = 1, queue_length do + mapper[instance_map[service_name][i]["ip"]..":"..instance_map[service_name][i]["port"]] = i end - local result = ngx.location.capture("/nacos", {args='serviceName=cskefu-web-gateway'}) + local result = ngx.location.capture("/nacos", {args='serviceName='..service_name}) local hosts = cjson.decode(result.body)['hosts'] - local hostsLength = table.getn(hosts) - local others = {} - instanceQueue = {} - for i = 1, hostsLength do - local id = hosts[i]["ip"]..":"..hosts[i]["port"] - if hosts[i]["healthy"] == true then - if mapper[id] then - instanceQueue[mapper[id]] = { - ["ip"] = hosts[i]["ip"], - ["port"] = hosts[i]["port"] - } - else - table.insert(others, { - ["ip"] = hosts[i]["ip"], - ["port"] = hosts[i]["port"] - }) - end - end - end - local othersLength = table.getn(others) - if othersLength > 0 then - for i = 1, othersLength do - table.insert(instanceQueue, { - ["ip"] = others[i]["ip"], - ["port"] = others[i]["port"] + + local hosts_length = table.nkeys(hosts) + for i = 1, hosts_length do + if not mapper[hosts[i]["ip"]..":"..hosts[i]["port"]] then + table.insert(instance_map[service_name], { + ["ip"] = hosts[i]["ip"], + ["port"] = hosts[i]["port"] }) end end + local instance = table.remove(instance_map[service_name], 1) + ngx.ctx.host = instance["ip"] + ngx.ctx.port = instance["port"] } + proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - # proxy_pass http://cskefu-web-gateway:8080/; - proxy_pass http://cskefu_web_gateway/; - } + proxy_pass http://cskefu-upstream/$1; - location /ws/ { - access_by_lua_block { - local cjson = require "cjson" - local queueLength = table.getn(instanceQueue) - local mapper = {} - if queueLength > 0 then - for i = 1, queueLength do - local id = instanceQueue[i]["ip"]..":"..instanceQueue[i]["port"] - mapper[id] = i - end - end - local result = ngx.location.capture("/nacos", {args='serviceName=cskefu-websocket-service'}) - local hosts = cjson.decode(result.body)['hosts'] - local hostsLength = table.getn(hosts) - local others = {} - instanceQueue = {} - for i = 1, hostsLength do - local id = hosts[i]["ip"]..":"..hosts[i]["port"] - if hosts[i]["healthy"] == true then - if mapper[id] then - instanceQueue[mapper[id]] = { - ["ip"] = hosts[i]["ip"], - ["port"] = hosts[i]["port"] - } - else - table.insert(others, { - ["ip"] = hosts[i]["ip"], - ["port"] = hosts[i]["port"] - }) - end - end - end - local othersLength = table.getn(others) - if othersLength > 0 then - for i = 1, othersLength do - table.insert(instanceQueue, { - ["ip"] = others[i]["ip"], - ["port"] = others[i]["port"] - }) - end - end - } proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_http_version 1.1; - # proxy_pass http://cskefu-websocket-service:10000/ws/; - proxy_pass http://cskefu_websocket_service; } location = /nacos { @@ -167,6 +81,17 @@ http { } } + upstream cskefu-upstream { + server 0.0.0.1; + balancer_by_lua_block { + local ok, err = balancer.set_current_peer(ngx.ctx.host, ngx.ctx.port) + if not ok then + ngx.log(ngx.ERR, "failed to set the current peer: ", err) + return ngx.exit(500) + end + } + } + # Don't reveal OpenResty version to clients. # server_tokens off; } diff --git a/cskefu-backend/README.md b/cskefu-backend/README.md index 13018e2e..f50a374b 100644 --- a/cskefu-backend/README.md +++ b/cskefu-backend/README.md @@ -56,21 +56,23 @@ contact-backend │ │ │ └─cskefu-assistant-mvc mvc相关辅助模块 │ -├─cskefu-auth 认证和鉴权，不要随意添加更多微服务 +├─cskefu-auth 认证和鉴权，不要随意添加微服务 │ │ │ ├─cskefu-auth-domain │ │ │ └─cskefu-auth-service │ -├─cskefu-channel 渠道接入，可根据需要添加更多微服务 +├─cskefu-channel 渠道接入，不同渠道用不同的，不要随意添加微服务 │ │ -│ ├─cskefu-channel-wechat-domain +│ ├─cskefu-channel-service xxx渠道微服务，目录以cskefu-channel-开头 │ │ -│ ├─cskefu-channel-wechat-service 微信渠道接入 +│ ├─cskefu-channel-wechat-domain 微信渠道 │ │ -│ ├─cskefu-channel-xxx-domain +│ ├─cskefu-channel-wechat 微信渠道业务逻辑 │ │ -│ └─cskefu-channel-xxx-service xxx渠道微服务，目录以cskefu-channel-开头 +│ ├─cskefu-channel-xxx-domain xxx微信渠道 +│ │ +│ └─cskefu-channel-xxx xxx渠道业务逻辑 │ ├─cskefu-manager 核心控制，如基础配置、时效管理、会话分配，不要随意添加更多服务 │ │ @@ -84,10 +86,6 @@ contact-backend │ │ │ └─cskefu-plugin-service │ -├─cskefu-gateway 聚合网关服务放在这个目录下 -│ │ -│ └─cskefu-web-gateway 暴漏给web端的聚合网关，web前端只和这一个服务交互（WebSocket连接除外），其他微服务提供基础功能，聚合网关组合调用其他微服务的接口 -│ └─cskefu-websocket │ ├─cskefu-websocket-domain diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/pom.xml b/cskefu-backend/cskefu-channel/cskefu-channel-service/pom.xml similarity index 98% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/pom.xml rename to cskefu-backend/cskefu-channel/cskefu-channel-service/pom.xml index 00d55aad..f50ad87c 100644 --- a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/pom.xml +++ b/cskefu-backend/cskefu-channel/cskefu-channel-service/pom.xml @@ -2,7 +2,7 @@ - cskefu-channel-wechat-service + cskefu-channel-service 1.0.0-SNAPSHOT jar 4.0.0 diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/CskefuWechatChannelApplication.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/CskefuWechatChannelApplication.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/CskefuWechatChannelApplication.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/CskefuWechatChannelApplication.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/CustomWebMvcConfigurer.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/CustomWebMvcConfigurer.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/CustomWebMvcConfigurer.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/CustomWebMvcConfigurer.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/MessageSendRequest.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/MessageSendRequest.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/MessageSendRequest.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/MessageSendRequest.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/MessageTypeEnum.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/MessageTypeEnum.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/MessageTypeEnum.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/MessageTypeEnum.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/RecallMessageRequest.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/RecallMessageRequest.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/RecallMessageRequest.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/RecallMessageRequest.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatCallbackChatbot.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatCallbackChatbot.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatCallbackChatbot.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatCallbackChatbot.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatCallbackIndependent.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatCallbackIndependent.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatCallbackIndependent.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatCallbackIndependent.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatCallbackUnion.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatCallbackUnion.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatCallbackUnion.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatCallbackUnion.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatKefuController.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatKefuController.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatKefuController.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatKefuController.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatKefuServiceImpl.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatKefuServiceImpl.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/WechatKefuServiceImpl.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/WechatKefuServiceImpl.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/CardMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/CardMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/CardMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/CardMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/EventMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/EventMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/EventMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/EventMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/FileMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/FileMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/FileMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/FileMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/ImageMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/ImageMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/ImageMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/ImageMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/LinkMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/LinkMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/LinkMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/LinkMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/LocationMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/LocationMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/LocationMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/LocationMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MenuMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MenuMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MenuMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MenuMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MessageItem.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MessageItem.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MessageItem.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MessageItem.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MessageRequest.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MessageRequest.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MessageRequest.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MessageRequest.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MessageResponse.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MessageResponse.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MessageResponse.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MessageResponse.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MiniprogramMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MiniprogramMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/MiniprogramMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/MiniprogramMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/ShopOrderMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/ShopOrderMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/ShopOrderMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/ShopOrderMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/ShopProductMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/ShopProductMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/ShopProductMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/ShopProductMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/TextMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/TextMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/TextMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/TextMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/VideoMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/VideoMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/VideoMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/VideoMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/VoiceMessage.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/VoiceMessage.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/message/VoiceMessage.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/message/VoiceMessage.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/AccessTokenResponse.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/AccessTokenResponse.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/AccessTokenResponse.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/AccessTokenResponse.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/AsyncMessageResponse.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/AsyncMessageResponse.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/AsyncMessageResponse.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/AsyncMessageResponse.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/Response.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/Response.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/Response.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/Response.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/SendMessageResponse.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/SendMessageResponse.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/response/SendMessageResponse.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/response/SendMessageResponse.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/AesException.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/AesException.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/AesException.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/AesException.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/ByteGroup.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/ByteGroup.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/ByteGroup.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/ByteGroup.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/JacksonUtils.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/JacksonUtils.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/JacksonUtils.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/JacksonUtils.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/MessageCrypt.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/MessageCrypt.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/MessageCrypt.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/MessageCrypt.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/PKCS7Encoder.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/PKCS7Encoder.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/PKCS7Encoder.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/PKCS7Encoder.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/SHA1.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/SHA1.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/SHA1.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/SHA1.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/XMLParse.java b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/XMLParse.java similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/java/com/cskefu/wechat/utils/XMLParse.java rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/java/com/cskefu/wechat/utils/XMLParse.java diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/resources/application.properties b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/resources/application.properties similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/resources/application.properties rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/resources/application.properties diff --git a/cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/resources/smart-doc.json b/cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/resources/smart-doc.json similarity index 100% rename from cskefu-backend/cskefu-channel/cskefu-channel-wechat-service/src/main/resources/smart-doc.json rename to cskefu-backend/cskefu-channel/cskefu-channel-service/src/main/resources/smart-doc.json diff --git a/cskefu-backend/cskefu-channel/pom.xml b/cskefu-backend/cskefu-channel/pom.xml index 74c91947..b3cf07ff 100644 --- a/cskefu-backend/cskefu-channel/pom.xml +++ b/cskefu-backend/cskefu-channel/pom.xml @@ -14,7 +14,7 @@ 1.0.0-SNAPSHOT - cskefu-channel-wechat-service + cskefu-channel-service cskefu-channel-wechat-domain \ No newline at end of file diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml deleted file mode 100644 index c05f437c..00000000 --- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - cskefu-web-gateway - 1.0.0-SNAPSHOT - jar - 4.0.0 - cskefu-web-gateway - https://www.cskefu.com/ - - com.cskefu - cskefu-backend - 1.0.0-SNAPSHOT - - - - org.springframework.boot - spring-boot-starter-web - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - org.springframework.boot - spring-boot-starter-validation - - - com.cskefu - cskefu-assistant-mvc - - - - - - com.cskefu - cskefu-backend - 1.0.0-SNAPSHOT - pom - import - - - - - - - com.github.shalousun - smart-doc-maven-plugin - - - org.springframework.boot - spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - - - - \ No newline at end of file diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java deleted file mode 100644 index b503a973..00000000 --- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cskefu; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.net.InetAddress; -import java.net.UnknownHostException; - -@SpringBootApplication -@EnableDiscoveryClient -@RestController -@RefreshScope -public class CskefuWebGatewayApplication { - @Value("${xxx}") - private String xxx; - public static void main(String[] args) { - try { - SpringApplication.run(CskefuWebGatewayApplication.class, args); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @GetMapping({"", "/"}) - public String index() throws UnknownHostException { - InetAddress localHost = InetAddress.getLocalHost(); - return localHost.getHostAddress() + " " + xxx; - } -} diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties deleted file mode 100644 index ac6944b7..00000000 --- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties +++ /dev/null @@ -1,16 +0,0 @@ -debug=true -server.port=8080 -spring.application.name=cskefu-web-gateway - -spring.mvc.static-path-pattern=/smart-doc/** -spring.web.resources.static-locations=classpath:/smart-doc - -spring.cloud.nacos.discovery.server-addr=localhost:8848 - -# sentinel -spring.cloud.sentinel.transport.dashboard=localhost:9850 -spring.cloud.sentinel.transport.port=9851 - -spring.cloud.nacos.config.import-check.enabled=false - -xxx=aaaaaaaaaa \ No newline at end of file diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/bootstrap.properties b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/bootstrap.properties deleted file mode 100644 index eaeaea23..00000000 --- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/bootstrap.properties +++ /dev/null @@ -1,16 +0,0 @@ -nacos.namespace=cskefu -nacos.server-addr=nacos:8848 - -spring.cloud.nacos.discovery.server-addr=${nacos.server-addr} -spring.cloud.nacos.discovery.namespace=${nacos.namespace} - -spring.cloud.nacos.config.server-addr=${nacos.server-addr} -spring.cloud.nacos.config.file-extension=json -spring.cloud.nacos.config.namespace=${nacos.namespace} -spring.cloud.nacos.config.group=${nacos.namespace}-default - -spring.cloud.nacos.config.extension-configs[0].group=${nacos.namespace}-default -spring.cloud.nacos.config.extension-configs[0].data_id=common -spring.cloud.nacos.config.extension-configs[0].refresh=true - -spring.config.import=optional:nacos:${spring.cloud.nacos.config.extension-configs[0].data_id}.${spring.cloud.nacos.config.file-extension},optional:nacos:@spring.application.name@.${spring.cloud.nacos.config.file-extension} diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/smart-doc.json b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/smart-doc.json deleted file mode 100644 index 39d67b5d..00000000 --- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/smart-doc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "serverUrl": "http://localhost:8080", - "pathPrefix": "", - "allInOne": true, - "outPath": "src/main/resources/smart-doc", - "style": "xt256", - "createDebugPage": false, - "revisionLogs": [ - { - "version": "1.0", - "revisionTime": "2023-09-13", - "status": "创建", - "author": "lecjy", - "remarks": "春松客服接口文档" - } - ] -} \ No newline at end of file diff --git a/cskefu-backend/cskefu-gateway/pom.xml b/cskefu-backend/cskefu-gateway/pom.xml deleted file mode 100644 index 1a47a5ac..00000000 --- a/cskefu-backend/cskefu-gateway/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - cskefu-gateway - 1.0.0-SNAPSHOT - pom - 4.0.0 - cskefu-gateway - https://www.cskefu.com/ - - com.cskefu - cskefu-backend - 1.0.0-SNAPSHOT - - - cskefu-web-gateway - - \ No newline at end of file diff --git a/cskefu-backend/pom.xml b/cskefu-backend/pom.xml index b121388d..29237696 100644 --- a/cskefu-backend/pom.xml +++ b/cskefu-backend/pom.xml @@ -23,7 +23,6 @@ cskefu-assistant-module cskefu-auth cskefu-channel - cskefu-gateway cskefu-manager cskefu-plugin cskefu-websocket