1201

.drone.yml

@@ -25,7 +25,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         from_secret: ssh_user # 远程连接账号
       password:
         from_secret: ssh_password # 从Secret中读取SSH密码
-      port: 22 # 远程连接端口
+      port: 7222 # 远程连接端口
       command_timeout: 5m # 远程执行命令超时时间
       script:
         - cd /home/build/ezhizao_dms_production # 进入宿主机构建目录

Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /home/files
 ADD ./jar/ezhizao_dms_production.jar /jar
 
 # 声明服务运行的端口
-EXPOSE 8062
+EXPOSE 7003
 
 #  启动系统服务
 ENTRYPOINT ["java","-Xms128m","-Xmx256m","-Xmn64m","-Xss1024k","-jar","/jar/ezhizao_dms_production.jar"]

run.sh

@@ -8,7 +8,7 @@ volume_name='ezhizao_dms_production'
 # 定义应用版本
 app_version='1.0-SNAPSHOT'
 # 定义后端端口
-app_port=8062
+app_port=7003
 # 定义应用环境
 profile_active='linux'
 echo '----copy jar----'

src/main/java/cn/ezhizao/project/business/domain/BizEquipmentDetail.java

@@ -51,6 +51,7 @@ public class BizEquipmentDetail extends BaseEntity
     @ApiModelProperty(value = "报废日期")
     private Date scrappingDate;
 
+
     /** 设备状态id（对应数据字典id） */
     @ApiModelProperty(value = "报废日期")
     private Long equipmentStatusId;

src/main/resources/application-linux.yml

@@ -1,4 +1,7 @@
 # 数据源配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 7002
 spring:
     cloud:
         nacos:
@@ -7,11 +10,11 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 120.46.159.163
+        host: 192.168.10.40
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 11
+        database: 1
         # 密码
         password: ezhizao.cn123456
         # 连接超时时间
@@ -33,14 +36,14 @@ spring:
             # 主库数据源
             master:
                 driverClassName: com.mysql.cj.jdbc.Driver
-                url: jdbc:mysql://120.46.159.163:3306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.10.40:3306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
                 username: root
                 password: ezhizao.cn123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: true
-                url: jdbc:sqlserver://localhost:1433;DatabaseName=p240_dianzi_xz
+                url: jdbc:sqlserver://192.168.10.40:1433;DatabaseName=p240_dianzi_xz
                 username: sa
                 password: sa12345678
             # 初始连接数