update

2024-08-10 14:03:55 +08:00
parent 73d8fca33b
commit 2cea470b9c
8 changed files with 83 additions and 87 deletions
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,13 +0,0 @@
-FROM mysql:8.0.19
-
-MAINTAINER jeecgos@163.com
-
-ENV TZ=Asia/Shanghai
-
-RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-COPY ./tables_nacos.sql /docker-entrypoint-initdb.d
-
-COPY ./jeecgboot-mysql-5.7.sql /docker-entrypoint-initdb.d
-
-COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d
--- a/db/physical-boot-mysql.sql
+++ b/db/physical-boot-mysql.sql
@@ -1,5 +1,5 @@
-CREATE database if NOT EXISTS `jeecg-boot` default character set utf8mb4 collate utf8mb4_unicode_ci;
-USE `jeecg-boot`;
+CREATE database if NOT EXISTS `physical-boot` default character set utf8mb4 collate utf8mb4_unicode_ci;
+USE `physical-boot`;

 /*
 Navicat Premium Data Transfer
@@ -8,7 +8,7 @@ USE `jeecg-boot`;
 Source Server Type    : MySQL
 Source Server Version : 50738
 Source Host           : 127.0.0.1:3306
- Source Schema         : jeecg-boot
+ Source Schema         : physical-boot

 Target Server Type    : MySQL
 Target Server Version : 50738
--- a/db/版本升级说明.md
+++ b/db/版本升级说明.md
@@ -1,15 +0,0 @@
-# 版本升级方法
-
-> JeecgBoot属于平台级产品，每次升级改动较大，目前做不到平滑升级。
-
-### 增量升级方案
-#### 1.代码合并
- 本地通过svn或git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比合并代码；
-
-#### 2.数据库升级
- 从3.6.2+版本增加flyway自动升级数据库机制，支持 mysql5.7、mysql8; 
- 其他库请手工执行SQL, 目录： `jeecg-module-system\jeecg-system-start\src\main\resources\flyway\sql\mysql`
-> 注意： 升级sql只提供mysql版本；如果有权限升级, 还需要手工角色授权，退出重新登录才好使。
-
-#### 3.兼容问题
- 每次发版，会针对不兼容地方重点说明。
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,13 @@
-version: '2'
 services:
-  jeecg-boot-mysql:
-    build:
-      context: ./db
+  physical-mysql:
    environment:
-      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_PASSWORD: 123456
      MYSQL_ROOT_HOST: '%'
      TZ: Asia/Shanghai
+      MYSQL_DATABASE: physical-boot
    restart: always
-    container_name: jeecg-boot-mysql
-    image: jeecg-boot-mysql
+    container_name: physical-mysql
+    image: mysql:8.0
    command:
      --character-set-server=utf8mb4
      --collation-server=utf8mb4_general_ci
@@ -18,28 +16,30 @@ services:
      --max_allowed_packet=128M
      --default-authentication-plugin=caching_sha2_password
    ports:
-      - 3306:3306
+      - 23306:3306
+    volumes:
+      - mysql_data:/var/lib/mysql
+      - ./db/:/docker-entrypoint-initdb.d/
    networks:
-      - jeecg-boot
+      - physical-boot

-  jeecg-boot-redis:
-    image: redis:5.0
+  physical-redis:
+    image: redis:latest
    ports:
-      - 6379:6379
+      - 26379:6379
    restart: always
-    hostname: jeecg-boot-redis
-    container_name: jeecg-boot-redis
+    hostname: physical-redis
+    container_name: physical-redis
    networks:
-      - jeecg-boot
-      -
-  jeecg-boot-minio:
+      - physical-boot
+  physical-minio:
    image: quay.io/minio/minio
    ports:
-      - 9000:9000
-      - 9001:9001
+      - 29000:9000
+      - 29001:9001
    restart: always
-    hostname: jeecg-boot-minio
-    container_name: jeecg-boot-minio
+    hostname: physical-minio
+    container_name: physical-minio
    environment:
      MINIO_ROOT_USER: root
      MINIO_ROOT_PASSWORD: 12345678
@@ -47,27 +47,40 @@ services:
      - minio_data:/data
    command: server /data --console-address ":9001"
    networks:
-      - jeecg-boot
+      - physical-boot

-  jeecg-boot-system:
-    build:
-      context: ./jeecg-module-system/jeecg-system-start
+  physical-launcher:
+#    build:
+#      context: ./physical-launcher
    restart: on-failure
    depends_on:
-      - jeecg-boot-mysql
-      - jeecg-boot-redis
-      - jeecg-boot-minio
-    container_name: jeecg-boot-system
-    image: jeecg-boot-system
-    hostname: jeecg-boot-system
+      - physical-mysql
+      - physical-redis
+      - physical-minio
+    container_name: physical-launcher
+    image: reg.laysan.biz/physical/physical-launcher
+    hostname: physical-launcher
    ports:
-      - 8080:8080
+      - 28080:8080
    networks:
-      - jeecg-boot
+      - physical-boot
+
+  physical-web:
+#    build:
+#      context: ../physical-web
+    container_name: physical-web
+    image: reg.laysan.biz/physical/physical-web
+    depends_on:
+      - physical-launcher
+    networks:
+      - physical-boot
+    ports:
+      - 8005:80

 networks:
-  jeecg-boot:
-    name: jeecg_boot
+  physical-boot:
+    name: physical_boot

 volumes:
  minio_data:
+  mysql_data:
--- a/physical-launcher/Dockerfile
+++ b/physical-launcher/Dockerfile
@@ -1,6 +1,7 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM bellsoft/liberica-openjdk-debian:17

-MAINTAINER jeecgos@163.com
+
+MAINTAINER lslvxy@163.com

 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

@@ -11,6 +12,6 @@ WORKDIR /jeecg-boot
 EXPOSE 8080

 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-system-start-3.7.0.jar ./
+ADD ./target/physical-launcher-3.7.0.jar ./

-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.7.0.jar
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=prod
--- a/physical-launcher/build.sh
+++ b/physical-launcher/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+mvn -s ~/.m2/settings-personal.xml clean install
+docker build -t reg.laysan.biz/physical/physical-launcher .
+#docker login reg.laysan.biz
+docker push reg.laysan.biz/physical/physical-launcher
--- a/physical-launcher/src/main/resources/application-dev.yml
+++ b/physical-launcher/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@ server:
    include-stacktrace: ALWAYS
    include-message: ALWAYS
  servlet:
-    context-path: /jeecg-boot
+    context-path: /physical
  compression:
    enabled: true
    min-response-size: 1024
--- a/physical-launcher/src/main/resources/application-prod.yml
+++ b/physical-launcher/src/main/resources/application-prod.yml
@@ -12,7 +12,7 @@ server:
    include-stacktrace: ALWAYS
    include-message: ALWAYS
  servlet:
-    context-path: /jeecg-boot
+    context-path: /physical
  compression:
    enabled: true
    min-response-size: 1024
@@ -124,7 +124,7 @@ spring:
    static-locations: classpath:/static/,classpath:/public/
  autoconfigure:
    exclude:
-      - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+      - com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure
      - org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration
  datasource:
    druid:
@@ -166,7 +166,7 @@ spring:
          slow-sql-millis: 5000
      datasource:
        master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://physical-mysql:3306/physical-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
          username: root
          password: 123456
          driver-class-name: com.mysql.cj.jdbc.Driver
@@ -177,11 +177,15 @@ spring:
          #password: root
          #driver-class-name: com.mysql.cj.jdbc.Driver
  #redis 配置
-  redis:
-    database: 0
-    host: 127.0.0.1
-    port: 6379
-    password: ''
+  data:
+    redis:
+      host: physical-redis
+      password: ''
+      port: 6379
+      database: 0
+
+  main:
+    allow-bean-definition-overriding=true:
 #mybatis plus 设置
 mybatis-plus:
  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
@@ -213,7 +217,7 @@ jeecg:
  #签名拦截接口
  signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
  # local\minio\alioss
-  uploadType: alioss
+  uploadType: minio
  # 前端访问地址
  domainUrl:
    pc: http://localhost:3100
@@ -241,10 +245,10 @@ jeecg:
  file-view-domain: http://fileview.jeecg.com
  # minio文件上传
  minio:
-    minio_url: http://minio.jeecg.com
-    minio_name: ??
-    minio_pass: ??
-    bucketName: otatest
+    minio_url: http://physical-oss:9000
+    minio_name: root
+    minio_pass: 12345678
+    bucketName: physical
  #大屏报表参数设置
  jmreport:
    #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
@@ -268,7 +272,7 @@ jeecg:
    logRetentionDays: 30
  #分布式锁配置
  redisson:
-    address: 127.0.0.1:6379
+    address: physical-redis:6379
    password:
    type: STANDALONE
    enabled: true
@@ -285,9 +289,9 @@ knife4j:
  #开启增强配置
  enable: true
  #开启生产环境屏蔽
-  production: true
+  production: false
  basic:
-    enable: true
+    enable: false
    username: jeecg
    password: jeecg1314
 #第三方登录