File src/main/java/com/kingfisher/deployment/audit/data/builder/DeploymentStatusBuidler.java changed (mode: 100644) (index 77af0ce..8f6dc68) |
... |
... |
import org.springframework.stereotype.Component; |
15 |
15 |
|
|
16 |
16 |
import com.kingfisher.deployment.audit.constant.ApplicationConstant;
|
import com.kingfisher.deployment.audit.constant.ApplicationConstant;
|
17 |
17 |
import com.kingfisher.deployment.audit.exception.model.DeploymentAuditException;
|
import com.kingfisher.deployment.audit.exception.model.DeploymentAuditException;
|
18 |
|
import com.kingfisher.deployment.audit.model.Application;
|
|
19 |
|
import com.kingfisher.deployment.audit.model.Applications;
|
|
20 |
18 |
import com.kingfisher.deployment.audit.model.Deployment;
|
import com.kingfisher.deployment.audit.model.Deployment;
|
21 |
19 |
import com.kingfisher.deployment.audit.model.DeploymentProperties;
|
import com.kingfisher.deployment.audit.model.DeploymentProperties;
|
22 |
|
import com.kingfisher.deployment.audit.model.IntegrationServers;
|
|
23 |
20 |
import com.kingfisher.deployment.audit.model.IIBDeploymentStatus;
|
import com.kingfisher.deployment.audit.model.IIBDeploymentStatus;
|
24 |
21 |
import com.kingfisher.deployment.audit.model.IndexedDeployment;
|
import com.kingfisher.deployment.audit.model.IndexedDeployment;
|
25 |
22 |
import com.kingfisher.deployment.audit.model.Instance;
|
import com.kingfisher.deployment.audit.model.Instance;
|
26 |
|
import com.kingfisher.deployment.audit.model.IntegrationServer;
|
|
27 |
23 |
import com.kingfisher.deployment.audit.model.JenkinsDeploymentStatus;
|
import com.kingfisher.deployment.audit.model.JenkinsDeploymentStatus;
|
28 |
24 |
import com.kingfisher.deployment.audit.repository.InstanceRepository;
|
import com.kingfisher.deployment.audit.repository.InstanceRepository;
|
29 |
25 |
import com.kingfisher.deployment.audit.rest.client.IIBRestClient;
|
import com.kingfisher.deployment.audit.rest.client.IIBRestClient;
|
30 |
26 |
import com.kingfisher.deployment.audit.security.PasswordCodec;
|
import com.kingfisher.deployment.audit.security.PasswordCodec;
|
|
27 |
|
import com.kingfisher.deployment.audit.thread.model.InstanceThread;
|
31 |
28 |
|
|
32 |
29 |
@Component
|
@Component
|
33 |
30 |
public class DeploymentStatusBuidler {
|
public class DeploymentStatusBuidler {
|
|
... |
... |
public class DeploymentStatusBuidler { |
42 |
39 |
PasswordCodec passwordCodec;
|
PasswordCodec passwordCodec;
|
43 |
40 |
|
|
44 |
41 |
public static ExecutorService pool = Executors.newFixedThreadPool(20);
|
public static ExecutorService pool = Executors.newFixedThreadPool(20);
|
|
42 |
|
|
45 |
43 |
public static ExecutorService instancePool = Executors.newFixedThreadPool(20);
|
public static ExecutorService instancePool = Executors.newFixedThreadPool(20);
|
46 |
44 |
|
|
|
45 |
|
public static ThreadPoolExecutor executor = (ThreadPoolExecutor) pool;
|
|
46 |
|
|
|
47 |
|
public static ThreadPoolExecutor instanceExecutor = (ThreadPoolExecutor) instancePool;
|
|
48 |
|
|
|
49 |
|
public static final List<Deployment> iibList = new ArrayList<>();
|
|
50 |
|
|
47 |
51 |
public Deployment build(JenkinsDeploymentStatus jenkinsDeploymentStatus) throws DeploymentAuditException {
|
public Deployment build(JenkinsDeploymentStatus jenkinsDeploymentStatus) throws DeploymentAuditException {
|
48 |
52 |
String applicationName = jenkinsDeploymentStatus.getApplicationName();
|
String applicationName = jenkinsDeploymentStatus.getApplicationName();
|
49 |
53 |
String environment = jenkinsDeploymentStatus.getEnvironment();
|
String environment = jenkinsDeploymentStatus.getEnvironment();
|
|
... |
... |
public class DeploymentStatusBuidler { |
77 |
81 |
for (String tier : tiers) {
|
for (String tier : tiers) {
|
78 |
82 |
instances.addAll(instanceRepository.findByTier(tier));
|
instances.addAll(instanceRepository.findByTier(tier));
|
79 |
83 |
}
|
}
|
80 |
|
List<Deployment> iibList = new ArrayList<>();
|
|
81 |
|
ThreadPoolExecutor executor = (ThreadPoolExecutor) pool;
|
|
82 |
|
ThreadPoolExecutor instanceExecutor = (ThreadPoolExecutor) instancePool;
|
|
83 |
|
|
|
84 |
|
Thread instanceThread = new Thread(new Runnable() {
|
|
85 |
|
|
|
86 |
|
@Override
|
|
87 |
|
public void run() {
|
|
88 |
|
for (Instance instance : instances) {
|
|
89 |
|
IntegrationServers integrationServers;
|
|
90 |
|
try {
|
|
91 |
|
integrationServers = iibRestClient.getIntegrationServers(instance.getHost(),
|
|
92 |
|
instance.getApiPort(), instance.getApiUsername(),
|
|
93 |
|
passwordCodec.decrypt(instance.getApiPassword()));
|
|
94 |
|
|
|
95 |
|
System.out.println("calling execute 1");
|
|
96 |
|
Thread t1 = new Thread(new Runnable() {
|
|
97 |
|
|
|
98 |
|
@Override
|
|
99 |
|
public void run() {
|
|
100 |
|
for (IntegrationServer integrationServer : integrationServers.getExecutionGroup()) {
|
|
101 |
|
Applications applications;
|
|
102 |
|
try {
|
|
103 |
|
applications = iibRestClient.getApplications(integrationServer.getName(),
|
|
104 |
|
instance.getHost(), instance.getApiPort(), instance.getApiUsername(),
|
|
105 |
|
passwordCodec.decrypt(instance.getApiPassword()));
|
|
106 |
|
System.out.println("calling execute 2");
|
|
107 |
|
Thread t2 = new Thread(new Runnable() {
|
|
108 |
|
@Override
|
|
109 |
|
public void run() {
|
|
110 |
|
for (Application application : applications.getApplication()) {
|
|
111 |
|
IIBDeploymentStatus iibDeploymentStatus;
|
|
112 |
|
try {
|
|
113 |
|
iibDeploymentStatus = iibRestClient.getDeployemntProperties(
|
|
114 |
|
integrationServer.getName(), application.getName(),
|
|
115 |
|
instance.getHost(), instance.getApiPort(),
|
|
116 |
|
instance.getApiUsername(),
|
|
117 |
|
passwordCodec.decrypt(instance.getApiPassword()));
|
|
118 |
|
|
|
119 |
|
iibList.add(new Deployment(application.getName(),
|
|
120 |
|
getBarFileName(iibDeploymentStatus), instance.getTier(),
|
|
121 |
|
instance.getInstanceName(), integrationServer.getName(),
|
|
122 |
|
getBarDeploymentTime(iibDeploymentStatus), new Date(),
|
|
123 |
|
getBarModifyTime(iibDeploymentStatus),
|
|
124 |
|
getBarReleaseId(iibDeploymentStatus),
|
|
125 |
|
getBarCheckSum(iibDeploymentStatus), "api", "api",
|
|
126 |
|
"snapshot"));
|
|
127 |
|
} catch (DeploymentAuditException e) {
|
|
128 |
|
e.printStackTrace();
|
|
129 |
|
}
|
|
130 |
|
}
|
|
131 |
|
|
|
132 |
|
}
|
|
133 |
|
});
|
|
134 |
|
pool.execute(t2);
|
|
135 |
|
|
|
136 |
|
} catch (DeploymentAuditException e) {
|
|
137 |
|
}
|
|
138 |
|
}
|
|
139 |
|
|
|
140 |
|
}
|
|
141 |
|
});
|
|
142 |
|
pool.execute(t1);
|
|
143 |
|
} catch (DeploymentAuditException e1) {
|
|
144 |
|
e1.printStackTrace();
|
|
145 |
|
}
|
|
146 |
|
|
|
147 |
|
}
|
|
148 |
84 |
|
|
149 |
|
}
|
|
150 |
|
});
|
|
|
85 |
|
Thread instanceThread = new Thread(new InstanceThread(iibRestClient, passwordCodec, instances));
|
151 |
86 |
instancePool.execute(instanceThread);
|
instancePool.execute(instanceThread);
|
152 |
87 |
|
|
153 |
88 |
while (true) {
|
while (true) {
|
|
... |
... |
public class DeploymentStatusBuidler { |
214 |
149 |
return indexedDeployments;
|
return indexedDeployments;
|
215 |
150 |
}
|
}
|
216 |
151 |
|
|
217 |
|
private String getBarReleaseId(IIBDeploymentStatus iibDeploymentStatus) {
|
|
|
152 |
|
public String getBarReleaseId(IIBDeploymentStatus iibDeploymentStatus) {
|
218 |
153 |
List<DeploymentProperties> basicProperties = iibDeploymentStatus.getBasicProperties();
|
List<DeploymentProperties> basicProperties = iibDeploymentStatus.getBasicProperties();
|
219 |
154 |
return extractproperty(basicProperties, ApplicationConstant.IIB_API_RESPONSE_VERSION);
|
return extractproperty(basicProperties, ApplicationConstant.IIB_API_RESPONSE_VERSION);
|
220 |
155 |
}
|
}
|
221 |
156 |
|
|
222 |
|
private String getBarCheckSum(IIBDeploymentStatus iibDeploymentStatus) {
|
|
|
157 |
|
public String getBarCheckSum(IIBDeploymentStatus iibDeploymentStatus) {
|
223 |
158 |
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
224 |
159 |
return extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_BAR_CHECKSUM);
|
return extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_BAR_CHECKSUM);
|
225 |
160 |
}
|
}
|
226 |
161 |
|
|
227 |
|
private Date getBarModifyTime(IIBDeploymentStatus iibDeploymentStatus) throws DeploymentAuditException {
|
|
|
162 |
|
public Date getBarModifyTime(IIBDeploymentStatus iibDeploymentStatus) throws DeploymentAuditException {
|
228 |
163 |
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
229 |
164 |
return convertToDate(extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_MODIFY_TIME));
|
return convertToDate(extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_MODIFY_TIME));
|
230 |
165 |
}
|
}
|
231 |
166 |
|
|
232 |
|
private Date getBarDeploymentTime(IIBDeploymentStatus iibDeploymentStatus) throws DeploymentAuditException {
|
|
|
167 |
|
public Date getBarDeploymentTime(IIBDeploymentStatus iibDeploymentStatus) throws DeploymentAuditException {
|
233 |
168 |
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
234 |
169 |
return convertToDate(extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_DEPLOY_TIME));
|
return convertToDate(extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_DEPLOY_TIME));
|
235 |
170 |
}
|
}
|
236 |
171 |
|
|
237 |
|
private String getBarFileName(IIBDeploymentStatus iibDeploymentStatus) {
|
|
|
172 |
|
public String getBarFileName(IIBDeploymentStatus iibDeploymentStatus) {
|
238 |
173 |
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
List<DeploymentProperties> deployedProperties = iibDeploymentStatus.getDeployedProperties();
|
239 |
174 |
return extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_BAR_FILE_NAME);
|
return extractproperty(deployedProperties, ApplicationConstant.IIB_API_RESPONSE_BAR_FILE_NAME);
|
240 |
175 |
}
|
}
|
File src/main/java/com/kingfisher/deployment/audit/thread/model/ApplicationThread.java added (mode: 100644) (index 0000000..8534156) |
|
1 |
|
package com.kingfisher.deployment.audit.thread.model;
|
|
2 |
|
|
|
3 |
|
import java.util.Date;
|
|
4 |
|
|
|
5 |
|
import com.kingfisher.deployment.audit.data.builder.DeploymentStatusBuidler;
|
|
6 |
|
import com.kingfisher.deployment.audit.exception.model.DeploymentAuditException;
|
|
7 |
|
import com.kingfisher.deployment.audit.model.Application;
|
|
8 |
|
import com.kingfisher.deployment.audit.model.Applications;
|
|
9 |
|
import com.kingfisher.deployment.audit.model.Deployment;
|
|
10 |
|
import com.kingfisher.deployment.audit.model.IIBDeploymentStatus;
|
|
11 |
|
import com.kingfisher.deployment.audit.model.Instance;
|
|
12 |
|
import com.kingfisher.deployment.audit.model.IntegrationServer;
|
|
13 |
|
import com.kingfisher.deployment.audit.rest.client.IIBRestClient;
|
|
14 |
|
import com.kingfisher.deployment.audit.security.PasswordCodec;
|
|
15 |
|
|
|
16 |
|
public class ApplicationThread extends Thread {
|
|
17 |
|
|
|
18 |
|
private IIBRestClient iibRestClient;
|
|
19 |
|
|
|
20 |
|
private PasswordCodec passwordCodec;
|
|
21 |
|
|
|
22 |
|
private Instance instance;
|
|
23 |
|
|
|
24 |
|
private IntegrationServer integrationServer;
|
|
25 |
|
|
|
26 |
|
private Applications applications;
|
|
27 |
|
|
|
28 |
|
public ApplicationThread() {
|
|
29 |
|
super();
|
|
30 |
|
}
|
|
31 |
|
|
|
32 |
|
public ApplicationThread(IIBRestClient iibRestClient, PasswordCodec passwordCodec, Instance instance,
|
|
33 |
|
IntegrationServer integrationServer, Applications applications) {
|
|
34 |
|
super();
|
|
35 |
|
this.iibRestClient = iibRestClient;
|
|
36 |
|
this.passwordCodec = passwordCodec;
|
|
37 |
|
this.instance = instance;
|
|
38 |
|
this.integrationServer = integrationServer;
|
|
39 |
|
this.applications = applications;
|
|
40 |
|
}
|
|
41 |
|
|
|
42 |
|
public Instance getInstance() {
|
|
43 |
|
return instance;
|
|
44 |
|
}
|
|
45 |
|
|
|
46 |
|
public void setInstance(Instance instance) {
|
|
47 |
|
this.instance = instance;
|
|
48 |
|
}
|
|
49 |
|
|
|
50 |
|
public IntegrationServer getIntegrationServer() {
|
|
51 |
|
return integrationServer;
|
|
52 |
|
}
|
|
53 |
|
|
|
54 |
|
public void setIntegrationServer(IntegrationServer integrationServer) {
|
|
55 |
|
this.integrationServer = integrationServer;
|
|
56 |
|
}
|
|
57 |
|
|
|
58 |
|
public Applications getApplications() {
|
|
59 |
|
return applications;
|
|
60 |
|
}
|
|
61 |
|
|
|
62 |
|
public void setApplications(Applications applications) {
|
|
63 |
|
this.applications = applications;
|
|
64 |
|
}
|
|
65 |
|
|
|
66 |
|
public void run() {
|
|
67 |
|
for (Application application : applications.getApplication()) {
|
|
68 |
|
IIBDeploymentStatus iibDeploymentStatus;
|
|
69 |
|
try {
|
|
70 |
|
DeploymentStatusBuidler deploymentStatusBuidler = new DeploymentStatusBuidler();
|
|
71 |
|
iibDeploymentStatus = iibRestClient.getDeployemntProperties(integrationServer.getName(),
|
|
72 |
|
application.getName(), instance.getHost(), instance.getApiPort(), instance.getApiUsername(),
|
|
73 |
|
passwordCodec.decrypt(instance.getApiPassword()));
|
|
74 |
|
|
|
75 |
|
DeploymentStatusBuidler.iibList.add(new Deployment(application.getName(),
|
|
76 |
|
deploymentStatusBuidler.getBarFileName(iibDeploymentStatus), instance.getTier(),
|
|
77 |
|
instance.getInstanceName(), integrationServer.getName(),
|
|
78 |
|
deploymentStatusBuidler.getBarDeploymentTime(iibDeploymentStatus), new Date(),
|
|
79 |
|
deploymentStatusBuidler.getBarModifyTime(iibDeploymentStatus),
|
|
80 |
|
deploymentStatusBuidler.getBarReleaseId(iibDeploymentStatus),
|
|
81 |
|
deploymentStatusBuidler.getBarCheckSum(iibDeploymentStatus), "api", "api", "snapshot"));
|
|
82 |
|
} catch (DeploymentAuditException e) {
|
|
83 |
|
e.printStackTrace();
|
|
84 |
|
}
|
|
85 |
|
}
|
|
86 |
|
}
|
|
87 |
|
|
|
88 |
|
} |
File src/main/java/com/kingfisher/deployment/audit/thread/model/InstanceThread.java added (mode: 100644) (index 0000000..e07997c) |
|
1 |
|
package com.kingfisher.deployment.audit.thread.model;
|
|
2 |
|
|
|
3 |
|
import java.util.List;
|
|
4 |
|
|
|
5 |
|
import com.kingfisher.deployment.audit.data.builder.DeploymentStatusBuidler;
|
|
6 |
|
import com.kingfisher.deployment.audit.exception.model.DeploymentAuditException;
|
|
7 |
|
import com.kingfisher.deployment.audit.model.Instance;
|
|
8 |
|
import com.kingfisher.deployment.audit.model.IntegrationServers;
|
|
9 |
|
import com.kingfisher.deployment.audit.rest.client.IIBRestClient;
|
|
10 |
|
import com.kingfisher.deployment.audit.security.PasswordCodec;
|
|
11 |
|
|
|
12 |
|
public class InstanceThread extends Thread {
|
|
13 |
|
|
|
14 |
|
private IIBRestClient iibRestClient;
|
|
15 |
|
|
|
16 |
|
private PasswordCodec passwordCodec;
|
|
17 |
|
|
|
18 |
|
private List<Instance> instances;
|
|
19 |
|
|
|
20 |
|
public InstanceThread() {
|
|
21 |
|
super();
|
|
22 |
|
}
|
|
23 |
|
|
|
24 |
|
public InstanceThread(IIBRestClient iibRestClient, PasswordCodec passwordCodec, List<Instance> instances) {
|
|
25 |
|
super();
|
|
26 |
|
this.iibRestClient = iibRestClient;
|
|
27 |
|
this.passwordCodec = passwordCodec;
|
|
28 |
|
this.instances = instances;
|
|
29 |
|
}
|
|
30 |
|
|
|
31 |
|
public List<Instance> getInstances() {
|
|
32 |
|
return instances;
|
|
33 |
|
}
|
|
34 |
|
|
|
35 |
|
public void setInstances(List<Instance> instances) {
|
|
36 |
|
this.instances = instances;
|
|
37 |
|
}
|
|
38 |
|
|
|
39 |
|
public void run() {
|
|
40 |
|
for (Instance instance : instances) {
|
|
41 |
|
IntegrationServers integrationServers;
|
|
42 |
|
try {
|
|
43 |
|
integrationServers = iibRestClient.getIntegrationServers(instance.getHost(), instance.getApiPort(),
|
|
44 |
|
instance.getApiUsername(), passwordCodec.decrypt(instance.getApiPassword()));
|
|
45 |
|
|
|
46 |
|
System.out.println("calling execute 1");
|
|
47 |
|
Thread integrationServerThread = new Thread(
|
|
48 |
|
new IntegrationServerThread(iibRestClient, passwordCodec, instance, integrationServers));
|
|
49 |
|
DeploymentStatusBuidler.pool.execute(integrationServerThread);
|
|
50 |
|
} catch (DeploymentAuditException e1) {
|
|
51 |
|
e1.printStackTrace();
|
|
52 |
|
}
|
|
53 |
|
|
|
54 |
|
}
|
|
55 |
|
}
|
|
56 |
|
} |
File src/main/java/com/kingfisher/deployment/audit/thread/model/IntegrationServerThread.java added (mode: 100644) (index 0000000..f91a5ed) |
|
1 |
|
package com.kingfisher.deployment.audit.thread.model;
|
|
2 |
|
|
|
3 |
|
import com.kingfisher.deployment.audit.data.builder.DeploymentStatusBuidler;
|
|
4 |
|
import com.kingfisher.deployment.audit.exception.model.DeploymentAuditException;
|
|
5 |
|
import com.kingfisher.deployment.audit.model.Applications;
|
|
6 |
|
import com.kingfisher.deployment.audit.model.Instance;
|
|
7 |
|
import com.kingfisher.deployment.audit.model.IntegrationServer;
|
|
8 |
|
import com.kingfisher.deployment.audit.model.IntegrationServers;
|
|
9 |
|
import com.kingfisher.deployment.audit.rest.client.IIBRestClient;
|
|
10 |
|
import com.kingfisher.deployment.audit.security.PasswordCodec;
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
public class IntegrationServerThread extends Thread {
|
|
14 |
|
|
|
15 |
|
private IIBRestClient iibRestClient;
|
|
16 |
|
|
|
17 |
|
private PasswordCodec passwordCodec;
|
|
18 |
|
|
|
19 |
|
private Instance instance;
|
|
20 |
|
|
|
21 |
|
private IntegrationServers integrationServers;
|
|
22 |
|
|
|
23 |
|
public IntegrationServerThread() {
|
|
24 |
|
super();
|
|
25 |
|
}
|
|
26 |
|
|
|
27 |
|
public IntegrationServerThread(IIBRestClient iibRestClient, PasswordCodec passwordCodec, Instance instance,
|
|
28 |
|
IntegrationServers integrationServers) {
|
|
29 |
|
super();
|
|
30 |
|
this.iibRestClient = iibRestClient;
|
|
31 |
|
this.passwordCodec = passwordCodec;
|
|
32 |
|
this.instance = instance;
|
|
33 |
|
this.integrationServers = integrationServers;
|
|
34 |
|
}
|
|
35 |
|
|
|
36 |
|
public Instance getInstance() {
|
|
37 |
|
return instance;
|
|
38 |
|
}
|
|
39 |
|
|
|
40 |
|
public void setInstance(Instance instance) {
|
|
41 |
|
this.instance = instance;
|
|
42 |
|
}
|
|
43 |
|
|
|
44 |
|
public IntegrationServers getIntegrationServers() {
|
|
45 |
|
return integrationServers;
|
|
46 |
|
}
|
|
47 |
|
|
|
48 |
|
public void setIntegrationServers(IntegrationServers integrationServers) {
|
|
49 |
|
this.integrationServers = integrationServers;
|
|
50 |
|
}
|
|
51 |
|
|
|
52 |
|
public void run() {
|
|
53 |
|
for (IntegrationServer integrationServer : integrationServers.getExecutionGroup()) {
|
|
54 |
|
Applications applications;
|
|
55 |
|
try {
|
|
56 |
|
applications = iibRestClient.getApplications(integrationServer.getName(), instance.getHost(),
|
|
57 |
|
instance.getApiPort(), instance.getApiUsername(),
|
|
58 |
|
passwordCodec.decrypt(instance.getApiPassword()));
|
|
59 |
|
System.out.println("calling execute 2");
|
|
60 |
|
Thread applicationThread = new Thread(
|
|
61 |
|
new ApplicationThread(iibRestClient, passwordCodec, instance, integrationServer, applications));
|
|
62 |
|
DeploymentStatusBuidler.pool.execute(applicationThread);
|
|
63 |
|
|
|
64 |
|
} catch (DeploymentAuditException e) {
|
|
65 |
|
}
|
|
66 |
|
}
|
|
67 |
|
}
|
|
68 |
|
|
|
69 |
|
} |