Browse Source

dckj配置

bess-WeiganCai 3 years ago
parent
commit
0ab2aef682

+ 5 - 4
abi-cloud-qr-platform-server/pom.xml

@@ -38,10 +38,11 @@
         </dependency>
 
         <!-- 外部jar包 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-kubernetes-all</artifactId>
-        </dependency>
+<!--        TODO dckj配置-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-kubernetes-all</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/XxlJobConfig.java

@@ -12,7 +12,8 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 @Configuration
 public class XxlJobConfig {
-    @Value("${xxl.job.admin.addresses}")
+//    TODO dckj配置
+    /*@Value("${xxl.job.admin.addresses}")
     private String adminAddresses;
 
     @Value("${xxl.job.accessToken}")
@@ -50,6 +51,6 @@ public class XxlJobConfig {
         xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
 
         return xxlJobSpringExecutor;
-    }
+    }*/
 
 }

+ 2 - 1
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/GenerateCodeServiceImpl.java

@@ -112,7 +112,8 @@ public class GenerateCodeServiceImpl implements GenerateCodeService, Application
     @Value("${qms.encode.key}")
     private String encodeKey;
 
-    @Value("${qms.route.url}")
+//    TODO dckj配置
+//    @Value("${qms.route.url}")
     private String qmsRouteUrl;
 
     /** 允许单个码生成重复的次数 */

+ 27 - 27
abi-cloud-qr-platform-server/src/main/resources/application.yml

@@ -26,28 +26,28 @@ spring:
 
 
 ###################在家办公#####################
-#    password: qmsqrdev@2021
-#    username: qmsqrdev
-#    url: jdbc:mysql://rm-uf6t3m8yo40d5b905go.mysql.rds.aliyuncs.com:3306/qms_qr_platform_dev?characterEncoding=utf8&serverTimezone=Asia/Shanghai
-#  rabbitmq:
-#    password: guest
-#    username: guest
-#    virtual-host: /
-#    addresses: 127.0.0.1:5672
-#  redis:
-#    password: Abi@12345
-#    database: 0
-#    host: r-uf6kxuqc1iw6f8rwrjpd.redis.rds.aliyuncs.com
-#  cloud:
-#    kubernetes:
-#      enabled: false
-#      discovery:
-#        enabled: false
-#
-#sms-center-service:
-#  url: xxx
-#basic-service:
-#  url: xxx
+    password: qmsqrdev@2021
+    username: qmsqrdev
+    url: jdbc:mysql://rm-uf6t3m8yo40d5b905go.mysql.rds.aliyuncs.com:3306/qms_qr_platform_dev?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+  rabbitmq:
+    password: guest
+    username: guest
+    virtual-host: /
+    addresses: 192.168.2.53:5672
+  redis:
+    password: Abi@12345
+    database: 0
+    host: r-uf6kxuqc1iw6f8rwrjpd.redis.rds.aliyuncs.com
+  cloud:
+    kubernetes:
+      enabled: false
+      discovery:
+        enabled: false
+
+sms-center-service:
+  url: xxx
+basic-service:
+  url: xxx
 ##############################################
 
 
@@ -90,11 +90,11 @@ xxl:
     accessToken:
 
 #tableStore参数配置
-#tableStore:
-#  endPoint: https://ABIALI-BEES-DEV.cn-shanghai.ots.aliyuncs.com
-#  accessKeyId: LTAI5tJsggmweHRJXmojeY65
-#  accessKeySecret: EZWyrgZKV0iejOEq8JPEF8b82mdXxJ
-#  instanceName: ABIALI-BEES-DEV
+tableStore:
+  endPoint: https://ABIALI-BEES-DEV.cn-shanghai.ots.aliyuncs.com
+  accessKeyId: LTAI5tJsggmweHRJXmojeY65
+  accessKeySecret: EZWyrgZKV0iejOEq8JPEF8b82mdXxJ
+  instanceName: ABIALI-BEES-DEV
 
 # 系统url
 system:

+ 26 - 26
abi-cloud-qr-platform-server/src/main/resources/bootstrap.yml

@@ -6,32 +6,32 @@ spring:
   main:
     allow-bean-definition-overriding: true
   cloud:
-    kubernetes:
-      discovery:
-        all-namespaces: true
-        service-name: ${spring.application.name}
-      config:
-        enabled: true
-        name: qms-qr-platform-service-config
-        namespace: ${spring.profiles.active}
-      secrets:
-        enabled: true
-        enable-api: true
-        namespace: ${spring.profiles.active}
-        sources:
-        - name: redis
-        - name: rabbitmq-qms
-        - name: qms-qr-platform-service-secret
-      reload:
-        enabled: true
-        monitoring-config-maps: true
-        monitoring-secrets: true
-        strategy: RESTART_CONTEXT
-        mode: EVENT
-      client:
-        namespace: ${spring.profiles.active}
-        username: LTAI4G1MSbqvMebsQdMvtxcD
-        password: ew9VUPCOxjgNZ3A4xQ2RXpYDNyUXFf
+#    kubernetes:
+#      discovery:
+#        all-namespaces: true
+#        service-name: ${spring.application.name}
+#      config:
+#        enabled: true
+#        name: qms-qr-platform-service-config
+#        namespace: ${spring.profiles.active}
+#      secrets:
+#        enabled: true
+#        enable-api: true
+#        namespace: ${spring.profiles.active}
+#        sources:
+#        - name: redis
+#        - name: rabbitmq-qms
+#        - name: qms-qr-platform-service-secret
+#      reload:
+#        enabled: true
+#        monitoring-config-maps: true
+#        monitoring-secrets: true
+#        strategy: RESTART_CONTEXT
+#        mode: EVENT
+#      client:
+#        namespace: ${spring.profiles.active}
+#        username: LTAI4G1MSbqvMebsQdMvtxcD
+#        password: ew9VUPCOxjgNZ3A4xQ2RXpYDNyUXFf
     loadbalancer:
       ribbon:
         enabled: false