20191016 添加feign接口

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java

+package com.pica.cloud.account.account.client;
+
+import com.pica.cloud.account.account.common.req.EncryptEntity;
+import com.pica.cloud.account.account.common.req.LoginResult;
+import com.pica.cloud.account.account.common.req.OCINRequest;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * Created on 2019/10/16 17:28
+ * author:crs
+ * Description:RegisterClient
+ */
+@FeignClient(name = "13201-pica-cloud-account")
+public interface RegisterClient {
+
+    @PostMapping(value = "/account/register")
+    PicaResponse<LoginResult> register(@RequestBody EncryptEntity entity);
+
+    @PostMapping(value = "/account/register/ocin")
+    PicaResponse register(@RequestBody OCINRequest ocinRequest);
+
+}

common/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-common</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>pica-cloud-account-common</name>
     <packaging>jar</packaging>
 

common/src/main/java/com/pica/cloud/account/account/common/req/EncryptEntity.java

+package com.pica.cloud.account.account.common.req;
+
+/**
+ * 加解密数据模型
+ */
+public class EncryptEntity {
+
+    /**
+     * 加密后的密文
+     */
+    private String key;
+    /**
+     * 加密后的数据
+     */
+    private String content;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+//    @Override
+//    public String toString() {
+//        return "EncryptEntity{" +
+//                "key='" + key + '\'' +
+//                ", content='" + content + '\'' +
+//                '}';
+//    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/LoginResult.java

+package com.pica.cloud.account.account.common.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created on 2019/10/9 17:41
+ * author:crs
+ * Description: 登录状态返回
+ */
+@ApiModel
+
+public class LoginResult {
+    @ApiModelProperty("token")
+    private String token;
+    @ApiModelProperty("用户id")
+    private Long userId;
+    @ApiModelProperty("是否绑定")
+    private String bindFlag;
+    @ApiModelProperty("联合登录id")
+    private String unionId;
+    @ApiModelProperty("是否完善过信息，1.信息未补全， 2信息已补全，3已补全密码")
+    private int entireFlag;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getBindFlag() {
+        return bindFlag;
+    }
+
+    public void setBindFlag(String bindFlag) {
+        this.bindFlag = bindFlag;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
+    public int getEntireFlag() {
+        return entireFlag;
+    }
+
+    public void setEntireFlag(int entireFlag) {
+        this.entireFlag = entireFlag;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/req/OCINRequest.java → common/src/main/java/com/pica/cloud/account/account/common/req/OCINRequest.java

-package com.pica.cloud.account.account.server.req;
+package com.pica.cloud.account.account.common.req;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 public class OCINRequest {
     public String mobile;
     private String name;
-    private Integer type;
     private Integer hospitalId;
     private Integer flag;
     @ApiModelProperty("产品线类型")
@@ -36,13 +35,6 @@ public class OCINRequest {
         this.name = name;
     }
 
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
 
     public Integer getHospitalId() {
         return hospitalId;

server/pom.xml

@@ -122,7 +122,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>

server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java

@@ -4,7 +4,7 @@ import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LoginResult;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.req.BaseRequest;
-import com.pica.cloud.account.account.server.req.OCINRequest;
+import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
@@ -42,14 +42,10 @@ public class RegisterController extends AccountBaseController {
         return PicaResponse.toResponse(result);
     }
 
-
+    //"sourceType":6 表示长海项目
     @ApiOperation("OCIN项目")
     @PostMapping(value = "/ocin")
     public PicaResponse register(@RequestBody OCINRequest ocinRequest) throws Exception {
-        ocinRequest.setFlag(AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode());
-        ocinRequest.setProductType(super.getProductType());
-        ocinRequest.setSourceType(super.getSourceType());
-        ocinRequest.setLoginIp(super.getIpAddr());
         registerService.ocinRegister(ocinRequest);
         return PicaResponse.toResponse();
     }

server/src/main/java/com/pica/cloud/account/account/server/service/RegisterService.java

@@ -2,7 +2,7 @@ package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.entity.LoginResult;
 import com.pica.cloud.account.account.server.req.BaseRequest;
-import com.pica.cloud.account.account.server.req.OCINRequest;
+import com.pica.cloud.account.account.common.req.OCINRequest;
 
 
 public interface RegisterService {

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

 package com.pica.cloud.account.account.server.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountAgreementEnum;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
@@ -12,7 +10,7 @@ import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.*;
 import com.pica.cloud.account.account.server.queue.QueueProducer;
 import com.pica.cloud.account.account.server.req.BaseRequest;
-import com.pica.cloud.account.account.server.req.OCINRequest;
+import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -29,9 +27,7 @@ import org.springframework.stereotype.Service;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 @Service

server/src/main/resources/bootstrap-dev.properties

@@ -7,6 +7,8 @@ spring.cloud.config.profile=dev
 spring.cloud.config.label=publish
 spring.cloud.config.discovery.enabled=true
 spring.cloud.config.discovery.service-id=config-server
+
+spring.application.doctor.name=11101-pica-cloud-doctor
 #eureka settings
 eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
 eureka.client.service-url.defaultZone=http://192.168.110.120:7891/eureka/,http://192.168.110.121:7891/eureka/

server/src/main/resources/bootstrap-prod.properties

 server.port=13201
 server.context-path=/account
 spring.application.name=${server.port}-pica-cloud-account
+spring.application.doctor.name=11101-pica-cloud-doctor
 
 #config server settings
 spring.cloud.config.name=com.pica.cloud.account

server/src/main/resources/bootstrap-test1.properties

 server.port=13201
 server.context-path=/account
 spring.application.name=${server.port}-pica-cloud-account
-
+spring.application.doctor.name=11101-pica-cloud-doctor
 #config server settings
 spring.cloud.config.name=com.pica.cloud.account
 spring.cloud.config.profile=test1

server/src/main/resources/bootstrap-test2.properties

 server.port=13201
 server.context-path=/account
 spring.application.name=${server.port}-pica-cloud-account
-
+spring.application.doctor.name=11101-pica-cloud-doctor
 #config server settings
 spring.cloud.config.name=com.pica.cloud.account
 spring.cloud.config.profile=test2

server/src/main/resources/bootstrap-uat.properties

 server.port=13201
 server.context-path=/account
 spring.application.name=${server.port}-pica-cloud-account
-
+spring.application.doctor.name=11101-pica-cloud-doctor
 #config server settings
 spring.cloud.config.name=com.pica.cloud.account
 spring.cloud.config.profile=uat