1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/KouzhaoInfoServiceImpl.java

@@ -66,7 +66,6 @@ public class KouzhaoInfoServiceImpl implements IKouzhaoInfoService {
         if (!StringUtils.isEmpty(gmtCreate)) {
             wrapper.eq("gmt_create", gmtCreate);
         }
-        wrapper.eq("delete_flag", 0);
         List<KouzhaoInfo> list = kouzhaoInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         Integer count = kouzhaoInfoMapper.selectCount(wrapper);
         return new Page<KouzhaoInfo>(list, page, limit, count);
@@ -75,7 +74,7 @@ public class KouzhaoInfoServiceImpl implements IKouzhaoInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(String id) {
-        kouzhaoInfoMapper.deleteById(id);
+        kouzhaoInfoMapper.delete(new EntityWrapper<KouzhaoInfo>().eq("id",id));
         return true;
     }
 

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/market/IKouzhaoInfoAppService.java

@@ -21,12 +21,11 @@ import java.util.Date;
 @HttpOpenApi(group = "kouzhaoInfo", description = "口罩信息")
 public interface IKouzhaoInfoAppService {
 	@HttpMethod(description = "新增")
-	public Boolean add(@NotNull @HttpParam(name = "kouzhaoInfo", type = HttpParamType.COMMON, description = "口罩信息") KouzhaoInfo kouzhaoInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "kouzhaoInfo", type = HttpParamType.COMMON, description = "口罩信息") KouzhaoInfo kouzhaoInfo)throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:kouzhao:kouzhaoInfo:list",permissionParentName = "宠物管理", permissionName = "口罩信息管理")
+	@HttpMethod(description = "列表")
 	public Page<KouzhaoInfo> list(
-								@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+			@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
 							@HttpParam(name = "numberOrder", type = HttpParamType.COMMON, description = "编号") String numberOrder,
 							@HttpParam(name = "name", type = HttpParamType.COMMON, description = "昵称") String name,
 							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "电话") String phone,

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/market/KouzhaoInfoServiceAppImpl.java

@@ -30,7 +30,7 @@ public class KouzhaoInfoServiceAppImpl implements IKouzhaoInfoAppService {
     private KouzhaoInfoMapper kouzhaoInfoMapper;
 
     @Override
-    public Boolean add(KouzhaoInfo kouzhaoInfo, Long adminId) throws ServiceException {
+    public Boolean add(KouzhaoInfo kouzhaoInfo) throws ServiceException {
         Date now = new Date();
         kouzhaoInfo.setGmtCreate(now);
         kouzhaoInfo.setGmtUpdate(now);
@@ -79,7 +79,6 @@ public class KouzhaoInfoServiceAppImpl implements IKouzhaoInfoAppService {
         if (!StringUtils.isEmpty(gmtCreate)) {
             wrapper.eq("gmt_create", gmtCreate);
         }
-        wrapper.eq("delete_flag", 0);
         List<KouzhaoInfo> list = kouzhaoInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         Integer count = kouzhaoInfoMapper.selectCount(wrapper);
         return new Page<KouzhaoInfo>(list, page, limit, count);

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/user/UserService.java

@@ -43,7 +43,7 @@ public interface UserService {
     @HttpMethod(description = "用户登录")
     public UserDTO login(
             @NotNull @HttpParam(name = "phone", type = HttpParamType.COMMON, description = "用户手机号") String phone,
-            @NotNull @TextFormat(lengthMin = 8,lengthMax = 18,notChinese = true) @HttpParam(name = "password", type = HttpParamType.COMMON, description = "用户密码") String password,
+            @NotNull @HttpParam(name = "password", type = HttpParamType.COMMON, description = "用户密码") String password,
             @HttpParam(name = "loginType", type = HttpParamType.COMMON, description = "登录方式") Integer loginType,
             @HttpParam(name = "raw", type = HttpParamType.COMMON, description = "第三方平台返回的数据") String raw,
             @NotNull @HttpParam(name = "ip", type = HttpParamType.IP, description = "登录IP") String ip) throws ServiceException;

unimall-launcher/src/main/resources/application.properties

@@ -4,15 +4,15 @@ server.servlet.multipart.maxRequestSize=100MB
 
 logging.path=/Users/dyl/Desktop/jialebao/logs
 logging.file=unimall.log
-logging.level.root=info
+logging.level.root=debug
 
 ########################################################
 ###MySql (MySqlConfiguration)
 ########################################################
 spring.druid.driverClassName=com.mysql.jdbc.Driver
-spring.druid.url=jdbc:mysql://106.14.75.12/bancai?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
+spring.druid.url=jdbc:mysql://47.97.168.241/kouzhao?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
 spring.druid.username=root
-spring.druid.password=Ccj841968545
+spring.druid.password=007e30ac7c591406
 spring.druid.maxActive=30
 spring.druid.minIdle=5
 spring.druid.maxWait=10000