Yansen il y a 9 mois
Parent
révision
17aef13ae7

+ 1
- 1
deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling-httpTrigger.json Voir le fichier

22
       "disableURLInternet": false
22
       "disableURLInternet": false
23
     },
23
     },
24
     "createdTime": "2022-07-18T02:02:16Z",
24
     "createdTime": "2022-07-18T02:02:16Z",
25
-    "lastModifiedTime": "2024-07-06T13:07:59Z",
25
+    "lastModifiedTime": "2024-07-15T06:37:49Z",
26
     "status": null,
26
     "status": null,
27
     "targetArn": null,
27
     "targetArn": null,
28
     "name": "httpTrigger"
28
     "name": "httpTrigger"

+ 3
- 3
deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling.json Voir le fichier

8
     "timeout": 30,
8
     "timeout": 30,
9
     "initializer": "",
9
     "initializer": "",
10
     "initializationTimeout": 3,
10
     "initializationTimeout": 3,
11
-    "codeSize": 69225605,
12
-    "codeChecksum": "16716663287251665922",
11
+    "codeSize": 69225779,
12
+    "codeChecksum": "7433530922618334546",
13
     "memorySize": 1024,
13
     "memorySize": 1024,
14
     "gpuMemorySize": null,
14
     "gpuMemorySize": null,
15
     "environmentVariables": {},
15
     "environmentVariables": {},
16
     "createdTime": "2022-07-18T02:02:16Z",
16
     "createdTime": "2022-07-18T02:02:16Z",
17
-    "lastModifiedTime": "2024-07-06T13:07:58Z",
17
+    "lastModifiedTime": "2024-07-15T06:37:49Z",
18
     "instanceConcurrency": 1,
18
     "instanceConcurrency": 1,
19
     "instanceSoftConcurrency": null,
19
     "instanceSoftConcurrency": null,
20
     "customContainerConfig": null,
20
     "customContainerConfig": null,

+ 1
- 1
deploy/.s/1636896505560465-cn-shanghai-stategrid-service.json Voir le fichier

12
     },
12
     },
13
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
13
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
14
     "createdTime": "2022-02-26T04:50:56Z",
14
     "createdTime": "2022-02-26T04:50:56Z",
15
-    "lastModifiedTime": "2024-07-06T13:07:59Z",
15
+    "lastModifiedTime": "2024-07-15T06:37:49Z",
16
     "vpcConfig": {
16
     "vpcConfig": {
17
       "vpcId": "",
17
       "vpcId": "",
18
       "vSwitchIds": [],
18
       "vSwitchIds": [],

+ 1
- 1
deploy/.s/invoice-filling.stategrid.njyunzhi.com.json Voir le fichier

29
     ]
29
     ]
30
   },
30
   },
31
   "createdTime": "2022-07-18T02:03:47Z",
31
   "createdTime": "2022-07-18T02:03:47Z",
32
-  "lastModifiedTime": "2024-07-06T13:07:59Z",
32
+  "lastModifiedTime": "2024-07-15T06:37:49Z",
33
   "keepFullPath": null,
33
   "keepFullPath": null,
34
   "subdomainCount": null,
34
   "subdomainCount": null,
35
   "wafConfig": null
35
   "wafConfig": null

+ 1
- 0
deploy/readme.md Voir le fichier

1
+已经移植到了 47.101.36.130 服务器上

+ 1
- 1
deploy/s.prod.yaml Voir le fichier

49
       function:
49
       function:
50
         name: invoice-filling
50
         name: invoice-filling
51
         description: '发票确认'
51
         description: '发票确认'
52
-        codeUri: ../target/invoice-0.0.10.jar
52
+        codeUri: ../target/invoice-0.0.11.jar
53
         runtime: custom
53
         runtime: custom
54
         memorySize: 1024
54
         memorySize: 1024
55
         timeout: 30
55
         timeout: 30

+ 1
- 1
pom.xml Voir le fichier

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.njyunzhi</groupId>
11
 	<groupId>com.njyunzhi</groupId>
12
 	<artifactId>invoice</artifactId>
12
 	<artifactId>invoice</artifactId>
13
-	<version>0.0.10</version>
13
+	<version>0.0.11</version>
14
 	<name>invoice-fill</name>
14
 	<name>invoice-fill</name>
15
 	<description>发票填报</description>
15
 	<description>发票填报</description>
16
 	<properties>
16
 	<properties>

+ 3
- 3
src/main/resources/application-prod.yml Voir le fichier

1
 
1
 
2
 server:
2
 server:
3
-  port: 9000
3
+  port: 8099
4
 
4
 
5
 spring:
5
 spring:
6
   datasource:
6
   datasource:
7
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/invoice_fill?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
7
+    url: jdbc:mysql://rm-2ze1a4hqb68h7ud14fo.mysql.rds.aliyuncs.com:3306/invoice_fill?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
8
     username: invoice_fill
8
     username: invoice_fill
9
     password: invoice_fill@ABCD1234
9
     password: invoice_fill@ABCD1234
10
 
10
 
11
 ### 跨域
11
 ### 跨域
12
 cors:
12
 cors:
13
-  enabled: true
13
+  enabled: false
14
   origins:
14
   origins:
15
     - http://h5.njyunzhi.com
15
     - http://h5.njyunzhi.com
16
     - https://h5.njyunzhi.com
16
     - https://h5.njyunzhi.com

+ 2
- 1
src/main/resources/mapper/TaInvoiceDetailMapper.xml Voir le fichier

106
             t.`status`,
106
             t.`status`,
107
             t.`create_date`,
107
             t.`create_date`,
108
             t.`is_need_lodging`,
108
             t.`is_need_lodging`,
109
-            t.`room_code`
109
+            t.`room_code`,
110
+            t.email
110
         FROM
111
         FROM
111
             ta_invoice_detail t
112
             ta_invoice_detail t
112
                 INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id AND t.invoice_person_id = s.invoice_person_id
113
                 INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id AND t.invoice_person_id = s.invoice_person_id