9 Commits 7195059c55 ... ada9edd7f8

Autor SHA1 Mensagem Data
  Ruilin Zeng ada9edd7f8 更新llm proxy地址 7 meses atrás
  Ruilin Zeng 58025fe65c debug drone 7 meses atrás
  Ruilin Zeng d470a6309d debug drone 7 meses atrás
  Ruilin Zeng c3425bc669 debug drone 7 meses atrás
  Ruilin Zeng 33478ac0a2 debug drone 7 meses atrás
  Ruilin Zeng b5f7014ae4 debug drone 7 meses atrás
  Ruilin Zeng 119e14004e debug drone 7 meses atrás
  Ruilin Zeng cae00e4de3 debug drone 7 meses atrás
  Ruilin Zeng c0f1b18d6d debug drone 7 meses atrás

+ 45 - 0
.drone.yml

@@ -0,0 +1,45 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: prod_build
+    image: backend-build:latest
+    pull: if-not-exists
+    commands:
+      - mvn -Dmaven.test.skip=true package
+    when:
+      branch:
+        - main
+  - name: prod_push
+    image: appleboy/drone-scp:1.8.0
+    settings:
+      host: 120.48.139.113
+      username: root
+      password:
+        from_secret: ssh_password
+      port: 22
+      command_timeout: 30m
+      target: /opt/salesmap/backend/
+      source: salesHelper-admin-assistant/target/salesHelper-admin-assistant.jar
+      strip_components: 2
+      overwrite: true
+    when:
+      branch:
+        - main
+  - name: prod_restart
+    image: appleboy/drone-ssh:1.8.0
+    settings:
+      host: 120.48.139.113
+      username: root
+      password:
+        from_secret: ssh_password
+      port: 22
+      command_timeout: 2m
+      script:
+        - podman stop salesmap-backend
+        - mv /opt/salesmap/backend/salesHelper-admin-assistant.jar /opt/salesmap/backend/app/
+        - podman start salesmap-backend
+    when:
+      branch:
+        - main

+ 7 - 7
salesHelper-admin-assistant/src/main/resources/application-pro.yml → salesHelper-admin-assistant/src/main/resources/application-prod.yml

@@ -62,9 +62,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mariadb://192.168.32.3:16001/sales_helper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
+        url: jdbc:mariadb://10.88.0.1:10006/sales_map?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
         username: root
-        password: jinyan-mysql
+        password: XlY0yFb0qUrAW6Hl6L3UTEI6
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -134,13 +134,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.32.3
+    host: 10.88.0.1
     # 端口,默认为6379
-    port: 16006
+    port: 10007
     # 数据库索引
     database: 1
     # 密码
-    password: jinyan-redis
+    password: 
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -223,8 +223,8 @@ feign:
         readTimeout: 300000
   url:
     salesHelper-remote-spider: http://192.168.32.3:19000 # 爬虫服务
-    salesmap-LLM: http://192.168.32.2:13003 #大模型
-    chat_base_url: http://192.168.32.2:13003 #对话相关接口
+    salesmap-LLM: http://10.88.0.1:13003 #大模型
+    chat_base_url: http://10.88.0.1:13003 #对话相关接口
 # 滑块验证码
 aj:
   captcha: