fix:主从辅

master
chaiyapeng 2024-09-10 10:17:42 +08:00
parent 1212ffad82
commit 45c858e53b
10 changed files with 375 additions and 13 deletions

View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

View File

@ -4,15 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="87d22e42-e2bb-4de2-a28a-26a104a6bb79" name="更改" comment="fix:回测">
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-ali/data-mart-ali-server/src/main/java/com/muyu/data/mart/controller/ApiUserController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/src/main/java/com/muyu/data/mart/service/controller/RealNameController.java" afterDir="false" />
<list default="true" id="87d22e42-e2bb-4de2-a28a-26a104a6bb79" name="更改" comment="fix:类型转换">
<change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-ali/data-mart-ali-server/src/main/java/com/muyu/data/mart/remote/AliRemoteService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-ali/data-mart-ali-server/src/main/java/com/muyu/data/mart/remote/JuHeRemoteService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-ali/data-mart-ali-server/src/main/java/com/muyu/data/mart/service/impl/RealNameServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-common/src/main/java/com/muyu/data/mart/domain/ali/AliResult.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-common/src/main/java/com/muyu/data/mart/domain/ali/AliResultData.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-common/src/main/java/com/muyu/data/mart/domain/realname/ali/RealNameAliReq.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/data-mart/data-mart-common/src/main/java/com/muyu/data/mart/domain/realname/ali/RealNameAliResp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/src/main/java/com/muyu/data/mart/service/impl/RealNameServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/src/main/java/com/muyu/data/mart/service/impl/RealNameServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/data-mart/data-mart-juhe/data-mart-juhe-server/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/cloud-etl/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-etl/error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/cloud-etl/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-etl/info.log" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -23,6 +25,7 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
<option value="Interface" />
</list>
</option>
</component>
@ -59,10 +62,11 @@
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"Spring Boot.MarketApplication.executor": "Debug",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "D:/workspace/2112Ag6",
"last_opened_file_path": "D:/workspace/Three-Groups-2112/cloud-port/data-mart/data-mart-common/src/main/java/com/muyu/data/mart/domain",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@ -75,6 +79,12 @@
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\workspace\Three-Groups-2112\cloud-port\data-mart\data-mart-common\src\main\java\com\muyu\data\mart\domain" />
<recent name="D:\workspace\Three-Groups-2112\cloud-port\data-mart\data-mart-common\src\main\java\com\muyu\data\mart\domain\realname" />
</key>
</component>
<component name="RunDashboard">
<option name="configurationTypes">
<set>
@ -107,7 +117,8 @@
<option name="presentableId" value="Default" />
<updated>1725804093378</updated>
<workItem from="1725804094628" duration="2187000" />
<workItem from="1725843276538" duration="10103000" />
<workItem from="1725843276538" duration="11651000" />
<workItem from="1725930022178" duration="3165000" />
</task>
<task id="LOCAL-00001" summary="fix:回测">
<option name="closed" value="true" />
@ -117,7 +128,15 @@
<option name="project" value="LOCAL" />
<updated>1725868720883</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="fix:类型转换">
<option name="closed" value="true" />
<created>1725891457251</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1725891457251</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -126,6 +145,7 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<MESSAGE value="fix:回测" />
<option name="LAST_COMMIT_MESSAGE" value="fix:回测" />
<MESSAGE value="fix:类型转换" />
<option name="LAST_COMMIT_MESSAGE" value="fix:类型转换" />
</component>
</project>

View File

@ -0,0 +1,20 @@
package com.muyu.data.mart.remote;
import com.muyu.data.mart.domain.realname.RealNameReq;
import com.muyu.data.mart.domain.realname.RealNameResp;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @Authorchaiyapeng
* @Packagecom.muyu.data.mart.remote
* @Projectcloud-port
* @nameAliRemoteService
* @Date2024/9/10 10:08
*/
@FeignClient(value = "cloud-ali")
public interface AliRemoteService {
@PostMapping("/ali/real/name")
RealNameResp realName(RealNameReq realNameResp);
}

View File

@ -0,0 +1,20 @@
package com.muyu.data.mart.remote;
import com.muyu.data.mart.domain.realname.RealNameReq;
import com.muyu.data.mart.domain.realname.RealNameResp;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @Authorchaiyapeng
* @Packagecom.muyu.data.mart.remote
* @Projectcloud-port
* @nameJuHeRemoteService
* @Date2024/9/10 9:58
*/
@FeignClient(value = "cloud-juhe")
public interface JuHeRemoteService {
@PostMapping("/juhe/real/name")
public RealNameResp realName(RealNameReq realNameResp);
}

View File

@ -0,0 +1,61 @@
package com.muyu.data.mart.service.impl;
import com.muyu.data.mart.common.BasicApi;
import com.muyu.data.mart.domain.realname.RealNameReq;
import com.muyu.data.mart.domain.realname.RealNameResp;
import com.muyu.data.mart.remote.AliRemoteService;
import com.muyu.data.mart.remote.JuHeRemoteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashSet;
import java.util.Set;
/**
* @Authorchaiyapeng
* @Packagecom.muyu.data.mart.service.impl
* @Projectcloud-port
* @nameRealNameServiceImpl
* @Date2024/9/10 10:03
*/
@Service(value = "source-real-name")
public class RealNameServiceImpl implements BasicApi<RealNameReq, RealNameResp> {
@Resource
private JuHeRemoteService juHeRemoteService;
@Resource
private AliRemoteService aliRemoteService;
private static final Set<String> realNameSet=new HashSet<>(){{
add("张三-123456789123456712");
add("李四-123456789123456713");
add("王五-123456789123456714");
add("赵六-123456789123456715");
add("田七-123456789123456716");
}};
@Override
public RealNameResp send(RealNameReq realNameReq) {
//改为去数据库查询
String nameAndIdCard = realNameReq.getName() + "-" + realNameReq.getIdCard();
if (realNameSet.contains(nameAndIdCard)) {
// 如果存在,则返回验证失败的消息
return RealNameResp.builder()
.code("0")
.mag("验证成功")
.build();
}
//主从辅
RealNameResp realNameResp = juHeRemoteService.realName(realNameReq);
if (!realNameResp.getCode().equals(0) && !realNameResp.getMag().equals("成功")){
RealNameResp realNameResp1 = aliRemoteService.realName(realNameReq);
if (!realNameResp1.getCode().equals(1) && !realNameResp1.getMag().equals("认证成功")){
throw new RuntimeException("线路正在抢修中!!!");
}
return realNameResp1;
}else {
return realNameResp;
}
}
}

View File

@ -0,0 +1,28 @@
package com.muyu.data.mart.domain.ali;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Authorweiran
* @Packagecom.muyu.cloud.background.domin.ali
* @Projectcloud-background
* @nameAliResult
* @Date2024/9/5 20:24
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class AliResult<T> {
private String code;
private T data;
private String message;
private Long timestamp;
}

View File

@ -0,0 +1,25 @@
package com.muyu.data.mart.domain.ali;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Authorweiran
* @Packagecom.muyu.cloud.background.domin.ali
* @Projectcloud-background
* @nameAliResultData
* @Date2024/9/5 21:04
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class AliResultData {
private String result;
private String resultMsg;
}

View File

@ -0,0 +1,35 @@
package com.muyu.data.mart.domain.realname.ali;
import com.alibaba.fastjson2.annotation.JSONField;
import com.muyu.data.mart.domain.realname.RealNameReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Authorweiran
* @Packagecom.muyu.cloud.background.domin.realname.ali
* @Projectcloud-background
* @nameRealNameAliReq
* @Date2024/9/5 20:31
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class RealNameAliReq {
private String name;
@JSONField(name = "idcard")
private String idCard;
public static RealNameAliReq realNameAliReqBuild(RealNameReq realNameReq){
return RealNameAliReq.builder()
.name(realNameReq.getName())
.idCard(realNameReq.getIdCard())
.build();
}
}

View File

@ -0,0 +1,29 @@
package com.muyu.data.mart.domain.realname.ali;
import com.muyu.data.mart.domain.ali.AliResultData;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Authorweiran
* @Packagecom.muyu.cloud.background.domin.realname.ali
* @Projectcloud-background
* @nameRealNameAliResp
* @Date2024/9/5 20:50
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class RealNameAliResp {
private AliResultData resultData;
private String message;
private String seqNum;
private Integer status;
}

View File

@ -6,13 +6,13 @@ import com.muyu.data.mart.domain.realname.RealNameReq;
import com.muyu.data.mart.domain.realname.RealNameResp;
import com.muyu.data.mart.domain.realname.juhe.JuHeRealNameReq;
import com.muyu.data.mart.domain.realname.juhe.JuHeRealNameResp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;