Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update wedpr_dml #119

Merged
merged 2 commits into from
Nov 4, 2024
Merged

update wedpr_dml #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077b3a8
complement log
cyjseagull Nov 4, 2024
5a030df
update wedpr_dml
cyjseagull Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/wedpr_ddl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ create table if not exists `wedpr_setting_template`(
primary key (`id`),
index name_index(`name`(128)),
index type_index(`type`(128)),
index agency_index(`agency`(128)
index agency_index(`agency`(128))
)ENGINE=InnoDB default charset=utf8mb4 default collate=utf8mb4_bin ROW_FORMAT=DYNAMIC;

CREATE TABLE if not exists `wedpr_dataset` (
Expand Down
2 changes: 1 addition & 1 deletion db/wedpr_dml.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- the Wizard algorithm template
insert into `wedpr_config_table`(`config_key`, `config_value`) values("wedpr_algorithm_templates", '{"version":"1.0","templates":[{"name":"PSI","title":"数据对齐","participateNumber":"2+","detail":"","version":"1.0"},{"name":"PIR","title":"匿踪查询","participateNumber":"1","detail":"","version":"1.0"},{"name":"SQL","title":"联表分析","participateNumber":"1+","detail":"","version":"1.0"},{"name":"MPC","title":"自定义计算","participateNumber":"1+","detail":"","version":"1.0"},{"name":"XGB_TRAINING","title":"SecureLGBM训练","participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"XGB_PREDICTING","title":"SecureLGBM预测","participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"LR_TRAINING","title":"SecureLR建模","participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"LR_PREDICTING","title":"SecureLR预测","participateNumber":"1+","needTagsProvider":true,"value":"LR_PREDICTING","detail":"","version":"1.0"}]}');
insert into `wedpr_config_table`(`config_key`, `config_value`) values("wedpr_algorithm_templates", '{"version":"1.0","templates":[{"name":"PSI","title":"数据对齐","supportable":true,"enable":true,"participateNumber":"2+","detail":"","version":"1.0"},{"name":"PIR","title":"匿踪查询","supportable":true,"enable":true,"participateNumber":"1","detail":"","version":"1.0"},{"name":"SQL","title":"联表分析","supportable":true,"enable":true,"participateNumber":"1+","detail":"","version":"1.0"},{"name":"MPC","title":"自定义计算","supportable":true,"enable":true,"participateNumber":"1+","detail":"","version":"1.0"},{"name":"XGB_TRAINING","title":"SecureLGBM训练","supportable":true,"enable":true,"participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"XGB_PREDICTING","title":"SecureLGBM预测","supportable":true,"enable":true,"participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"LR_TRAINING","title":"SecureLR建模","supportable":true,"enable":true,"participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"LR_PREDICTING","title":"SecureLR预测","supportable":true,"enable":true,"participateNumber":"1+","needTagsProvider":true,"detail":"","version":"1.0"},{"name":"PREPROCESSING","title":"数据预处理","supportable":true,"detail":"","version":"1.0"},{"name":"FEATURE_ENGINEERING","title":"特征工程","supportable":true,"detail":"","version":"1.0"}]}');


-- the jupyter related host settings
Expand Down
1 change: 1 addition & 0 deletions scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apt install fontconfig
7 changes: 6 additions & 1 deletion ...rc/main/java/com/webank/wedpr/components/user/controller/WedprUserRegisterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.webank.wedpr.components.user.service.WedprUserService;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
Expand All @@ -33,6 +35,7 @@
produces = {"application/json"})
@Slf4j
public class WedprUserRegisterController {
private static final Logger logger = LoggerFactory.getLogger(WedprUserRegisterController.class);

@Autowired private WedprUserService wedprUserService;

Expand Down Expand Up @@ -78,7 +81,9 @@ public WeDPRResponse imageCodeController() {
Constant.WEDPR_SUCCESS_MSG,
new WedprImageCodeResponse(randomToken, imageBase64));
} catch (Exception e) {
return new WeDPRResponse(Constant.WEDPR_FAILED, "验证码生成失败");
logger.warn("generate image code failed, error: ", e);
return new WeDPRResponse(
Constant.WEDPR_FAILED, "Generate image-code failed, error: " + e.getMessage());
}
}
}
Loading