Skip to content

C
cms-ci-test
提交 2dd90e51 作者: 余乾开
操作

Merge branch 'develop'

上级 804af18d 219940fd
正在显示 包含 50 行增加 和 40 行删除
csm-service/cms-service-user/pom.xml
...@@ -79,11 +79,16 @@ ...@@ -79,11 +79,16 @@
<!-- <artifactId>spring-boot-starter-amqp</artifactId>--> <!-- <artifactId>spring-boot-starter-amqp</artifactId>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>com.github.xiaoymin</groupId> <!-- <groupId>com.github.xiaoymin</groupId>-->
<artifactId>knife4j-spring-boot-starter</artifactId> <!-- <artifactId>knife4j-spring-boot-starter</artifactId>-->
<version>2.0.5</version> <!-- <version>2.0.5</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.github.xiaoymin</groupId>-->
<!-- <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>-->
<!-- <version>4.0.0</version>-->
<!-- </dependency>-->
</dependencies> </dependencies>
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/config/Knife4jConfiguration.java
package com.mmc.iuav.user.config; package com.mmc.iuav.user.config;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
...@@ -9,15 +8,14 @@ import springfox.documentation.builders.RequestHandlerSelectors; ...@@ -9,15 +8,14 @@ import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/** /**
* @author:zhenjie * @author: zj
* @Date:2023/5/16 10:07 * @Date: 2023/5/16 10:07
*/ */
@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2WebMvc
@EnableKnife4j
public class Knife4jConfiguration { public class Knife4jConfiguration {
@Bean(value = "defaultApi2") @Bean(value = "defaultApi2")
...@@ -37,7 +35,7 @@ public class Knife4jConfiguration { ...@@ -37,7 +35,7 @@ public class Knife4jConfiguration {
return new ApiInfoBuilder() return new ApiInfoBuilder()
.title("iuav用户相关") .title("iuav用户相关")
.description("swagger-bootstrap-ui-demo RESTful APIs") .description("swagger-bootstrap-ui-demo RESTful APIs")
.termsOfServiceUrl("https://www.iuav.com/") .termsOfServiceUrl("https://iuav.mmcuav.cn/")
.contact("group@qq.com") .contact("group@qq.com")
.version("1.0") .version("1.0")
.build(); .build();
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java
...@@ -43,6 +43,7 @@ public class AuthServiceImpl implements AuthService { ...@@ -43,6 +43,7 @@ public class AuthServiceImpl implements AuthService {
if (wxLoginVO.getFromPort().toString().equals(WxConstant.APP.toString())) { if (wxLoginVO.getFromPort().toString().equals(WxConstant.APP.toString())) {
//调用小程序登录接口，里面包含unionId //调用小程序登录接口，里面包含unionId
String appWxJson = wxService.appLogin(wxLoginVO); String appWxJson = wxService.appLogin(wxLoginVO);
log.error("wx appLogin msg==>" + appWxJson);
if (appWxJson == null) { if (appWxJson == null) {
return ResultBody.error(ResultEnum.APPLET_PORT_TYPE_ERROR); return ResultBody.error(ResultEnum.APPLET_PORT_TYPE_ERROR);
} }
...@@ -56,6 +57,7 @@ public class AuthServiceImpl implements AuthService { ...@@ -56,6 +57,7 @@ public class AuthServiceImpl implements AuthService {
}else if (wxLoginVO.getFromPort().equals(WxConstant.WEB)){ }else if (wxLoginVO.getFromPort().equals(WxConstant.WEB)){
//获取access_token接口，里面包含unionId //获取access_token接口，里面包含unionId
String pcWxJson = wxService.pcLogin(wxLoginVO); String pcWxJson = wxService.pcLogin(wxLoginVO);
log.error("wx pcLogin msg==>" + pcWxJson);
if (pcWxJson == null) { if (pcWxJson == null) {
return ResultBody.error(ResultEnum.APPLET_PORT_TYPE_ERROR); return ResultBody.error(ResultEnum.APPLET_PORT_TYPE_ERROR);
} }
......
csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
<insert id="insertUserAccount" parameterType="com.mmc.iuav.user.entity.UserAccountDO" <insert id="insertUserAccount" parameterType="com.mmc.iuav.user.entity.UserAccountDO"
useGeneratedKeys="true" keyProperty="id"> useGeneratedKeys="true" keyProperty="id">
insert into user_account(account_type, uid, phone_num, user_name, nick_name, user_img, open_id, union_id, user_sex, email, source, remark, port_type, create_time) insert into user_account(account_type, uid, phone_num, user_name, nick_name, user_img, open_id, union_id, user_sex, email, source, remark, port_type, create_time)
values(#{accountType}, #{uid}, #{phoneNum}, #{userName}, #{nickName}, #{userImg}, #{userImg}, #{openId}, #{unionId}, #{userSex}, #{email}, #{source}, #{accountStatus}, values(#{accountType}, #{uid}, #{phoneNum}, #{userName}, #{nickName}, #{userImg}, #{openId}, #{unionId}, #{userSex}, #{email}, #{source}, #{remark}, #{portType}, NOW())
#{remark}, #{portType}, NOW())
</insert> </insert>
<update id="update" parameterType="com.mmc.iuav.user.entity.UserAccountDO"> <update id="update" parameterType="com.mmc.iuav.user.entity.UserAccountDO">
......
kustomization/overlays/dev/kustomization.yaml
...@@ -17,4 +17,4 @@ patches: ...@@ -17,4 +17,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
newTag: f7a05f090867073c2df65e5a2c32bfe262fbfd0f newTag: 0c074fb210695fac5fe2f75a806cdaf7bd446a6c
pom.xml
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
<dependencies> <dependencies>
<!-- lombok 工具通过在代码编译时期动态的将注解替换为具体的代码, IDEA 需要添加 lombok 插件 --> <!-- lombok 工具通过在代码编译时期动态的将注解替换为具体的代码, IDEA 需要添加 lombok 插件 -->
<dependency> <!-- <dependency>-->
<groupId>org.projectlombok</groupId> <!-- <groupId>org.projectlombok</groupId>-->
<artifactId>lombok</artifactId> <!-- <artifactId>lombok</artifactId>-->
<version>1.18.20</version> <!-- <version>1.18.20</version>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
...@@ -50,27 +50,33 @@ ...@@ -50,27 +50,33 @@
</dependency> </dependency>
<!-- swagger2 --> <!-- swagger2 -->
<dependency> <!-- <dependency>-->
<groupId>io.springfox</groupId> <!-- <groupId>io.springfox</groupId>-->
<artifactId>springfox-swagger2</artifactId> <!-- <artifactId>springfox-swagger2</artifactId>-->
<version>2.8.0</version> <!-- <version>2.8.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>io.springfox</groupId> <!-- <groupId>io.springfox</groupId>-->
<artifactId>springfox-swagger-ui</artifactId> <!-- <artifactId>springfox-swagger-ui</artifactId>-->
<version>2.8.0</version> <!-- <version>2.8.0</version>-->
</dependency> <!-- </dependency>-->
<!-- 引入swagger-bootstrap-ui包 --> <!-- &lt;!&ndash; 引入swagger-bootstrap-ui包 &ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>com.github.xiaoymin</groupId> <!-- <groupId>com.github.xiaoymin</groupId>-->
<artifactId>swagger-bootstrap-ui</artifactId> <!-- <artifactId>swagger-bootstrap-ui</artifactId>-->
<version>1.8.5</version> <!-- <version>1.8.5</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-bean-validators</artifactId>-->
<!-- <version>${springfox.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-bean-validators</artifactId> <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>${springfox.version}</version> <version>4.0.0</version>
</dependency> </dependency>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论