Skip to content

yangxiujun / paidan_demo

Go to a project
Commit fbe7ac3b by chamberone
Options

fix: 构建错误，去掉示例模块

1 parent 7865e3f9
Inline Side-by-side
Showing with 113 additions and 164 deletions
config-init/config/datasource-config.yaml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: org.postgresql.Driver
username: 'root' username: 'postgres'
password: 'root' password: 'postgres'
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
......
config-init/config/project-gis.yaml
spring: spring:
datasource: datasource:
url: jdbc:mysql://project-mysql:3306/project?useSSL=false&characterEncoding=utf8 url: jdbc:postgresql://project-pg:8432/project
\ No newline at end of file \ No newline at end of file
config-init/config/project-order.yaml
spring: spring:
datasource: datasource:
url: jdbc:mysql://project-mysql:3306/project_order?useSSL=false&characterEncoding=utf8 url: jdbc:postgresql://project-pg:8432/project
\ No newline at end of file \ No newline at end of file
config-init/config/project-user.yaml
spring: spring:
datasource: datasource:
url: jdbc:mysql://project-mysql:3306/project?useSSL=false&characterEncoding=utf8 url: jdbc:postgresql://project-pg:8432/project
\ No newline at end of file \ No newline at end of file
config-init/scripts/nacos-config-quick.sh
...@@ -12,12 +12,12 @@ userConfig=$(cat ../config/project-user.yaml) ...@@ -12,12 +12,12 @@ userConfig=$(cat ../config/project-user.yaml)
gisConfig=$(cat ../config/project-gis.yaml) gisConfig=$(cat ../config/project-gis.yaml)
groupId="project" groupId="project"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=datasource-config.yaml&group=${groupId}&content=${datasourceConfig}" curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=datasource-config.yaml&group=${groupId}&content=${datasourceConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-storage.yaml&group=${groupId}&content=${storageConfig}" #curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-storage.yaml&group=${groupId}&content=${storageConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-account.yaml&group=${groupId}&content=${accountConfig}" #curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-account.yaml&group=${groupId}&content=${accountConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-order.yaml&group=${groupId}&content=${orderConfig}" curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-order.yaml&group=${groupId}&content=${orderConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-gateway.yaml&group=${groupId}&content=${gatewayConfig}" curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-gateway.yaml&group=${groupId}&content=${gatewayConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-provider.yaml&group=${groupId}&content=${providerConfig}" #curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-provider.yaml&group=${groupId}&content=${providerConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-consumer.yaml&group=${groupId}&content=${consumerConfig}" #curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-consumer.yaml&group=${groupId}&content=${consumerConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-user.yaml&group=${groupId}&content=${userConfig}" curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-user.yaml&group=${groupId}&content=${userConfig}"
curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-gis.yaml&group=${groupId}&content=${gisConfig}" curl -X POST "nacos-server:8848/nacos/v1/cs/configs" -d "dataId=project-gis.yaml&group=${groupId}&content=${gisConfig}"
echo "Nacos config pushed successfully finished" echo "Nacos config pushed successfully finished"
\ No newline at end of file
config-init/sql/init.sql
...@@ -340,6 +340,23 @@ USE `saas_aftersale_test`; ...@@ -340,6 +340,23 @@ USE `saas_aftersale_test`;
/*Table structure for table `district` */ /*Table structure for table `district` */
/* 临时兼容order表，后期去掉 */
DROP TABLE IF EXISTS `order`;
CREATE TABLE `order`
(
`id` bigint(11) unsigned NOT NULL AUTO_INCREMENT,
`user_id` varchar(255) DEFAULT NULL,
`commodity_code` varchar(255) DEFAULT NULL,
`count` int(11) DEFAULT NULL,
`money` int(11) DEFAULT '0',
`create_time` datetime DEFAULT NULL,
`update_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE = InnoDB
AUTO_INCREMENT = 16
DEFAULT CHARSET = utf8;
DROP TABLE IF EXISTS `district`; DROP TABLE IF EXISTS `district`;
CREATE TABLE `district` ( CREATE TABLE `district` (
......
docker-compose/docker-compose.yml
...@@ -14,6 +14,7 @@ services: ...@@ -14,6 +14,7 @@ services:
- MODE=standalone - MODE=standalone
ports: ports:
- "8848:8848" - "8848:8848"
# nacos config-init # nacos config-init
nacos-setup: nacos-setup:
image: radial/busyboxplus:curl image: radial/busyboxplus:curl
...@@ -25,68 +26,57 @@ services: ...@@ -25,68 +26,57 @@ services:
entrypoint: [ "./nacos-config-quick.sh"] entrypoint: [ "./nacos-config-quick.sh"]
depends_on: depends_on:
- nacos - nacos
- mysql - postgres
- seata-server - project-user
# mysql
mysql:
container_name: project-mysql
hostname: project-mysql
restart: always
image: mysql:5.7
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: project_storage
ports:
- "3306:3306"
volumes:
- ../config-init/sql/init.sql:/docker-entrypoint-initdb.d/init.sql
command:
[
--character-set-server=utf8mb4,
--collation-server=utf8mb4_unicode_ci
]
# postgres # postgres
postgres: postgres:
image: postgres:14.1-alpine image: bitnami/postgresql:15.2.0
hostname: project-pg hostname: project-pg
restart: always restart: always
container_name: project-pg
environment: environment:
- POSTGRES_USER=postgres # - POSTGRESQL_USERNAME=postgres
- POSTGRES_PASSWORD=postgres - POSTGRESQL_PASSWORD=postgres
ports: ports:
- '5432:5432' # 5432端口在win机器上会报错
- "8432:5432"
volumes: volumes:
- ../config-init/sql/init.sql:/docker-entrypoint-initdb.d/create_tables.sql - ../config-init/sql/init.sql:/docker-entrypoint-initdb.d/create_tables.sql
# rocketMQ # postgres web console
rmqnamesrv: pgadmin:
image: apache/rocketmq:4.9.4 container_name: project-pgadmin
hostname: rocketmq image: dpage/pgadmin4
restart: always environment:
container_name: project-rmqnamesrv POSTGRES_PASSWORD: postgres
PGADMIN_DEFAULT_EMAIL: pgadmin4@pgadmin.org
PGADMIN_DEFAULT_PASSWORD: admin
PGADMIN_CONFIG_SERVER_MODE: 'False'
ports: ports:
- "9876:9876" - "8050:80"
command: sh mqnamesrv depends_on:
- postgres
rmqbroker: # kafka
image: apache/rocketmq:4.9.4 zookeeper:
restart: always image: wurstmeister/zookeeper
container_name: project-rmqbroker
ports: ports:
- "10909:10909" - "2181:2181"
- "10911:10911" hostname: zookeeper
volumes: kafka:
- ../config-init/rocketmq/broker.conf:/opt/rocketmq-4.9.4/conf/broker.conf image: wurstmeister/kafka
command: [start-kafka.sh]
ports:
- "9092:9092"
hostname: kafka
environment: environment:
NAMESRV_ADDR: "rmqnamesrv:9876" # KAFKA_CREATE_TOPICS: "UploadFile:1:1,GetFile:1:1,TrackUpload:1:1,GetEmailContent:1:1" # topic:partition:replicas
JAVA_OPTS: " -Duser.home=/opt" KAFKA_ADVERTISED_HOST_NAME: kafka # docker-machine ip
JAVA_OPT_EXT: "-server -Xms128m -Xmx128m -Xmn128m" KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
command: sh mqbroker -c /opt/rocketmq-4.9.4/conf/broker.conf KAFKA_ADVERTISED_PORT: 9092
depends_on: depends_on:
- rmqnamesrv - zookeeper
# seata # seata
seata-server: seata-server:
...@@ -126,21 +116,6 @@ services: ...@@ -126,21 +116,6 @@ services:
depends_on: depends_on:
- nacos - nacos
project-account:
image: project-account
restart: always
build:
dockerfile: ./project-account/Dockerfile
context: ../
env_file:
- .env
container_name: project-account
ports:
- ${ACCOUNT_PORT}:${ACCOUNT_PORT}
depends_on:
- nacos
- mysql
project-order: project-order:
image: project-order image: project-order
restart: always restart: always
...@@ -154,71 +129,7 @@ services: ...@@ -154,71 +129,7 @@ services:
- ${ORDER_PORT}:${ORDER_PORT} - ${ORDER_PORT}:${ORDER_PORT}
depends_on: depends_on:
- nacos - nacos
- mysql - postgres
project-storage:
image: project-storage
restart: always
build:
dockerfile: ./project-storage/Dockerfile
context: ../
env_file:
- .env
container_name: project-storage
ports:
- ${STORAGE_PORT}:${STORAGE_PORT}
depends_on:
- nacos
- mysql
project-praise-provider:
image: project-praise-provider
restart: always
build:
dockerfile: ./project-praise-provider/Dockerfile
context: ../
env_file:
- .env
container_name: project-praise-provider
ports:
- ${PRAISE_PROVIDER_PORT}:${PRAISE_PROVIDER_PORT}
depends_on:
- nacos
project-praise-consumer:
image: project-praise-consumer
restart: always
build:
dockerfile: ./project-praise-consumer/Dockerfile
context: ../
env_file:
- .env
container_name: project-praise-consumer
ports:
- ${PRAISE_CONSUMER_PORT}:${PRAISE_CONSUMER_PORT}
depends_on:
- nacos
- project-praise-provider
project-frontend:
image: project-frontend
hostname: project-frontend
restart: always
build:
dockerfile: ./project-frontend/Dockerfile
context: ../
env_file:
- .env
container_name: project-frontend
ports:
- ${FRONTEND_PORT}:${FRONTEND_PORT}
depends_on:
- project-gateway
- project-account
- project-order
- project-storage
- project-praise-consumer
- project-praise-provider
# user module # user module
...@@ -235,7 +146,7 @@ services: ...@@ -235,7 +146,7 @@ services:
- ${USER_PORT}:${USER_PORT} - ${USER_PORT}:${USER_PORT}
depends_on: depends_on:
- nacos - nacos
- mysql - postgres
# gis module # gis module
...@@ -252,7 +163,6 @@ services: ...@@ -252,7 +163,6 @@ services:
- ${GIS_PORT}:${GIS_PORT} - ${GIS_PORT}:${GIS_PORT}
depends_on: depends_on:
- nacos - nacos
- mysql
- postgres - postgres
- project-geometry - project-geometry
......
pom.xml
...@@ -44,15 +44,17 @@ ...@@ -44,15 +44,17 @@
</properties> </properties>
<modules> <modules>
<!--
<module>project-storage</module> <module>project-storage</module>
<module>project-account</module> <module>project-account</module>
<module>project-order</module>
<module>project-gateway</module>
<module>project-praise-provider</module> <module>project-praise-provider</module>
<module>project-praise-consumer</module> <module>project-praise-consumer</module>
<module>project-common</module> <module>project-common</module>
<module>project-frontend</module> <module>project-frontend</module> -->
<module>project-order</module>
<module>project-gateway</module>
<module>project-interface</module> <module>project-interface</module>
<module>project-user</module> <module>project-user</module>
<module>project-gis</module> <module>project-gis</module>
......
project-district/Dockerfile
FROM registry.cn-hangzhou.aliyuncs.com/dituhui/smo:j11-s9.1.0 FROM registry.cn-hangzhou.aliyuncs.com/dituhui/smo:j11-s9.1.0
COPY ./target/project-district-*.jar /app.jar COPY ./project-district/target/project-district-*.jar /app.jar
EXPOSE 8003 EXPOSE 8003
......
project-geometry/Dockerfile
FROM registry.cn-hangzhou.aliyuncs.com/dituhui/smo:j11-s9.1.0 FROM registry.cn-hangzhou.aliyuncs.com/dituhui/smo:j11-s9.1.0
COPY ./target/project-geometry-*.jar /app.jar COPY ./project-geometry/target/project-geometry-*.jar /app.jar
EXPOSE 8002 EXPOSE 8002
......
project-gis/Dockerfile
FROM registry.cn-hangzhou.aliyuncs.com/dituhui/smo:j11-s9.1.0 FROM registry.cn-hangzhou.aliyuncs.com/dituhui/smo:j11-s9.1.0
COPY ./target/project-gis-*.jar /app.jar COPY ./project-gis/target/project-gis-*.jar /app.jar
RUN sh -c 'touch /app.jar' RUN sh -c 'touch /app.jar'
EXPOSE 8001 EXPOSE 8001
......
project-interface/pom.xml
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies> </dependencies>
......
project-order/pom.xml
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<name>Spring Cloud Alibaba Order</name> <name>Spring Cloud Alibaba Order</name>
<properties> <properties>
<mysql.version>8.0.28</mysql.version>
<druid.version>1.1.10</druid.version> <druid.version>1.1.10</druid.version>
<mybatis.version>2.1.2</mybatis.version> <mybatis.version>2.1.2</mybatis.version>
</properties> </properties>
...@@ -29,11 +28,6 @@ ...@@ -29,11 +28,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
......
project-user/pom.xml
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<name>Spring Cloud Alibaba User</name> <name>Spring Cloud Alibaba User</name>
<properties> <properties>
<mysql.version>8.0.28</mysql.version>
<druid.version>1.1.10</druid.version> <druid.version>1.1.10</druid.version>
</properties> </properties>
...@@ -27,11 +26,6 @@ ...@@ -27,11 +26,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -74,7 +68,7 @@ ...@@ -74,7 +68,7 @@
<artifactId>project-interface</artifactId> <artifactId>project-interface</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
...@@ -98,6 +92,12 @@ ...@@ -98,6 +92,12 @@
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId> <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
<version>2.2.5.RELEASE</version> <version>2.2.5.RELEASE</version>
</dependency> </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies> </dependencies>
......
project-user/src/main/resources/application.yaml
...@@ -15,11 +15,32 @@ spring: ...@@ -15,11 +15,32 @@ spring:
file-extension: yaml file-extension: yaml
config: config:
import: import:
- optional:nacos:project-user.yaml - optional:nacos:project-user.yaml?group=project&refreshEnabled=true
- optional:nacos:datasource-config.yaml - optional:nacos:datasource-config.yaml?group=project&refreshEnabled=true
- optional:nacos:redis-config.yaml - optional:nacos:redis-config.yaml?group=project&refreshEnabled=true
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource:
url: jdbc:postgresql://project-pg:8432/project
driver-class-name: org.postgresql.Driver
username: 'postgres'
password: 'postgres'
redis:
database: 0
host: redis
port: 6379
password: 123456
jedis:
pool:
max-active: 32
min-idle: 0
max-idle: 8
max-wait: -1
kafka:
bootstrap-servers: http://kafka:9092
consumer:
group-id: mpGroup
seata: seata:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!