Skip to content

P
pica-cloud-account
提交 e65e006a 编写于 作者: xinxu.wang's avatar xinxu.wang
浏览文件
操作

Merge branch 'dev-removeOldResponse0822' into 'release' 

Dev remove old response0822

See merge request !136
上级 89036f0c 532e775e
流水线 #53796 已取消 于阶段
    隐藏空白字符变更
    内嵌 并排
    正在显示 包含 24 行增加 和 37 行删除
    client/pom.xml
    浏览文件 @ e65e006a
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-client</artifactId>
    <version>1.1.8-SNAPSHOT</version>
    <version>1.1.9-SNAPSHOT</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.1.8-SNAPSHOT</version>
    <version>1.1.9-SNAPSHOT</version>
    </dependency>
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    ......@@ -42,8 +42,9 @@
    </dependency>
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-entity</artifactId>
    <version>1.2.0</version>
    <artifactId>pica-cloud-utils</artifactId>
    <version>1.4.7</version>
    <scope>provided</scope>
    </dependency>
    </dependencies>
    ......
    client/src/main/java/com/pica/cloud/account/account/client/AccountDoctorClient.java
    浏览文件 @ e65e006a
    ......@@ -2,7 +2,7 @@ package com.pica.cloud.account.account.client;
    import com.pica.cloud.account.account.common.dto.CancelAccountDto;
    import com.pica.cloud.account.account.common.dto.QueryDoctorRole;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.PostMapping;
    import org.springframework.web.bind.annotation.RequestBody;
    ......
    client/src/main/java/com/pica/cloud/account/account/client/AccountInfoClient.java
    浏览文件 @ e65e006a
    ......@@ -4,7 +4,7 @@ import com.pica.cloud.account.account.common.dto.AccountWeChatInfoDto;
    import com.pica.cloud.account.account.common.req.AccountInfoReq;
    import com.pica.cloud.account.account.common.req.HospitalSaasUserListReq;
    import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import io.swagger.annotations.ApiOperation;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.*;
    ......
    client/src/main/java/com/pica/cloud/account/account/client/CaptchaClient.java
    浏览文件 @ e65e006a
    package com.pica.cloud.account.account.client;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.GetMapping;
    import org.springframework.web.bind.annotation.RequestParam;
    ......
    client/src/main/java/com/pica/cloud/account/account/client/LoginClient.java
    浏览文件 @ e65e006a
    package com.pica.cloud.account.account.client;
    import com.pica.cloud.account.account.common.req.LoginAppletReq;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.*;
    ......@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
    public interface LoginClient {
    @PostMapping("/account/login/QRCode")
    PicaResponse<String> loginQRCode(@RequestHeader(value = "token") String token,@RequestHeader(value = "user_token_tourist") String user_token_tourist);
    PicaResponse<String> loginQRCode(@RequestHeader(value = "token") String token, @RequestHeader(value = "user_token_tourist") String user_token_tourist);
    @PostMapping("/account/login/applet")
    PicaResponse<String> loginApplet(@RequestBody LoginAppletReq req);
    ......
    client/src/main/java/com/pica/cloud/account/account/client/PatHealthPackClient.java
    浏览文件 @ e65e006a
    ......@@ -2,7 +2,7 @@ package com.pica.cloud.account.account.client;
    import com.pica.cloud.account.account.common.req.*;
    import com.pica.cloud.account.account.common.resp.*;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.*;
    ......
    client/src/main/java/com/pica/cloud/account/account/client/PatientInfoClient.java
    浏览文件 @ e65e006a
    package com.pica.cloud.account.account.client;
    import com.pica.cloud.account.account.common.req.AcctPatInfoReq;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.GetMapping;
    import org.springframework.web.bind.annotation.PathVariable;
    ......
    client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java
    浏览文件 @ e65e006a
    ......@@ -7,7 +7,7 @@ import com.pica.cloud.account.account.common.req.LoginResult;
    import com.pica.cloud.account.account.common.req.OCINRequest;
    import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
    import com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.utils.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.PostMapping;
    import org.springframework.web.bind.annotation.RequestBody;
    ......
    common/pom.xml
    浏览文件 @ e65e006a
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.1.8-SNAPSHOT</version>
    <version>1.1.9-SNAPSHOT</version>
    <name>pica-cloud-account-common</name>
    <packaging>jar</packaging>
    ......
    server/c:/tomcat-log/-1-pica-cloud-account/info.log 已删除 100644 → 0
    浏览文件 @ 89036f0c
    [2023-05-26 11:10:42.328] [INFO ] [main] org.springframework.context.support.AbstractApplicationContext.prepareRefresh - Refreshing org.springframework.context.annotation.AnnotationConfigApplicationContext@48c4245d: startup date [Fri May 26 11:10:42 CST 2023]; root of context hierarchy
    [2023-05-26 11:10:42.635] [INFO ] [main] org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.<init> - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
    [2023-05-26 11:10:42.671] [INFO ] [main] org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker.postProcessAfterInitialization - Bean 'configurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$f6c6f5d1] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
    [2023-05-26 11:10:42.957] [INFO ] [main] org.springframework.cloud.netflix.eureka.InstanceInfoFactory.create - Setting initial instance status as: STARTING
    [2023-05-26 11:10:43.082] [INFO ] [main] com.netflix.discovery.DiscoveryClient.<init> - Initializing Eureka in region us-east-1
    [2023-05-26 11:10:43.258] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using JSON encoding codec LegacyJacksonJson
    [2023-05-26 11:10:43.258] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using JSON decoding codec LegacyJacksonJson
    [2023-05-26 11:10:43.423] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using XML encoding codec XStreamXml
    [2023-05-26 11:10:43.423] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using XML decoding codec XStreamXml
    [2023-05-26 11:10:43.697] [INFO ] [main] com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver.getClusterEndpoints - Resolving eureka endpoints via configuration
    [2023-05-26 11:10:43.726] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Disable delta property : false
    [2023-05-26 11:10:43.726] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Single vip registry refresh property : null
    [2023-05-26 11:10:43.726] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Force full registry fetch : false
    [2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Application is null : false
    [2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Registered Applications size is zero : true
    [2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Application version is -1: true
    [2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry - Getting all instance registry info from the eureka server
    [2023-05-26 11:10:43.932] [INFO ] [main] com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry - The response status is 200
    [2023-05-26 11:10:43.935] [INFO ] [main] com.netflix.discovery.DiscoveryClient.initScheduledTasks - Not registering with Eureka server per configuration
    [2023-05-26 11:10:43.941] [INFO ] [main] com.netflix.discovery.DiscoveryClient.<init> - Discovery Client initialized at timestamp 1685070643941 with initial instances count: 90
    [2023-05-26 11:10:44.219] [INFO ] [main] org.springframework.cloud.config.client.ConfigServicePropertySourceLocator.locate - Fetching config from server at: http://192.168.110.122:7892/
    [2023-05-26 11:10:45.415] [INFO ] [main] org.springframework.cloud.config.client.ConfigServicePropertySourceLocator.locate - Located environment: name=com.pica.cloud.account, profiles=[dev], label=publish, version=d0099e1dcf49dd68033b50965489f3dce8498752, state=null
    [2023-05-26 11:10:45.416] [INFO ] [main] org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration.initialize - Located property source: CompositePropertySource [name='configService', propertySources=[MapPropertySource {name='configClient'}, MapPropertySource {name='http://192.168.110.53/com.pica.cloud.account/pica-cloud-configuration.git/application-dev.properties'}]]
    server/pom.xml
    浏览文件 @ e65e006a
    ......@@ -167,7 +167,7 @@
    <dependency>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.1.8-SNAPSHOT</version>
    <version>1.1.9-SNAPSHOT</version>
    </dependency>
    <dependency>
    ......
    server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java
    浏览文件 @ e65e006a
    ......@@ -128,4 +128,6 @@ public interface DoctorMapper {
    @Param("loginTime") Date loginTime);
    String selectIdByOpenId(String openId);
    int updateDoctorLastLoginTime(@Param("userId") Integer userId);
    }
    \ No newline at end of file
    server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java
    浏览文件 @ e65e006a
    ......@@ -177,6 +177,7 @@ public class TokenUtils {
    //存储token：(token-doctor-1：用户数据)
    cacheClient.hset(value, key, valueInfo);
    }
    doctorMapper.updateDoctorLastLoginTime(account.getId().intValue());
    // } else {
    // cacheClient.hset(value, "token", newToken);
    // }
    ......
    server/src/main/resources/mybatis/DoctorMapper.xml
    浏览文件 @ e65e006a
    ......@@ -1105,4 +1105,10 @@
    where openid = #{openId} and delete_flag = 1
    limit 1
    </select>
    <update id="updateDoctorLastLoginTime" parameterType="Object">
    update p_doctor
    SET last_login_time = now()
    where id = #{userId}
    </update>
    </mapper>
    \ No newline at end of file
    Markdown 格式
    0% or
    您添加了 0 人 到此讨论。请谨慎行事。
    先完成此消息的编辑！
    想要评论请 注册 或