Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd4997ee

Browse files
committed
pull from dev
2 parentsa9070fa +19defb6 commitd4997ee

File tree

32 files changed

+703
-195
lines changed

32 files changed

+703
-195
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
1010
client/packages/lowcoder-plugin-demo/yarn.lock
1111
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
1212
application-dev.yml
13+
server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
14+
server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
15+
.vscode/settings.json
16+
.vscode/launch.json

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"activityBar.background":"#2A3012",
44
"titleBar.activeBackground":"#3B431A",
55
"titleBar.activeForeground":"#F9FAF2"
6-
}
6+
},
7+
"java.debug.settings.onBuildFailureProceed":true
78
}

‎server/api-service/README.md‎

Lines changed: 72 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,74 @@ If you don't have an available MongoDB, you can start a local MongoDB service wi
1414
docker run -d --name lowcoder-mongodb -p 27017:27017 -e MONGO_INITDB_DATABASE=lowcoder mongo
1515
```
1616

17-
Configure the MongoDB connection URI in the application-lowcoder.yml
18-
<imgsrc="../../docs/.gitbook/assets/server-setup-image1.png"/>
17+
Configure the MongoDB connection URI in theserver/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
18+
1919

2020
###Redis
2121

22-
If you don't have an availableMongoDB, you can start a local Redis service with docker:
22+
If you don't have an availableRedis, you can start a local Redis service with docker:
2323

2424
```shell
2525
docker run -d --name lowcoder-redis -p 6379:6379 redis
2626
```
2727

28-
Configure the Redis connection URI in the application-lowcoder.yml
29-
<imgsrc="../../docs/.gitbook/assets/server-setup-image2.png"/>
28+
Configure the Redis connection URI in the server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
3029

31-
##Build and starttheLowcoder server jar
30+
##ClonetheRepository
3231

33-
1. Clone Lowcoder repository
34-
2. Next, execute the following commands in sequence
32+
Now you can clone the Repository from Github:https://github.com/lowcoder-org/lowcoder
3533

3634
```shell
37-
cd server
38-
mvn clean package
39-
java -Dpf4j.mode=development -Dspring.profiles.active=lowcoder -Dpf4j.pluginsDir=lowcoder-plugins -jar lowcoder-server/target/lowcoder-server-1.0-SNAPSHOT.jar
35+
git@github.com:lowcoder-org/lowcoder.git
36+
```
37+
38+
##Using VS Code
39+
40+
Create a launch.json file in the .vscode folder of your new opened workspace.
41+
The contents should look like this:
42+
43+
```JSON
44+
{
45+
"version":"0.0.1",
46+
"configurations": [
47+
{
48+
"type":"java",
49+
"name":"ServerApplication",
50+
"request":"launch",
51+
"mainClass":"org.lowcoder.api.ServerApplication",
52+
"projectName":"Lowcoder API Service",
53+
"vmArgs":"-Dpf4j.mode=development -Dpf4j.pluginsDir=lowcoder-plugins -Dspring.profiles.active=lowcoder -XX:+AllowRedefinitionToAddDeleteMethods --add-opens java.base/java.nio=ALL-UNNAMED"
54+
}
55+
],
56+
}
4057
```
4158

42-
<imgsrc="../../docs/.gitbook/assets/server-setup-start.gif"/>
43-
Now, you can check the status of the service by visitinghttp://localhost:8080 through your browser. By default, you should see an HTTP 404 error.
59+
Important is here the command -Dspring.profiles.active= - as it is responsible for the selection of the right apllication settings file too.
60+
61+
##Start the debug locally
4462

45-
<imgsrc="../../docs/.gitbook/assets/server-setup-image3.png"/>
63+
Make sure that the apllication settings file contains the full local configuration you need. The apllication settings file is named application-\<profile>.yaml and reside in server/api-service/lowcoder-server/src/main/resources. The profile relates to your setting in the launch file. For example: -Dspring.profiles.active=lowcoder would make sure, lowcoder seeks the right config at application-lowcoder.yaml
4664

47-
##Start with IntelliJ IDEA
65+
Navigate to the file server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java
66+
This is the main class. Now you can use the IDE to "run" it or "debug it".
4867

49-
Configure the Run/Debug configuration as shown in the screenshot below, the version used in the screenshot is IntelliJ
50-
IDEA 2021.3.2 (Community Edition):
51-
<imgsrc="../../docs/.gitbook/assets/server-setup-image4.png"/>
52-
<imgsrc="../../docs/.gitbook/assets/server-setup-image5.png"/>
68+
You should see after approx a minute "Server Started" in the Logs and can then access the API viahttp://localhost:8080
69+
70+
Before v2.4.0 you will get a HTTP Status 404 (which is ok in case).
71+
72+
From v2.4.1 on you should see the status message:
73+
74+
```JSON
75+
{
76+
"code":1,
77+
"message":"Lowcoder API is up and runnig",
78+
"success":true
79+
}
80+
```
81+
82+
##Using IntelliJ IDEA
83+
84+
Configure the Run/Debug configuration as shown below.
5385

5486
<table>
5587
<tr>
@@ -73,8 +105,28 @@ IDEA 2021.3.2 (Community Edition):
73105
Next, execute the following commands in sequence
74106

75107
```shell
76-
cd server
108+
cd server/api-service
109+
77110
mvn clean package
78111
```
79112

80113
After Maven package runs successfully, you can start the Lowcoder server with IntelliJ IDEA.
114+
115+
116+
##Build and start the Lowcoder server jar
117+
118+
1. Clone Lowcoder repository
119+
2. Next, execute the following commands in sequence
120+
121+
```shell
122+
cd server/api-service
123+
124+
mvn clean package
125+
126+
java -Dpf4j.mode=development -Dspring.profiles.active=lowcoder -Dpf4j.pluginsDir=lowcoder-plugins -jar lowcoder-server/target/lowcoder-api-service.jar
127+
```
128+
129+
130+
Now, you can check the status of the service by visitinghttp://localhost:8080 through your browser.
131+
132+
For information on how to contribute to Lowcoder, please view our[Contribution Guide](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/opensource-contribution).

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
importorg.lowcoder.domain.organization.repository.OrganizationRepository;
1616
importorg.lowcoder.domain.organization.service.OrgMemberService;
1717
importorg.lowcoder.domain.permission.model.ResourceRole;
18+
importorg.lowcoder.domain.permission.model.ResourceType;
1819
importorg.lowcoder.domain.permission.service.ResourcePermissionService;
1920
importorg.lowcoder.domain.user.repository.UserRepository;
2021
importorg.lowcoder.domain.user.service.UserService;
@@ -93,7 +94,7 @@ public Mono<Application> publish(String applicationId) {
9394
@Override
9495
publicMono<Application>create(ApplicationnewApplication,StringvisitorId) {
9596
returnrepository.save(newApplication)
96-
.delayUntil(app ->resourcePermissionService.addApplicationPermissionToUser(app.getId(),visitorId,ResourceRole.OWNER));
97+
.delayUntil(app ->resourcePermissionService.addResourcePermissionToUser(app.getId(),visitorId,ResourceRole.OWNER,ResourceType.APPLICATION));
9798
}
9899

99100
/**

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleElementRelationService.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public interface BundleElementRelationService {
1111
Mono<Boolean>deleteByBundleIds(List<String>bundleIds);
1212

1313
Mono<Boolean>deleteByElementId(StringelementId);
14+
Mono<Boolean>deleteByBundleIdAndElementId(StringbundleId,StringelementId);
1415

1516
Mono<Void>create(StringbundleId,StringelementId);
1617

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleElementRelationServiceImpl.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ public Mono<Boolean> deleteByElementId(String elementId) {
2828
returnbiRelationService.removeAllBiRelationsByTargetId(BUNDLE_ELEMENT,elementId);
2929
}
3030

31+
@Override
32+
publicMono<Boolean>deleteByBundleIdAndElementId(StringbundleId,StringelementId) {
33+
returnbiRelationService.removeAllBiRelationsBySourceIdAndTargetId(BUNDLE_ELEMENT,bundleId,elementId);
34+
}
35+
3136
@Override
3237
publicMono<Void>create(StringbundleId,StringelementId) {
3338
returnbiRelationService.getBySourceId(BUNDLE_ELEMENT,bundleId)

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public interface BundleService {
1616

1717
Mono<Bundle>findById(Stringid);
1818

19-
Mono<Bundle>create(Bundlebundle);
19+
Mono<Bundle>create(Bundlebundle,StringuserId);
2020

2121
Flux<Bundle>findByUserId(StringbundleId);
2222

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleServiceImpl.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
importorg.lowcoder.domain.bundle.model.Bundle;
88
importorg.lowcoder.domain.bundle.model.BundleRequestType;
99
importorg.lowcoder.domain.bundle.repository.BundleRepository;
10+
importorg.lowcoder.domain.permission.model.ResourceRole;
11+
importorg.lowcoder.domain.permission.model.ResourceType;
12+
importorg.lowcoder.domain.permission.service.ResourcePermissionService;
1013
importorg.lowcoder.infra.annotation.NonEmptyMono;
1114
importorg.lowcoder.infra.mongo.MongoUpsertHelper;
1215
importorg.lowcoder.sdk.constants.FieldName;
@@ -30,6 +33,7 @@ public class BundleServiceImpl implements BundleService {
3033

3134
privatefinalBundleRepositoryrepository;
3235
privatefinalMongoUpsertHelpermongoUpsertHelper;
36+
privatefinalResourcePermissionServiceresourcePermissionService;
3337

3438
@Override
3539
publicMono<Boolean>updateById(Stringid,Bundleresource) {
@@ -51,8 +55,9 @@ public Mono<Bundle> findById(String id) {
5155
}
5256

5357
@Override
54-
publicMono<Bundle>create(Bundlebundle) {
55-
returnrepository.save(bundle);
58+
publicMono<Bundle>create(Bundlenewbundle,StringvisitorId) {
59+
returnrepository.save(newbundle)
60+
.delayUntil(bundle ->resourcePermissionService.addResourcePermissionToUser(bundle.getId(),visitorId,ResourceRole.OWNER,ResourceType.BUNDLE));
5661
}
5762

5863
@Override

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ Mono<Boolean> addDataSourcePermissionToUser(String dataSourceId,
3434
StringuserId,
3535
ResourceRolerole);
3636

37-
Mono<Boolean>addApplicationPermissionToUser(StringapplicationId,
37+
Mono<Boolean>addResourcePermissionToUser(StringresourceId,
3838
StringuserId,
39-
ResourceRolerole);
39+
ResourceRolerole,
40+
ResourceTypetype);
4041

4142
Mono<Boolean>addApplicationPermissionToGroup(StringapplicationId,
4243
StringgroupId,

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionServiceImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,11 @@ public Mono<Boolean> addDataSourcePermissionToUser(String dataSourceId,
9898
}
9999

100100
@Override
101-
publicMono<Boolean>addApplicationPermissionToUser(StringapplicationId,
101+
publicMono<Boolean>addResourcePermissionToUser(StringresourceId,
102102
StringuserId,
103-
ResourceRolerole) {
104-
returnaddPermission(ResourceType.APPLICATION,applicationId,ResourceHolder.USER,userId,role);
103+
ResourceRolerole,
104+
ResourceTypetype) {
105+
returnaddPermission(type,resourceId,ResourceHolder.USER,userId,role);
105106
}
106107

107108
@Override

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp