autuor:dukun

describ: add mock-carmi-callback.py

deventor-unicom-carmi/pom.xml

@@ -19,7 +19,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <!--排除默认的tomcat-jdbc-->
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>com.bluefire</groupId>

deventor-unicom-carmi/src/main/resources/application-prod.properties

@@ -0,0 +1,19 @@
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.global-config.db-config.logic-delete-field=delFlag
+mybatis-plus.mapper-locations=classpath:mapper/*.xml
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://47.108.93.235:3006/deventor?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=Zyjl.2020
+server.port=8086
+
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=15
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=HikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+

deventor-unicom-carmi/src/main/resources/application.properties

@@ -1,10 +1 @@
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis-plus.global-config.db-config.logic-delete-field=delFlag
-mybatis-plus.mapper-locations=classpath:mapper/*.xml
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://47.108.93.235:3306/recharge?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-spring.datasource.url=jdbc:mysql://127.0.0.1:9001/deventor?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-#spring.datasource.password=Zyjl.2020
-spring.datasource.password=nibuzhidaowozhidao
-server.port=8086
+spring.profiles.active=prod

deventor-unicom-carmi/src/test/test-unicom-carmi-give.py

@@ -1,6 +1,6 @@
 import requests
 
-url = 'http://localhost:8086/unicom/card/secret/give'
+url = 'http://47.108.14.99:8086/unicom/card/secret/give'
 #url = 'http://47.108.14.99:8085/sup/order/list/20000'
 params1 = {'facePrice': 30}
 response = requests.get(url = url,params = params1)

deventor-unicom-carmi/src/test/test-unicom-carmi-push.py

@@ -18,6 +18,6 @@ http_header = {
 
 s = requests.session()
 s.keep_alive = False
-r_json = requests.post("http://localhost:8086/unicom/card/secret/push", data=data_json, headers=http_header)
+r_json = requests.post("http://47.108.14.99:8086/unicom/card/secret/push", data=data_json, headers=http_header)
 #r_json = requests.post("http://47.108.14.99:8085/sup/order/add", data=data_json, headers=http_header)
 print( r_json.text )

deventor-unicom-carmi/src/test/test-unicom-carmi-update.py

@@ -1,6 +1,6 @@
 import requests
 
-url = 'http://localhost:8086/unicom/card/secret/update'
+url = 'http://47.108.14.99:8086/unicom/card/secret/update'
 #url = 'http://47.108.14.99:8085/sup/order/list/20000'
 params1 = {'carmi': 'ccccccc ','flag':False}
 response = requests.put(url = url,params = params1)

mock-carmi-callback.py

@@ -0,0 +1,17 @@
+import json
+from flask import Flask
+from flask import request
+from flask import jsonify
+
+
+app = Flask(__name__)
+
+@app.route('/', methods=['POST'])
+def hello_world():
+    data = request.get_data()
+    data = json.loads(data)
+    print( data  )
+    return  jsonify(data) 
+
+if __name__ == '__main__':
+    app.run()

sql/unicom_card_secret.sql

@@ -7,4 +7,4 @@ CREATE TABLE `unicom_card_secret` (
   `pay_timestamp` bigint(20) NOT NULL DEFAULT '0' COMMENT '卡密使用时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `card_secret` (`card_secret`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin