张涛 1 year ago
parent
commit
68cd9c4a71

+ 4
- 3
deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling-httpTrigger.json View File

@@ -6,7 +6,7 @@
6 6
     "sourceArn": null,
7 7
     "triggerType": "http",
8 8
     "invocationRole": null,
9
-    "qualifier": null,
9
+    "qualifier": "LATEST",
10 10
     "urlInternet": "https://invoice-filling-stategr-service-rxjrqjwiow.cn-shanghai.fcapp.run",
11 11
     "urlIntranet": "https://invoice-filling-stategr-service-rxjrqjwiow.cn-shanghai-vpc.fcapp.run",
12 12
     "triggerConfig": {
@@ -18,10 +18,11 @@
18 18
         "HEAD",
19 19
         "OPTIONS"
20 20
       ],
21
-      "authType": "anonymous"
21
+      "authType": "anonymous",
22
+      "disableURLInternet": false
22 23
     },
23 24
     "createdTime": "2022-07-18T02:02:16Z",
24
-    "lastModifiedTime": "2022-11-23T12:01:44Z",
25
+    "lastModifiedTime": "2023-09-11T09:38:02Z",
25 26
     "status": null,
26 27
     "targetArn": null,
27 28
     "name": "httpTrigger"

+ 3
- 3
deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling.json View File

@@ -8,13 +8,13 @@
8 8
     "timeout": 30,
9 9
     "initializer": "",
10 10
     "initializationTimeout": 3,
11
-    "codeSize": 69222842,
12
-    "codeChecksum": "14295371681357793144",
11
+    "codeSize": 69229221,
12
+    "codeChecksum": "3053493131185536708",
13 13
     "memorySize": 1024,
14 14
     "gpuMemorySize": null,
15 15
     "environmentVariables": {},
16 16
     "createdTime": "2022-07-18T02:02:16Z",
17
-    "lastModifiedTime": "2022-11-23T12:01:37Z",
17
+    "lastModifiedTime": "2023-09-11T09:37:59Z",
18 18
     "instanceConcurrency": 1,
19 19
     "instanceSoftConcurrency": null,
20 20
     "customContainerConfig": null,

+ 3
- 2
deploy/.s/1636896505560465-cn-shanghai-stategrid-service.json View File

@@ -12,12 +12,12 @@
12 12
     },
13 13
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
14 14
     "createdTime": "2022-02-26T04:50:56Z",
15
-    "lastModifiedTime": "2022-11-23T12:01:44Z",
15
+    "lastModifiedTime": "2023-09-11T09:38:02Z",
16 16
     "vpcConfig": {
17 17
       "vpcId": "",
18 18
       "vSwitchIds": [],
19 19
       "securityGroupId": "",
20
-      "role": "",
20
+      "role": null,
21 21
       "anytunnelViaENI": null
22 22
     },
23 23
     "internetAccess": true,
@@ -35,6 +35,7 @@
35 35
       "params": null,
36 36
       "jaegerConfig": null
37 37
     },
38
+    "useSLRAuthentication": false,
38 39
     "name": "stategrid-service"
39 40
   }
40 41
 }

+ 8
- 2
deploy/.s/invoice-filling.stategrid.njyunzhi.com.json View File

@@ -18,6 +18,7 @@
18 18
       {
19 19
         "path": "/*",
20 20
         "accountId": null,
21
+        "apiVersion": "",
21 22
         "serviceName": "stategrid-service",
22 23
         "functionName": "invoice-filling",
23 24
         "qualifier": null,
@@ -28,10 +29,15 @@
28 29
           "DELETE",
29 30
           "HEAD",
30 31
           "OPTIONS"
31
-        ]
32
+        ],
33
+        "rewriteConfig": null,
34
+        "innerRewriteConfig": null
32 35
       }
33 36
     ]
34 37
   },
35 38
   "createdTime": "2022-07-18T02:03:47Z",
36
-  "lastModifiedTime": "2022-11-23T12:01:44Z"
39
+  "lastModifiedTime": "2023-09-11T09:38:03Z",
40
+  "keepFullPath": null,
41
+  "subdomainCount": null,
42
+  "wafConfig": null
37 43
 }

+ 2
- 2
deploy/s.prod.yaml View File

@@ -19,7 +19,7 @@ name: state-grid-invoice-filling
19 19
 # access 是当前应用所需要的密钥信息配置:
20 20
 # 密钥配置可以参考:https://www.serverless-devs.com/serverless-devs/command/config
21 21
 # 密钥使用顺序可以参考:https://www.serverless-devs.com/serverless-devs/tool#密钥使用顺序与规范
22
-access: default
22
+access: default-1
23 23
 
24 24
 vars: # 全局变量
25 25
   region: cn-shanghai
@@ -49,7 +49,7 @@ services:
49 49
       function:
50 50
         name: invoice-filling
51 51
         description: '发票确认'
52
-        codeUri: ../target/invoice-0.0.6.jar
52
+        codeUri: ../target/invoice-0.0.7.jar
53 53
         runtime: custom
54 54
         memorySize: 1024
55 55
         timeout: 30

+ 44
- 0
src/main/java/com/njyunzhi/invoice/common/excel/IsNeedLodqingCoverter.java View File

@@ -0,0 +1,44 @@
1
+package com.njyunzhi.invoice.common.excel;
2
+
3
+import com.alibaba.excel.converters.Converter;
4
+import com.alibaba.excel.enums.CellDataTypeEnum;
5
+import com.alibaba.excel.metadata.GlobalConfiguration;
6
+import com.alibaba.excel.metadata.data.WriteCellData;
7
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
8
+
9
+public class IsNeedLodqingCoverter implements Converter<String> {
10
+        @Override
11
+        public Class supportJavaTypeKey() {
12
+            return String.class;
13
+        }
14
+
15
+        @Override
16
+        public CellDataTypeEnum supportExcelTypeKey() {
17
+            return CellDataTypeEnum.STRING;
18
+        }
19
+
20
+        /**
21
+         * 写 Excel
22
+         * @param value
23
+         * @param contentProperty
24
+         * @param globalConfiguration
25
+         * @return
26
+         * @throws Exception
27
+         */
28
+        @Override
29
+        public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
30
+            if (null == value) return null;
31
+
32
+            String val;
33
+            switch (value) {
34
+                case "1":
35
+                    val = "是";
36
+                    break;
37
+                default:
38
+                    val = "否";
39
+            }
40
+
41
+
42
+            return new WriteCellData(val);
43
+        }
44
+}