-
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.
* 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 --------- Co-authored-by: fenghaolun <[email protected]> * Feature/center (#126) * fix: add logo display control * fix: field type * feat: node management refactoring * fix: remove permission * fix: icon * fix: resource size conversion * fix: document title * fix: eslint * feat: connection status * fix: status text * fix: cannot convert undefined or null to object * fix: status * feature: primihub big model * refactor: contact icon * feat: add pagination * fix: reconnect message * fix: reconnect * stash * feat: change organ info * fix: draft component * fix: change other organ info * fix: offline map * fix: reapply connect * Optimizing Dataset Queries (#127) * update fusion * 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 * add 修改合作机构网关和公钥 * update data task resultPath * update model task * update change other organInfo * update NN * add health * add health path * add health path * update hfl-nn * update sync dataset * update organ resource * update data_set address * update change * update organ change * update fusion * update xml * update get model data * update ftl * update organ * update organ * update resource --------- Co-authored-by: fenghaolun <[email protected]> * fix bug (#130) * fix: add logo display control * fix: field type * feat: node management refactoring * fix: remove permission * fix: icon * fix: resource size conversion * fix: document title * fix: eslint * feat: connection status * fix: status text * fix: cannot convert undefined or null to object * fix: status * feature: primihub big model * refactor: contact icon * feat: add pagination * fix: reconnect message * fix: reconnect * stash * feat: change organ info * fix: draft component * fix: change other organ info * fix: offline map * fix: reapply connect * fix: database import error * feat: resource list add user name * fix: select auth organs * fix: select organ auth * fix: psi task select other organ * fix: download model task result * fix: model evaluation score * fix: model type --------- Co-authored-by: Like habits <[email protected]> Co-authored-by: fenghaolun <[email protected]> Co-authored-by: zjj614 <[email protected]>
- Loading branch information
4 people
authored
May 31, 2023
1 parent
7aac926
commit 941b751
Showing
274 changed files
with
5,041 additions
and
31,189 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
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
25 changes: 0 additions & 25 deletions
25
primihub-fusion/fusion-api/src/main/java/com/primihub/config/FusionConfig.java
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
primihub-fusion/fusion-api/src/main/java/com/primihub/constant/SysConstant.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,9 @@ | ||
| package com.primihub.constant; | ||
|
|
||
| public class SysConstant { | ||
| public final static String GRPC_NODE_HASH_KEY = "grpc:node"; | ||
| public final static String GRPC_DATASET_KEY = "grpc:dataset:<id>"; | ||
| public final static String GRPC_DATASET_FIELD_EXPAND = "expand"; | ||
| public final static String GRPC_DATASET_FIELD_ADDRESS = "address"; | ||
| public final static String GRPC_DATASET_FIELD_DRIVER = "driver"; | ||
| } |
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
70 changes: 6 additions & 64 deletions
70
primihub-fusion/fusion-api/src/main/java/com/primihub/controller/FusionController.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,83 +1,25 @@ | ||
| package com.primihub.controller; | ||
|
|
||
| import com.primihub.entity.base.BaseResultEntity; | ||
| import com.primihub.entity.base.BaseResultEnum; | ||
| import com.primihub.entity.fusion.param.FusionOrganExtendsParam; | ||
| import com.primihub.entity.fusion.param.FusionConnectionParam; | ||
| import com.primihub.service.FusionService; | ||
| import com.primihub.service.OrganService; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.util.StringUtils; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RequestMapping("fusion") | ||
| @RestController | ||
| public class FusionController { | ||
|
|
||
| @Autowired | ||
| private FusionService fusionService; | ||
| private OrganService organService; | ||
|
|
||
| @RequestMapping("healthConnection") | ||
| public BaseResultEntity healthConnection(){ | ||
| return BaseResultEntity.success(System.currentTimeMillis()); | ||
| } | ||
|
|
||
| @RequestMapping("registerConnection") | ||
| public BaseResultEntity registerConnection(FusionConnectionParam fusionConnectionParam){ | ||
| if(fusionConnectionParam.getGlobalId()==null|| "".equals(fusionConnectionParam.getGlobalId())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"globalId"); | ||
| } | ||
| if(fusionConnectionParam.getGlobalName()==null|| "".equals(fusionConnectionParam.getGlobalName().trim())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"globalName"); | ||
| } | ||
| if(fusionConnectionParam.getPinCode()==null|| "".equals(fusionConnectionParam.getPinCode().trim())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"pinCode"); | ||
| } | ||
| if(fusionConnectionParam.getGatewayAddress()==null|| "".equals(fusionConnectionParam.getGatewayAddress().trim())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"gatewayAddress"); | ||
| } | ||
| if ("".equals(fusionConnectionParam.getPublicKey().trim())|| "".equals(fusionConnectionParam.getPrivateKey().trim())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"secret"); | ||
| } | ||
| return fusionService.registerConnection(fusionConnectionParam); | ||
| } | ||
|
|
||
| @RequestMapping("changeConnection") | ||
| public BaseResultEntity changeConnection(FusionConnectionParam fusionConnectionParam){ | ||
| if(fusionConnectionParam.getGlobalName()==null|| "".equals(fusionConnectionParam.getGlobalName().trim())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"globalName"); | ||
| } | ||
| if(fusionConnectionParam.getGatewayAddress()==null|| "".equals(fusionConnectionParam.getGatewayAddress())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"gatewayAddress"); | ||
| } | ||
| return fusionService.changeConnection(fusionConnectionParam); | ||
| } | ||
|
|
||
| @RequestMapping("findOrganByGlobalId") | ||
| public BaseResultEntity findOrganByGlobalId(String[] globalIdArray){ | ||
| if(globalIdArray==null||globalIdArray.length==0) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"globalIdArray"); | ||
| } | ||
| return fusionService.findOrganByGlobalId(globalIdArray); | ||
| @RequestMapping("organData") | ||
| public BaseResultEntity organData(String organId, String organName){ | ||
| return organService.organData(organId,organName); | ||
| } | ||
|
|
||
| @RequestMapping("changeOrganExtends") | ||
| public BaseResultEntity changeOrganExtends(FusionOrganExtendsParam param){ | ||
| if (StringUtils.isEmpty(param.getIp())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"ip"); | ||
| } | ||
| if (StringUtils.isEmpty(param.getLat())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"lat"); | ||
| } | ||
| if (StringUtils.isEmpty(param.getLon())) { | ||
| return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"lon"); | ||
| } | ||
| return fusionService.changeOrganExtends(param); | ||
| } | ||
|
|
||
| @RequestMapping("getOrganExtendsList") | ||
| public BaseResultEntity getOrganExtendsList(){ | ||
| return fusionService.getOrganExtendsList(); | ||
| } | ||
|
|
||
| } |
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.