yexianchao il y a 2 mois
Parent
commit
766a497738
45 fichiers modifiés avec 77 ajouts et 79 suppressions
  1. 2 2
      crm-activity/src/main/resources/application-dev.yml
  2. 1 1
      crm-activity/src/main/resources/application-ho.yml
  3. 1 1
      crm-activity/src/main/resources/application-hu.yml
  4. 3 3
      crm-activity/src/main/resources/application-prod.yml
  5. 2 2
      crm-activity/src/main/resources/application-test.yml
  6. 1 1
      crm-activity/src/main/resources/application.yml
  7. 1 1
      crm-custom/src/main/java/com/crm/custom/service/FinanceTrainFeignService.java
  8. 1 1
      crm-custom/src/main/java/com/crm/custom/service/WebVideoFeignService.java
  9. 1 1
      crm-custom/src/main/resources/application-dev.yml
  10. 1 1
      crm-custom/src/main/resources/application-prod.yml
  11. 1 1
      crm-custom/src/main/resources/application-test.yml
  12. 2 2
      crm-custom/src/main/resources/application.yml
  13. 2 2
      crm-email-markets/src/main/resources/application-dev.yml
  14. 3 3
      crm-email-markets/src/main/resources/application-prod.yml
  15. 2 2
      crm-email-markets/src/main/resources/application-test.yml
  16. 6 6
      crm-gateway/src/main/resources/application-prod.yml
  17. 4 4
      crm-gateway/src/main/resources/application.yml
  18. 2 2
      crm-ib-task/src/main/resources/application-dev.yml
  19. 2 2
      crm-ib-task/src/main/resources/application-hu.yml
  20. 3 3
      crm-ib-task/src/main/resources/application-prod.yml
  21. 2 2
      crm-ib-task/src/main/resources/application-test.yml
  22. 1 1
      crm-ib-task/src/main/resources/application.yml
  23. 1 1
      crm-manager/src/main/java/com/crm/manager/service/AccountApplyPasswordResetFeignService.java
  24. 1 1
      crm-manager/src/main/java/com/crm/manager/service/CustomFileFeignService.java
  25. 1 1
      crm-manager/src/main/java/com/crm/manager/service/CustomFundHistoryFeignService.java
  26. 1 1
      crm-manager/src/main/java/com/crm/manager/service/CustomInfoFeignService.java
  27. 1 1
      crm-manager/src/main/java/com/crm/manager/service/CustomLoginFeignService.java
  28. 1 1
      crm-manager/src/main/java/com/crm/manager/service/FinanceCustomFeignService.java
  29. 1 1
      crm-manager/src/main/java/com/crm/manager/service/FinanceDepositFeignService.java
  30. 1 1
      crm-manager/src/main/java/com/crm/manager/service/FinanceTrainFeignService.java
  31. 1 1
      crm-manager/src/main/java/com/crm/manager/service/FinanceTransferFeignService.java
  32. 1 1
      crm-manager/src/main/java/com/crm/manager/service/FinanceWithdrawFeignService.java
  33. 1 1
      crm-manager/src/main/java/com/crm/manager/service/SysRemitChannelFeignService.java
  34. 1 1
      crm-manager/src/main/java/com/crm/manager/service/SysRemittanceChannelFeignService.java
  35. 1 1
      crm-manager/src/main/java/com/crm/manager/service/WebVideoFeignService.java
  36. 0 2
      crm-manager/src/main/resources/application-test.yml
  37. 2 2
      crm-manager/src/main/resources/application.yml
  38. 3 3
      crm-pay/src/main/resources/application.yml
  39. 2 2
      crm-to-globex/src/main/resources/application-dev.yml
  40. 3 3
      crm-to-globex/src/main/resources/application-prod.yml
  41. 2 2
      crm-to-globex/src/main/resources/application-test.yml
  42. 2 2
      crm-web/src/main/resources/application-dev.yml
  43. 3 3
      crm-web/src/main/resources/application-prod.yml
  44. 2 2
      crm-web/src/main/resources/application-test.yml
  45. 1 1
      crm-web/src/main/resources/application.yml

+ 2 - 2
crm-activity/src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.210.194.53:13542/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://103.158.191.66:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
 eureka:
   client:
     serviceUrl:

+ 1 - 1
crm-activity/src/main/resources/application-ho.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172.16.0.6:3306/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://172.16.0.6:3306/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
     password: 123123
   jpa:

+ 1 - 1
crm-activity/src/main/resources/application-hu.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.210.194.53:13542/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://8.210.194.53:13542/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
     password: F28c49d8be
 eureka:

+ 3 - 3
crm-activity/src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:18234/cwg_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
-    username: ib_task_user
-    password: 48fca8d6325e93e9377e483667374d72
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    username: root
+    password: NSH01Y0GTmUNjgg6xw80qg==
   activemq:
     broker-url: tcp://localhost:61616
   redis:

+ 2 - 2
crm-activity/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.209.114.51:13542/cwg_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 1 - 1
crm-activity/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 9200
 spring:
   profiles:
-    active: hu
+    active: dev
   application:
     name: ACTIVITY-SERVICE
 mybatis:

+ 1 - 1
crm-custom/src/main/java/com/crm/custom/service/FinanceTrainFeignService.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 /**
  * Created by max on 2020/5/20.
  */
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/finance/train/custom")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/finance/train/custom")
 public interface FinanceTrainFeignService {
     @PostMapping("/validate/login")
     BaseResultDto<Boolean> validateLogin(CustomLoginCheckByLoginEntity entity) throws Exception;

+ 1 - 1
crm-custom/src/main/java/com/crm/custom/service/WebVideoFeignService.java

@@ -9,7 +9,7 @@ import com.crm.rely.backend.model.entity.web.video.WebVideoSearchListEntity;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-@FeignClient(name = "TRADE-WEB-SERVICE", path = "/web/video/custom")
+@FeignClient(name = "GOLDEN-WEB-SERVICE", path = "/web/video/custom")
 public interface WebVideoFeignService {
 
     /**

+ 1 - 1
crm-custom/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://103.158.191.66:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: NSH01Y0GTmUNjgg6xw80qg
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 1 - 1
crm-custom/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: NSH01Y0GTmUNjgg6xw80qg
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 1 - 1
crm-custom/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: NSH01Y0GTmUNjgg6xw80qg
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 2 - 2
crm-custom/src/main/resources/application.yml

@@ -1,10 +1,10 @@
 server:
-  port: 8000
+  port: 8005
 spring:
   profiles:
     active: dev
   application:
-    name: TRADE-CUSTOM-SERVICE
+    name: GOLDEN-CUSTOM-SERVICE
 
 mybatis:
   type-aliases-package: com.crm.rely.backend.core.pojo.table.view

+ 2 - 2
crm-email-markets/src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ spring:
     encoding: UTF-8
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172。16。0。6:3306/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://103.158.191.66:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123123
+    password: NSH01Y0GTmUNjgg6xw80qg==
     jpa:
       database: MYSQL
       hibernate:

+ 3 - 3
crm-email-markets/src/main/resources/application-prod.yml

@@ -6,9 +6,9 @@ spring:
     encoding: UTF-8
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:13542/cwg_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
-    username: email_user
-    password: 1a4fa66055a75e7eabf2469c1ad05ba8
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    username: root
+    password: NSH01Y0GTmUNjgg6xw80qg==
     jpa:
       database: MYSQL
       hibernate:

+ 2 - 2
crm-email-markets/src/main/resources/application-test.yml

@@ -6,9 +6,9 @@ spring:
     encoding: UTF-8
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.210.194.53:13542/cwg_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://8.210.194.53:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
     jpa:
       database: MYSQL
       hibernate:

+ 6 - 6
crm-gateway/src/main/resources/application-prod.yml

@@ -6,10 +6,10 @@ eureka:
     service-url:
       defaultZone: http://admin:admin123456@localhost:7000/eureka
   server:
-    enable-self-preservation: false #是否开启自我保护模式
-    eviction-interval-timer-in-ms: 60000 #服务注册表清理间隔(单位:毫秒,默认60*1000)
+    enable-self-preservation: false #锟角凤拷锟斤拷锟斤拷锟揭憋拷锟斤拷模式
+    eviction-interval-timer-in-ms: 60000 #锟斤拷锟斤拷注锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟轿伙拷锟斤拷锟斤拷耄��拷锟�60*1000锟斤拷
 
-#设置ribbon的超时时间
+#锟斤拷锟斤拷ribbon锟侥筹拷时时锟斤拷
 ribbon:
   ReadTimeout: 60000
   ConnectTimeout: 60000
@@ -28,10 +28,10 @@ zuul:
   routes:
     custom:
       path: /secure/**
-      serviceId: trade-custom-service
+      serviceId: golden-custom-service
     pay:
       path: /pay/**
-      serviceId: trade-pay-service
+      serviceId: golden-pay-service
     ib:
       path: /ib/**
       serviceId: ib-service
@@ -40,7 +40,7 @@ zuul:
       serviceId: agent-activity-service
     manager:
       path: /manager/**
-      serviceId: trade-manager-service
+      serviceId: golden-manager-service
 
 
 logging:

+ 4 - 4
crm-gateway/src/main/resources/application.yml

@@ -66,10 +66,10 @@ zuul:
   routes:
     custom:
       path: /secure/**
-      serviceId: trade-custom-service
+      serviceId: golden-custom-service
     pay:
       path: /pay/**
-      serviceId: trade-pay-service
+      serviceId: golden-pay-service
     ib:
       path: /ib/**
       serviceId: ib-service
@@ -78,8 +78,8 @@ zuul:
       serviceId: agent-activity-service
     manager:
       path: /manager/**
-      serviceId: trade-manager-service
+      serviceId: golden-manager-service
     web:
       path: /web/**
-      serviceId: trade-web-service
+      serviceId: golden-web-service
 

+ 2 - 2
crm-ib-task/src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.210.194.53:13542/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://103.158.191.66:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
 eureka:
   client:
     serviceUrl:

+ 2 - 2
crm-ib-task/src/main/resources/application-hu.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.210.194.53:13542/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://8.210.194.53:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
 eureka:
   client:
     serviceUrl:

+ 3 - 3
crm-ib-task/src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:18234/cwg_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
-    username: ib_task_user
-    password: 48fca8d6325e93e9377e483667374d72
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    username: root
+    password: NSH01Y0GTmUNjgg6xw80qg==
   activemq:
     broker-url: tcp://localhost:61616
   redis:

+ 2 - 2
crm-ib-task/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.209.114.51:13542/cwg_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 1 - 1
crm-ib-task/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 9100
 spring:
   profiles:
-    active: hu
+    active: dev
   application:
     name: TASK-SERVICE
 mybatis:

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/AccountApplyPasswordResetFeignService.java

@@ -5,7 +5,7 @@ import com.crm.rely.backend.model.entity.account.apply.password.reset.AccountApp
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-@FeignClient(name = "TRADE-CUSTOM-SERVICE", path = "/account/password/reset/manager")
+@FeignClient(name = "GOLDEN-CUSTOM-SERVICE", path = "/account/password/reset/manager")
 public interface AccountApplyPasswordResetFeignService {
     @PostMapping("/add")
     BaseResultDto<Object> add(AccountApplyPasswordResetAddEntity entity) throws Exception;

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/CustomFileFeignService.java

@@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author: houn
  * @create: 2020-07-19 16:25
  **/
-@FeignClient(name = "TRADE-CUSTOM-SERVICE", path = "/custom/file/manager", configuration = FeignMultipartSupportConfig.class)
+@FeignClient(name = "GOLDEN-CUSTOM-SERVICE", path = "/custom/file/manager", configuration = FeignMultipartSupportConfig.class)
 public interface CustomFileFeignService {
 
     @PostMapping(value = "/upload/{customId}/{type}", produces = {MediaType.APPLICATION_JSON_UTF8_VALUE}, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/CustomFundHistoryFeignService.java

@@ -6,7 +6,7 @@ import com.crm.rely.backend.model.entity.custom.fund.history.CustomFundHistorySe
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/custom/fund/history/manager")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/custom/fund/history/manager")
 public interface CustomFundHistoryFeignService {
 
     @PostMapping("/search/list")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/CustomInfoFeignService.java

@@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 /**
  * Created by max on 2020/6/17.
  */
-@FeignClient(name = "TRADE-CUSTOM-SERVICE", configuration = FeignMultipartSupportConfig.class)
+@FeignClient(name = "GOLDEN-CUSTOM-SERVICE", configuration = FeignMultipartSupportConfig.class)
 public interface CustomInfoFeignService {
 
     @PostMapping("/custom/manage/update/info")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/CustomLoginFeignService.java

@@ -18,7 +18,7 @@ import com.crm.rely.backend.model.entity.custom.login.firm.offer.CustomLoginFirm
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-@FeignClient(name = "TRADE-CUSTOM-SERVICE", configuration = FeignMultipartSupportConfig.class, path = "/custom/login/manager")
+@FeignClient(name = "GOLDEN-CUSTOM-SERVICE", configuration = FeignMultipartSupportConfig.class, path = "/custom/login/manager")
 public interface CustomLoginFeignService {
 
     @PostMapping("/demo/approve")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/FinanceCustomFeignService.java

@@ -13,7 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/finance/custom/manager")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/finance/custom/manager")
 public interface FinanceCustomFeignService {
 
     @PostMapping("/funds")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/FinanceDepositFeignService.java

@@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/finance/deposit/manager")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/finance/deposit/manager")
 public interface FinanceDepositFeignService {
 
     @PostMapping("/approve")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/FinanceTrainFeignService.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/finance/train/manager")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/finance/train/manager")
 public interface FinanceTrainFeignService {
 
     @PostMapping("/approve")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/FinanceTransferFeignService.java

@@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/transfer/manager")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/transfer/manager")
 public interface FinanceTransferFeignService {
 
     @PostMapping("/delete")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/FinanceWithdrawFeignService.java

@@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/withdraw/manager")
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/withdraw/manager")
 public interface FinanceWithdrawFeignService {
 
     @PostMapping("/approve")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/SysRemitChannelFeignService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author: houn
  * @create: 2021-1-13 16:25
  **/
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/remit/channel/manager", configuration =
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/remit/channel/manager", configuration =
         FeignMultipartSupportConfig.class)
 public interface SysRemitChannelFeignService {
     @PostMapping("/batch/update")

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/SysRemittanceChannelFeignService.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author: houn
  * @create: 2021-1-13 16:25
  **/
-@FeignClient(name = "TRADE-PAY-SERVICE", path = "/remittance/channel/manager", configuration = FeignMultipartSupportConfig.class)
+@FeignClient(name = "GOLDEN-PAY-SERVICE", path = "/remittance/channel/manager", configuration = FeignMultipartSupportConfig.class)
 public interface SysRemittanceChannelFeignService {
 
     /**

+ 1 - 1
crm-manager/src/main/java/com/crm/manager/service/WebVideoFeignService.java

@@ -14,7 +14,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.multipart.MultipartFile;
 
-@FeignClient(name = "TRADE-WEB-SERVICE", configuration = FeignMultipartSupportConfig.class, path = "/web/video/manager")
+@FeignClient(name = "GOLDEN-WEB-SERVICE", configuration = FeignMultipartSupportConfig.class, path = "/web/video/manager")
 public interface WebVideoFeignService {
 
     @PostMapping("/add")

+ 0 - 2
crm-manager/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 10500
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver

+ 2 - 2
crm-manager/src/main/resources/application.yml

@@ -1,10 +1,10 @@
 server:
-  port: 8500
+  port: 8505
 spring:
   profiles:
     active: dev
   application:
-    name: TRADE-MANAGER-SERVICE
+    name: GOLDEN-MANAGER-SERVICE
 mybatis:
   type-aliases-package: com.crm.manager.pojo.view
 login:

+ 3 - 3
crm-pay/src/main/resources/application.yml

@@ -1,10 +1,10 @@
 server:
-  port: 8004
+  port: 8504
 spring:
   profiles:
-    active: hu
+    active: dev
   application:
-    name: TRADE-PAY-SERVICE
+    name: GOLDEN-PAY-SERVICE
 logging:
   level:
     com.crm.manager.dao.mapper: trace

+ 2 - 2
crm-to-globex/src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://103.158.191.66:3306/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123123
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 3 - 3
crm-to-globex/src/main/resources/application-prod.yml

@@ -3,9 +3,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:18234/cwg_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
-    username: to_globex_user
-    password: e6777783cbcb77b6f95648c776dd1a13
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    username: root
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 2 - 2
crm-to-globex/src/main/resources/application-test.yml

@@ -3,9 +3,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://8.210.194.53:13542/cwg_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 2 - 2
crm-web/src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://103.158.191.66:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: 123123
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 3 - 3
crm-web/src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:18654/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
-    username: web_user
-    password: 0415d2c68621a76649e0f12cfc191a2e
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    username: root
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 2 - 2
crm-web/src/main/resources/application-test.yml

@@ -3,9 +3,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:13542/crm_trader?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://localhost:28571/crm_golden?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
-    password: F28c49d8be
+    password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:
     database: MYSQL
     hibernate:

+ 1 - 1
crm-web/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   profiles:
     active: dev
   application:
-    name: TRADE-WEB-SERVICE
+    name: GOLDEN-WEB-SERVICE
 
 mybatis:
   type-aliases-package: com.crm.rely.backend.core.pojo.table.view