CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CY:b74323dfccfb9bb59554c6a6a5771122f1f4088b
Branches Tags
CY:feature/admin
CY:feature/community-center
CY:preview
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment
..
compare: CY:f1acb5c18327291092348ce40ae7343cd7d87580
Branches Tags
CY:feature/admin
CY:feature/community-center
CY:preview
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment

No commits in common. "b74323dfccfb9bb59554c6a6a5771122f1f4088b" and "f1acb5c18327291092348ce40ae7343cd7d87580" have entirely different histories.
b74323dfcc ... f1acb5c183

9 changed files with 23 additions and 48 deletions
Show Stats Expand all files Collapse all files

3
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/DownloadRecordController.java
View File

@ -6,6 +6,7 @@ import com.mcwl.resource.domain.request.RequestDownload;
import com.mcwl.resource.domain.vo.PageVo;
import com.mcwl.resource.service.impl.DownloadRecordServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -78,7 +79,7 @@ public class DownloadRecordController {
return downloadRecordService.deleteDownloadRecord(ids);
}
@ApiOperation(value = "根据文件名查询详情")
@ApiModelProperty(value = "根据文件名查询详情")
@PostMapping("/selectFileByName")
public R selectByFileName(@RequestBody RequestDownload requestDownload){

5
mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysLoginController.java
View File

@ -3,7 +3,6 @@ package com.mcwl.web.controller.system;
import com.alibaba.fastjson2.JSONObject;
import com.mcwl.common.annotation.Anonymous;
import com.mcwl.common.constant.Constants;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.constant.QueueConstants;
import com.mcwl.common.constant.RedisConstants;
import com.mcwl.common.core.domain.AjaxResult;
@ -61,13 +60,13 @@ public class SysLoginController
public AjaxResult code(@RequestParam String phone){
if (StringUtils.isEmpty(phone)){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"请输入手机号");
return AjaxResult.error("请输入手机号");
}
//校验验证码是否存在
if (redisCache.hasKey(RedisConstants.CODE_PHONE+phone)){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"请勿重复发送");
return AjaxResult.error("请勿重复发送");
}
//生成验证码

14
mcwl-common/pom.xml
View File

@ -408,20 +408,6 @@
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- &lt;!&ndash; 微信公众号扫码登录需要 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.github.binarywang</groupId>-->
<!-- <artifactId>weixin-java-mp</artifactId>-->
<!-- <version>4.4.0</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; 微信公众号扫码登录需要 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.github.binarywang</groupId>-->
<!-- <artifactId>wx-java-mp-spring-boot-starter</artifactId>-->
<!-- <version>4.4.0</version>-->
<!-- </dependency>-->
</dependencies>
<repositories>

3
mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java
View File

@ -165,8 +165,7 @@ public class SecurityConfig {
"/personalCenter/selectByUserIdImage",
"/personalCenter/likeModel",
"/personalCenter/likeWorkFlow",
"/personalCenter/likeImage",
"/api/ucenter/wx/**"
"/personalCenter/likeImage"
).permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

3
mcwl-resource/src/main/java/com/mcwl/resource/domain/DownloadRecord.java
View File

@ -104,7 +104,4 @@ public class DownloadRecord {
@ApiModelProperty(value = "下载类型（0模型 1工作流）")
private Integer downloadType;
@ApiModelProperty(value = "触发词")
private String triggerWords;
}

6
mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java
View File

@ -135,12 +135,6 @@ public class ModelProduct extends BaseEntity {
@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
private String delFlag;
/**
* 是否收费
*/
@ApiModelProperty(value = "是否收费 0收费 1免费")
private Integer isFree;
/**
* 商品价格
*/

14
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/DownloadRecordServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.mcwl.resource.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mcwl.common.constant.DictConstants;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.utils.SecurityUtils;
@ -11,6 +12,7 @@ import com.mcwl.resource.domain.request.RequestDownload;
import com.mcwl.resource.domain.vo.PageVo;
import com.mcwl.resource.mapper.*;
import com.mcwl.resource.service.DownloadRecordService;
import com.mcwl.system.init.DictInit;
import com.mcwl.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -169,12 +171,12 @@ public class DownloadRecordServiceImpl implements DownloadRecordService {
}
List<DownloadRecord> downloadRecords = downloadRecordMapper.selectList(wrapper);
// if (requestDownload.getType() != 999){
// //翻译底模
// for (DownloadRecord downloadRecord : downloadRecords) {
// downloadRecord.setModelVersionType(DictInit.getDictValue(DictConstants.MODE_VERSION_TYPE,downloadRecord.getModelVersionType()));
// }
// }
if (requestDownload.getType() != 999){
//翻译底模
for (DownloadRecord downloadRecord : downloadRecords) {
downloadRecord.setModelVersionType(DictInit.getDictValue(DictConstants.MODE_VERSION_TYPE,downloadRecord.getModelVersionType()));
}
}
return R.ok(downloadRecords);
}

13
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/FileServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.mcwl.resource.service.impl;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.utils.StringUtils;
@ -34,7 +33,7 @@ public class FileServiceImpl implements FileService {
if (StringUtils.isEmpty(type)){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"请输入type");
return AjaxResult.error("请输入type");
}
if (type.equals("model")) {
@ -42,7 +41,7 @@ public class FileServiceImpl implements FileService {
ModelVersion modelVersion = versionMapper.selectByEncryptionFileName(name);
if (modelVersion == null) {
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件不存在");
return AjaxResult.error("文件不存在");
}
return AjaxResult.success(modelVersion);
@ -50,13 +49,13 @@ public class FileServiceImpl implements FileService {
WorkFlowVersion workFlowVersion = workFlowVersionMapper.selectByFileName(name);
if (workFlowVersion == null) {
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件不存在");
return AjaxResult.error("文件不存在");
}
return AjaxResult.success(workFlowVersion);
}
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"type不合法");
return AjaxResult.error("type不合法");
}
@Override
@ -64,7 +63,7 @@ public class FileServiceImpl implements FileService {
if (StringUtils.isEmpty(type)){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"请输入type");
return AjaxResult.error("请输入type");
}
if (type.equals("model")) {
@ -85,7 +84,7 @@ public class FileServiceImpl implements FileService {
return AjaxResult.success(1);
}
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"type不合法");
return AjaxResult.error("type不合法");
}

10
mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.mcwl.system.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.mcwl.common.annotation.DataScope;
import com.mcwl.common.constant.CacheConstants;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.constant.UserConstants;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.entity.SysRole;
@ -640,7 +639,7 @@ public class SysUserServiceImpl implements ISysUserService
if (3<=s){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"次数上限");
return AjaxResult.error("次数上限");
}else {
//次数+1
s++;
@ -654,7 +653,7 @@ public class SysUserServiceImpl implements ISysUserService
//查看身份证是否唯一
SysUser user = userMapper.selectByIdCard(sysUser.getIdCard());
if (user != null){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"该信息已绑定");
return AjaxResult.error("该信息已绑定");
}
//校验
String s1 = VerifyCard.idCard(sysUser.getName(), sysUser.getIdCard());
@ -662,13 +661,12 @@ public class SysUserServiceImpl implements ISysUserService
Integer code = jsonObject.getInteger("code");
if (code != 200){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,jsonObject.getString("msg"));
return AjaxResult.error(jsonObject.getString("msg"));
}
JSONObject data = jsonObject.getJSONObject("data");
String desc = data.getString("desc");
if (desc.equals("不一致")){
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"请填写正确信息");
return AjaxResult.error("请填写正确信息");
}
log.info("实名认证校验的结果:{}",s1);
//修改数据库