Browse Source

修改配置文件

rainwer 6 months ago
parent
commit
39fb06fc69
4 changed files with 78 additions and 26 deletions
  1. 44 0
      .old.drone.yml
  2. 4 4
      Dockerfile
  3. 5 5
      run.sh
  4. 25 17
      src/main/resources/application-dev.yml

+ 44 - 0
.old.drone.yml

@@ -0,0 +1,44 @@
+kind: pipeline # 定义对象类型,还有secret和signature两种类型
+type: docker # 定义流水线类型,还有kubernetes、exec、ssh等类型
+name: ezhizao_yzbh_crm_api # 定义流水线名称
+
+steps: # 定义流水线执行步骤,这些步骤将顺序执行
+  - name: package # 流水线名称
+    image: maven:3-jdk-8 # 定义创建容器的Docker镜像
+    volumes: # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
+      - name: maven-cache
+        path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
+      - name: maven-build
+        path: /home/old_server/build # 将应用打包好的Jar和执行脚本挂载出来
+    commands: # 定义在Docker容器中执行的shell命令
+      - mvn clean package # 应用打包命令
+      - mkdir -p /home/old_server/build/ezhizao_yzbh_crm/jar/
+      - cp target/ezhizao_yzbh_crm.jar /home/old_server/build/ezhizao_yzbh_crm/jar/ezhizao_yzbh_crm.jar
+      - cp Dockerfile /home/old_server/build/ezhizao_yzbh_crm/Dockerfile
+      - cp run.sh /home/old_server/build/ezhizao_yzbh_crm/run.sh
+
+  - name: build-start
+    image: appleboy/drone-ssh:1.7.7 # SSH工具镜像
+    settings:
+      host: 120.46.59.90 # 远程连接地址
+      username:
+        from_secret: ssh_user # 远程连接账号
+      password:
+        from_secret: ssh_password # 从Secret中读取SSH密码
+      port: 22 # 远程连接端口
+      command_timeout: 5m # 远程执行命令超时时间
+      script:
+        - cd /home/old_server/build/ezhizao_yzbh_crm # 进入宿主机构建目录
+        - chmod +x run.sh # 更改为可执行脚本
+        - ./run.sh # 运行脚本打包应用镜像并运行
+volumes: # 定义流水线挂载目录,用于共享数据
+  - name: maven-build
+    host:
+      path: /home/old_server/build  # 从宿主机中挂载的目录
+  - name: maven-cache
+    host:
+      path: /home/old_server/cache
+
+trigger:
+  branch:
+    - master-old

+ 4 - 4
Dockerfile

@@ -2,18 +2,18 @@
 FROM swr.cn-north-4.myhuaweicloud.com/cloud-zhanglingyang/ibm-semeru-runtimes:open-8-jre
 
 # 创建挂载目录
-RUN mkdir -p /jar
+RUN mkdir -p /home/old_server/jar
 
 # 创建文件挂载目录
-RUN mkdir -p /home/files
+RUN mkdir -p /home/old_server/files
 
 # 把Jar包拷贝进容器
-ADD ./jar/ezhizao_yzbh_crm.jar /jar
+ADD ./jar/ezhizao_yzbh_crm.jar /home/old_server/jar
 
 # 声明服务运行的端口
 EXPOSE 8041
 
 #  启动系统服务
-ENTRYPOINT ["java","-Xms512m","-Xmx512m","-Xmn64m","-Xss1024k","-jar","/jar/ezhizao_yzbh_crm.jar"]
+ENTRYPOINT ["java","-Xms512m","-Xmx512m","-Xmn64m","-Xss1024k","-jar","/home/old_server/jar/ezhizao_yzbh_crm.jar"]
 
 

+ 5 - 5
run.sh

@@ -2,15 +2,15 @@
 # 定义应用组名
 group_name='ezhizao'
 # 定义应用名称
-app_name='ezhizao_yzbh_crm_api'
+app_name='old_ezhizao_yzbh_crm_api'
 # 定义挂载目录名称
 volume_name='ezhizao_yzbh_crm'
 # 定义应用版本
 app_version='1.0-SNAPSHOT'
 # 定义后端端口
-app_port=8041
+app_port=9041
 # 定义应用环境
-profile_active='linux'
+profile_active='dev'
 
 # 删除镜像
 # docker rmi ${group_name}/${app_name}:${app_version}
@@ -37,8 +37,8 @@ echo '----rm container----'
 docker run -p ${app_port}:${app_port} --name ${app_name} --network yzbh_network \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
--v /home/build/${volume_name}/logs:/home/ruoyi/logs \
--v /home/files:/home/files \
+-v /home/old_server/build/${volume_name}/logs:/home/ruoyi/logs \
+-v /home/old_server/files:/home/files \
 --restart=always \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'

+ 25 - 17
src/main/resources/application-dev.yml

@@ -1,21 +1,29 @@
+# 开发环境配置
+server:
+    # 服务器的HTTP端口,默认为8080
+    port: 9041
 # 数据源配置
 spring:
     cloud:
         nacos:
             discovery:
-                server-addr: 82.156.209.15:8848 # Nacos服务器地址
+                server-addr: 120.46.59.90:8849
+                username: nacos
+                password: nacos
+            config:
+                enabled: true
     application:
         name: ezhizao-yzbh-crm
     # redis 配置
     redis:
         # 地址
-        host: 62.234.54.84
+        host: 120.46.59.90
         # 端口,默认为6379
         port: 16379
         # 数据库索引
-        database: 8
+        database: 10
         # 密码
-        password: yuchang@2023
+        password: ezhizao.cn123456
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -34,19 +42,19 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://82.156.209.15:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=60000
-                username: admin
-                password: ~44rC%0J
-#                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: 123456
+                url: jdbc:mysql://120.46.59.90:3306/ezhizao_yzbh_v2_zhengshi2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=360000&socketTimeout=360000
+                username: root
+                password: ezhizao.cn123456
+            #                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2_zhengshi2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+            #                username: root
+            #                password: 123456
             # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: true
-#                url: jdbc:mysql://116.204.99.126:3306/snms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
-#                username: idis_user
-#                password: Teleinfo-88
+            #            slave:
+            #                # 从数据源开关/默认关闭
+            #                enabled: true
+            #                url: jdbc:mysql://116.204.99.126:3306/snms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+            #                username: idis_user
+            #                password: Teleinfo-88
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -89,4 +97,4 @@ spring:
             socket-timeout: 3600000
 # 文件上传
 ruoyi:
-    profile: /home/ruoyi/yzbh/
+    profile: /home/ruoyi/yzbh