diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
index 02b6223..d75292a 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
@@ -80,20 +80,16 @@ public class AppLoginController {
if (StringUtils.isNotEmpty(registerForm.getEmail())) {
//校验邮箱格式
- Assert.isTrue(MailUtil.validEmail(registerForm.getEmail()), "邮箱格式不正确") ;
-
- //校验邮箱是否已注册
+// Assert.isTrue(MailUtil.validEmail(registerForm.getEmail()), "邮箱格式不正确") ;
+ AppRegister appRegister = setAppRegister(registerForm);
+ //校验邮箱是否已注册
AppUser emailUser = appUserService.selectAppUserByEmail(registerForm.getEmail());
Assert.isNull(emailUser, "邮箱已注册");
- AppRegister appRegister = setAppRegister(registerForm);
- redisService.setCacheMapValue(IdUtils.fastUUID(),register.getEmail() , appRegister);
- appRegisterService.insertAppRegister(register);
-
- Assert.isNull(emailUser, "邮箱已注册");
+ redisService.setCacheMapValue(IdUtils.fastUUID(),registerForm.getEmail() , registerForm);
try {
String EM = "欢迎来到我们的服务！！
"
+ "请点击下面的网址确认您的注册:
"
- + "http://localhost:9204/app/activation/"+ IdUtils.fastUUID() + "/" + register.getEmail() + "
"
+ + "http://101.133.172.2:9204/app/activation/"+ IdUtils.fastUUID() + "/" + registerForm.getEmail() + "
"
+ "";
MailUtil.send_mail(registerForm.getEmail(), EM);
@@ -111,15 +107,15 @@ public class AppLoginController {
case 1:
return R.fail(201, "您的账号已通过");
case 2:
- return R.fail(201, "注册失败，您的账号已被驳回！");
+ appRegisterService.updateAppRegisterByPhone(register);
+ break;
}
+ }else{
+ AppRegister appRegister = setAppRegister(registerForm);
+ appRegister.setInvitationCode(registerForm.getInvitationCode());
+ int i = appRegisterService.insertAppRegister(appRegister);
+ Assert.isTrue(i > 0, "注册失败");
}
- AppRegister appRegister = setAppRegister(registerForm);
- appRegister.setInvitationCode(registerForm.getInvitationCode());
- int i = appRegisterService.insertAppRegister(appRegister);
-
-
- Assert.isTrue(i > 0, "注册失败");
}
return R.ok(null, "申请成功,请等待审核结果！");
}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java
new file mode 100644
index 0000000..74e5160
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java
@@ -0,0 +1,118 @@
+package com.ruoyi.app.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.app.domain.vo.AppSkillVo;
+import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.app.domain.AppSkill;
+import com.ruoyi.app.service.IAppSkillService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 标签信息Controller
+ *
+ * @author wyh
+ * @date 2024-05-24
+ */
+@RestController
+@RequestMapping("/app/skill")
+@Api(tags = "标签信息" , description = "标签信息")
+public class AppSkillController extends BaseController
+{
+ @Autowired
+ private IAppSkillService appSkillService;
+
+ /**
+ * 查询标签信息列表
+ */
+ @GetMapping("/list")
+ @ApiOperation(value = "查询标签信息", notes = "查询标签信息", httpMethod = "GET")
+ public TableDataInfo list(AppSkill appSkill)
+ {
+ startPage();
+ List list = appSkillService.selectAppSkillList(appSkill);
+
+ return getDataTable(list);
+ }
+
+ @GetMapping("/list/tree")
+ @ApiOperation(value = "查询标签信息", notes = "查询标签信息", httpMethod = "GET")
+ public AjaxResult listTree(AppSkill appSkill)
+ {
+ List list = appSkillService.selectAppSkillTreeList(appSkill);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 导出标签信息列表
+ */
+ @Log(title = "标签信息", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, AppSkill appSkill)
+ {
+ List list = appSkillService.selectAppSkillList(appSkill);
+ ExcelUtil util = new ExcelUtil(AppSkill.class);
+ util.exportExcel(response, list, "标签信息数据");
+ }
+
+ /**
+ * 获取标签信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ @ApiOperation(value = "获取标签信息详细信息", notes = "获取标签信息详细信息", httpMethod = "GET")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(appSkillService.selectAppSkillById(id));
+ }
+
+ /**
+ * 新增标签信息
+ */
+ @ApiOperation(value = "新增标签信息", notes = "新增标签信息", httpMethod = "POST")
+ @Log(title = "标签信息", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody AppSkill appSkill)
+ {
+ return toAjax(appSkillService.insertAppSkill(appSkill));
+ }
+
+ /**
+ * 修改标签信息
+ */
+ @ApiOperation(value = "修改标签信息", notes = "修改标签信息", httpMethod = "PUT")
+ @Log(title = "标签信息", businessType = BusinessType.UPDATE)
+ @PutMapping("/edit")
+ public AjaxResult edit(@RequestBody AppSkill appSkill)
+ {
+ return toAjax(appSkillService.updateAppSkill(appSkill));
+ }
+
+ /**
+ * 删除标签信息
+ */
+ @Log(title = "标签信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(appSkillService.deleteAppSkillByIds(ids));
+ }
+}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java
index 81c9dde..94c95e8 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java
@@ -54,6 +54,8 @@ public class AppTopicController extends BaseController
return success(list);
}
+
+
@GetMapping("/topicList")
@ApiOperation(value = "组装过查询话题信息列表", notes = "组装过查询话题信息列表", httpMethod = "GET")
public TableDataInfo topicList(AppTopic appTopic)
@@ -90,7 +92,6 @@ public class AppTopicController extends BaseController
/**
* 新增话题信息
*/
- @RequiresPermissions("app:topic:add")
@Log(title = "话题信息", businessType = BusinessType.INSERT)
@PostMapping(value = "/add")
@ApiOperation(value = "新增话题信息", notes = "新增话题信息", httpMethod = "POST")
@@ -102,7 +103,6 @@ public class AppTopicController extends BaseController
/**
* 修改话题信息
*/
- @RequiresPermissions("app:topic:edit")
@Log(title = "话题信息", businessType = BusinessType.UPDATE)
@PutMapping(value = "/edit")
@ApiOperation(value = "修改话题信息", notes = "修改话题信息", httpMethod = "PUT")
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
index acd0431..31551f3 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
@@ -522,7 +522,7 @@ public class PayController extends BaseController
AlipayTradeAppPayResponse result = null;
try {
//result = alipayService.startPay(orderNo,appOrderArg.getPrice(),appOrderArg.getLevel() == 2 ? 30 : (appOrderArg.getLevel() == 3 ? 365 : 0));
- result = alipayService.startPay(orderNo,appOrderArg.getPrice(),1);
+ result = alipayService.startPay(orderNo,appOrderArg.getPrice(),0);
} catch (AlipayApiException e) {
e.printStackTrace();
}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppSkill.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppSkill.java
new file mode 100644
index 0000000..e9a3c27
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppSkill.java
@@ -0,0 +1,85 @@
+package com.ruoyi.app.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 标签信息对象 app_skill
+ *
+ * @author wyh
+ * @date 2024-05-24
+ */
+public class AppSkill extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 话题id */
+ private Long id;
+
+ /** 标签内容 */
+ @Excel(name = "标签内容")
+ private String name;
+
+ /** 父级id */
+ @Excel(name = "父级id")
+ private Long parentId;
+
+ /** 类型：0-标签分类，1-标签内容 */
+ /** 类型：0-话题分类，1-话题数据 */
+ @Excel(name = "类型：0-话题分类，1-话题数据")
+ private String type;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+ public void setParentId(Long parentId)
+ {
+ this.parentId = parentId;
+ }
+
+ public Long getParentId()
+ {
+ return parentId;
+ }
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("name", getName())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("createBy", getCreateBy())
+ .append("updateBy", getUpdateBy())
+ .append("remark", getRemark())
+ .append("parentId", getParentId())
+ .append("type", getType())
+ .toString();
+ }
+}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppSkillVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppSkillVo.java
new file mode 100644
index 0000000..1b2bcc3
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppSkillVo.java
@@ -0,0 +1,15 @@
+package com.ruoyi.app.domain.vo;
+
+import com.ruoyi.app.domain.AppSkill;
+import com.ruoyi.app.domain.AppTopic;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AppSkillVo extends AppSkill {
+ private static final long serialVersionUID = 1L;
+
+ private List children = new ArrayList<>();
+}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java
index 3e49f92..ac0c38e 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java
@@ -62,4 +62,6 @@ public interface AppRegisterMapper
AppRegister selectAppRegisterByphone(@Param("phoneNumber")
String phoneNumber);
+
+ int updateAppRegisterByPhone(AppRegister appRegister);
}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java
new file mode 100644
index 0000000..1c10d9f
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.app.mapper;
+
+import java.util.List;
+import com.ruoyi.app.domain.AppSkill;
+
+/**
+ * 标签信息Mapper接口
+ *
+ * @author wyh
+ * @date 2024-05-24
+ */
+public interface AppSkillMapper
+{
+ /**
+ * 查询标签信息
+ *
+ * @param id 标签信息主键
+ * @return 标签信息
+ */
+ public AppSkill selectAppSkillById(Long id);
+
+ /**
+ * 查询标签信息列表
+ *
+ * @param appSkill 标签信息
+ * @return 标签信息集合
+ */
+ public List selectAppSkillList(AppSkill appSkill);
+
+ /**
+ * 新增标签信息
+ *
+ * @param appSkill 标签信息
+ * @return 结果
+ */
+ public int insertAppSkill(AppSkill appSkill);
+
+ /**
+ * 修改标签信息
+ *
+ * @param appSkill 标签信息
+ * @return 结果
+ */
+ public int updateAppSkill(AppSkill appSkill);
+
+ /**
+ * 删除标签信息
+ *
+ * @param id 标签信息主键
+ * @return 结果
+ */
+ public int deleteAppSkillById(Long id);
+
+ /**
+ * 批量删除标签信息
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteAppSkillByIds(Long[] ids);
+}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java
index 7fef5af..104c442 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java
@@ -68,7 +68,7 @@ public interface AppUserMapper
List selectList(AppUser appUser);
List listByOrderTime();
- void updateAppUserById(@Param("ids")List ids);
+ void updateAppUserById();
List listUser(AppUser appUser);
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java
index 1ba9256..e313ca7 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java
@@ -44,6 +44,8 @@ public interface IAppRegisterService
*/
public int updateAppRegister(AppRegister appRegister);
+ public int updateAppRegisterByPhone(AppRegister appRegister);
+
/**
* 批量删除注册审核
*
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java
new file mode 100644
index 0000000..9f18d1b
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.app.service;
+
+import java.util.List;
+import com.ruoyi.app.domain.AppSkill;
+import com.ruoyi.app.domain.vo.AppSkillVo;
+
+/**
+ * 标签信息Service接口
+ *
+ * @author wyh
+ * @date 2024-05-24
+ */
+public interface IAppSkillService
+{
+ /**
+ * 查询标签信息
+ *
+ * @param id 标签信息主键
+ * @return 标签信息
+ */
+ public AppSkill selectAppSkillById(Long id);
+
+ /**
+ * 查询标签信息列表
+ *
+ * @param appSkill 标签信息
+ * @return 标签信息集合
+ */
+ public List selectAppSkillList(AppSkill appSkill);
+
+ /**
+ * 新增标签信息
+ *
+ * @param appSkill 标签信息
+ * @return 结果
+ */
+ public int insertAppSkill(AppSkill appSkill);
+
+ /**
+ * 修改标签信息
+ *
+ * @param appSkill 标签信息
+ * @return 结果
+ */
+ public int updateAppSkill(AppSkill appSkill);
+
+ /**
+ * 批量删除标签信息
+ *
+ * @param ids 需要删除的标签信息主键集合
+ * @return 结果
+ */
+ public int deleteAppSkillByIds(Long[] ids);
+
+ /**
+ * 删除标签信息信息
+ *
+ * @param id 标签信息主键
+ * @return 结果
+ */
+ public int deleteAppSkillById(Long id);
+
+ List selectAppSkillTreeList(AppSkill appSkill);
+
+}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java
index b4fa563..5f27171 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/ScheduledService.java
@@ -14,9 +14,10 @@ public class ScheduledService {
@Scheduled(cron = "0/5 * * * * *")
public void updateUserMember(){
- List ids = appUserMapper.listByOrderTime();
+ appUserMapper.updateAppUserById();
+ /*List ids = appUserMapper.listByOrderTime();
if (ids != null && ids.size() > 0) {
appUserMapper.updateAppUserById(ids);
- }
+ }*/
}
}
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java
index 6cfd64b..d3566b5 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java
@@ -101,6 +101,12 @@ public class AppRegisterServiceImpl implements IAppRegisterService
return appRegisterMapper.updateAppRegister(appRegister);
}
+ @Override
+ public int updateAppRegisterByPhone(AppRegister appRegister) {
+ appRegister.setUpdateTime(DateUtils.getNowDate());
+ return appRegisterMapper.updateAppRegisterByPhone(appRegister);
+ }
+
/**
* 批量删除注册审核
*
@@ -167,7 +173,7 @@ public class AppRegisterServiceImpl implements IAppRegisterService
String email = "653809315@qq.com";
String EM = "欢迎来到我们的服务！！
"
+ "请点击下面的网址确认您的注册:
"
- + "http://localhost:9204/app/activation/"+ token + "/" + email + "
"
+ + "http://101.133.172.2:9204/app/activation/"+ token + "/" + email + "
"
+ "";
try {
MailUtil.send_mail( "653809315@qq.com",EM);
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java
new file mode 100644
index 0000000..fe4b0ee
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java
@@ -0,0 +1,120 @@
+package com.ruoyi.app.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.ruoyi.app.domain.AppTopic;
+import com.ruoyi.app.domain.vo.AppSkillVo;
+import com.ruoyi.app.domain.vo.AppTopicVo;
+import com.ruoyi.common.core.utils.DateUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.app.mapper.AppSkillMapper;
+import com.ruoyi.app.domain.AppSkill;
+import com.ruoyi.app.service.IAppSkillService;
+
+/**
+ * 标签信息Service业务层处理
+ *
+ * @author wyh
+ * @date 2024-05-24
+ */
+@Service
+public class AppSkillServiceImpl implements IAppSkillService
+{
+ @Autowired
+ private AppSkillMapper appSkillMapper;
+
+ /**
+ * 查询标签信息
+ *
+ * @param id 标签信息主键
+ * @return 标签信息
+ */
+ @Override
+ public AppSkill selectAppSkillById(Long id)
+ {
+ return appSkillMapper.selectAppSkillById(id);
+ }
+
+ /**
+ * 查询标签信息列表
+ *
+ * @param appSkill 标签信息
+ * @return 标签信息
+ */
+ @Override
+ public List selectAppSkillList(AppSkill appSkill)
+ {
+ return appSkillMapper.selectAppSkillList(appSkill);
+ }
+
+ /**
+ * 新增标签信息
+ *
+ * @param appSkill 标签信息
+ * @return 结果
+ */
+ @Override
+ public int insertAppSkill(AppSkill appSkill)
+ {
+ appSkill.setCreateTime(DateUtils.getNowDate());
+ return appSkillMapper.insertAppSkill(appSkill);
+ }
+
+ /**
+ * 修改标签信息
+ *
+ * @param appSkill 标签信息
+ * @return 结果
+ */
+ @Override
+ public int updateAppSkill(AppSkill appSkill)
+ {
+ appSkill.setUpdateTime(DateUtils.getNowDate());
+ return appSkillMapper.updateAppSkill(appSkill);
+ }
+
+ /**
+ * 批量删除标签信息
+ *
+ * @param ids 需要删除的标签信息主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAppSkillByIds(Long[] ids)
+ {
+ return appSkillMapper.deleteAppSkillByIds(ids);
+ }
+
+ /**
+ * 删除标签信息信息
+ *
+ * @param id 标签信息主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAppSkillById(Long id)
+ {
+ return appSkillMapper.deleteAppSkillById(id);
+ }
+
+ @Override
+ public List selectAppSkillTreeList(AppSkill appSkill) {
+ appSkill.setType("0");
+ List list = appSkillMapper.selectAppSkillList(appSkill);
+ List appSkillVos = new ArrayList<>();
+ for (AppSkill skill : list) {
+ AppSkillVo appSkillVo = new AppSkillVo();
+ BeanUtils.copyProperties(skill,appSkillVo);
+ skill = new AppSkill();
+ skill.setParentId(appSkillVo.getId());
+ appSkillVo.setChildren(appSkillMapper.selectAppSkillList(skill));
+ appSkillVos.add(appSkillVo);
+ }
+ return appSkillVos;
+
+ }
+}
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
index e19ddd8..8b007bf 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
@@ -121,4 +121,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+ update app_register
+
+ create_time = #{createTime},
+ update_time = #{updateTime},
+ create_by = #{createBy},
+ updateBy = #{updateBy},
+ remark = #{remark},
+ username = #{username},
+ prove = #{prove},
+ avatar_url = #{avatarUrl},
+ sex = #{sex},
+ address = #{address},
+ school_id = #{schoolId},
+ email = #{email},
+ invitation_code = #{invitationCode},
+ status = 0,
+
+ where phone = #{phone}
+
\ No newline at end of file
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml
new file mode 100644
index 0000000..38306c4
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, name, create_time, update_time, create_by, updateBy, remark, parent_id, type from app_skill
+
+
+
+
+
+
+
+ insert into app_skill
+
+ name,
+ create_time,
+ update_time,
+ create_by,
+ updateBy,
+ remark,
+ parent_id,
+ type,
+
+
+ #{name},
+ #{createTime},
+ #{updateTime},
+ #{createBy},
+ #{updateBy},
+ #{remark},
+ #{parentId},
+ #{type},
+
+
+
+
+ update app_skill
+
+ name = #{name},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+ create_by = #{createBy},
+ updateBy = #{updateBy},
+ remark = #{remark},
+ parent_id = #{parentId},
+ type = #{type},
+
+ where id = #{id}
+
+
+
+ delete from app_skill where id = #{id}
+
+
+
+ delete from app_skill where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
index fe42d26..6698b21 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
@@ -211,12 +211,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
update app_user set is_member = 1,update_time = now()
- where id in
-
- #{item}
-
+ where
+ is_member = 0
+ and now() > order_end_time
@@ -339,7 +338,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
hobby = #{hobby},
city = #{city},
other = #{other},
- is_member = #{isMember},
order_id = #{orderId},
order_start_time = #{orderStartTime},
order_end_time = #{orderEndTime},
diff --git a/gan-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/gan-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index e15a03b..b33c588 100644
--- a/gan-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/gan-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -139,7 +139,7 @@ public class SysProfileController extends BaseController
return error("文件服务异常，请联系管理员");
}
String url = fileResult.getData().getUrl();
- if (userService.updateUserAvatar(loginUser.getUsername(), url))
+ if (userService.updateUserAvatar(loginUser.getSysUser().getUserName(), url))
{
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", url);
diff --git a/gan-ui/src/api/app/skill.js b/gan-ui/src/api/app/skill.js
new file mode 100644
index 0000000..eca72e8
--- /dev/null
+++ b/gan-ui/src/api/app/skill.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询标签信息列表
+export function listSkill(query) {
+ return request({
+ url: '/app/skill/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询标签信息详细
+export function getSkill(id) {
+ return request({
+ url: '/app/skill/' + id,
+ method: 'get'
+ })
+}
+
+// 新增标签信息
+export function addSkill(data) {
+ return request({
+ url: '/app/skill',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改标签信息
+export function updateSkill(data) {
+ return request({
+ url: '/app/skill',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除标签信息
+export function delSkill(id) {
+ return request({
+ url: '/app/skill/' + id,
+ method: 'delete'
+ })
+}
diff --git a/gan-ui/src/views/app/school/index.vue b/gan-ui/src/views/app/school/index.vue
index 61fa8f0..8aab2ed 100644
--- a/gan-ui/src/views/app/school/index.vue
+++ b/gan-ui/src/views/app/school/index.vue
@@ -9,6 +9,14 @@
@keyup.enter.native="handleQuery"
/>
+
+
搜索
重置
@@ -84,7 +92,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+