-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* update base.json * Split component JSON file * rm @JsonIgnore * Delete useless code * Comment Log * fix organ * fix task * update task model mpc-lr * update project * update task model JointStatisticalComponentTaskServiceImpl * add log * feat: mpc statistics component (#141) * 1.6.6 develop (#125) * add(sys):add collect api * fix(fusion):update fusion api * fix(csv):update csv api * update db * add fusion-simple * update fusion-simple * add resource field type grpc * update resource * update sqllite * add log * update sqllite * update task mpc lr * fix Collectors.toMap Duplicate key * delete db project column "secretkey_id" * Annotate trusted third-party code * update grpc param * update fusion * fix 推理 -- 协作方资源 * add 推理 模板 * update infer * fix * update infer * add 修改合作机构网关和公钥 * update data task resultPath * update model task * update change other organInfo * update NN * add health * add health path * update hfl-nn * update sync dataset * update organ resource * update data_set address * update change * update organ change * update model * update xml * update get model data * update fusion * update readme * add yaml * update base.json
- Loading branch information
Showing
84 changed files
with
1,906 additions
and
1,967 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
primihub-service/biz/src/main/java/com/primihub/biz/config/base/ComponentsConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.primihub.biz.config.base; | ||
|
|
||
| import com.alibaba.nacos.api.config.annotation.NacosConfigurationProperties; | ||
| import com.primihub.biz.entity.data.vo.ModelComponent; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @Component | ||
| @NacosConfigurationProperties(dataId = "components.json",autoRefreshed = true) | ||
| public class ComponentsConfiguration { | ||
| private List<ModelComponent> modelComponents; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 34 additions & 34 deletions
68
primihub-service/biz/src/main/java/com/primihub/biz/config/grpc/GrpcServerConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| package com.primihub.biz.config.grpc; | ||
|
|
||
| import com.primihub.biz.grpc.server.DataGrpcService; | ||
| import com.primihub.biz.grpc.server.TestGrpcService; | ||
| import com.primihub.biz.grpc.server.WorkGrpcService; | ||
| import com.primihub.biz.config.base.BaseConfiguration; | ||
| import io.grpc.Server; | ||
| import io.grpc.ServerBuilder; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| @Slf4j | ||
| @Configuration | ||
| public class GrpcServerConfiguration { | ||
|
|
||
| @Bean(name="grpcServer") | ||
| public Server initGrpcServer(BaseConfiguration baseConfiguration){ | ||
| Server server=ServerBuilder.forPort(baseConfiguration.getGrpcServerPort()) | ||
| .addService(new TestGrpcService()) | ||
| .addService(new WorkGrpcService()) | ||
| .addService(new DataGrpcService()) | ||
| .build(); | ||
| try { | ||
| server.start(); | ||
| } catch (IOException e) { | ||
| log.error("初始化GRPC端口失败",e); | ||
| } | ||
| return server; | ||
| } | ||
|
|
||
| } | ||
| //package com.primihub.biz.config.grpc; | ||
| // | ||
| //import com.primihub.biz.grpc.server.DataGrpcService; | ||
| //import com.primihub.biz.grpc.server.TestGrpcService; | ||
| //import com.primihub.biz.grpc.server.WorkGrpcService; | ||
| //import com.primihub.biz.config.base.BaseConfiguration; | ||
| //import io.grpc.Server; | ||
| //import io.grpc.ServerBuilder; | ||
| //import lombok.extern.slf4j.Slf4j; | ||
| //import org.springframework.context.annotation.Bean; | ||
| //import org.springframework.context.annotation.Configuration; | ||
| // | ||
| //import java.io.IOException; | ||
| // | ||
| //@Slf4j | ||
| //@Configuration | ||
| //public class GrpcServerConfiguration { | ||
| // | ||
| // @Bean(name="grpcServer") | ||
| // public Server initGrpcServer(BaseConfiguration baseConfiguration){ | ||
| // Server server=ServerBuilder.forPort(baseConfiguration.getGrpcServerPort()) | ||
| // .addService(new TestGrpcService()) | ||
| // .addService(new WorkGrpcService()) | ||
| // .addService(new DataGrpcService()) | ||
| // .build(); | ||
| // try { | ||
| // server.start(); | ||
| // } catch (IOException e) { | ||
| // log.error("初始化GRPC端口失败",e); | ||
| // } | ||
| // return server; | ||
| // } | ||
| // | ||
| //} |
1 change: 0 additions & 1 deletion
1
primihub-service/biz/src/main/java/com/primihub/biz/constant/CommonConstant.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| package com.primihub.biz.constant; | ||
|
|
||
| public class CommonConstant { | ||
| // sync Project api | ||
| public static final String PROJECT_SYNC_API_URL = "<address>/share/shareData/syncProject"; | ||
| public static final String MODEL_SYNC_API_URL = "<address>/share/shareData/syncModel"; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,4 +42,4 @@ public class MarketConstant { | |
| put("jobPosition_other","其他"); | ||
| }}; | ||
|
|
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.