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 efd15ce..9cfa0b4 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 @@ -96,7 +96,7 @@ public class AppLoginController { AppUser emailUser = appUserService.selectAppUserByEmail(registerForm.getEmail()); Assert.isNull(emailUser, "邮箱已注册"); String uuid = IdUtils.fastUUID(); - redisService.setCacheMapValue(uuid,registerForm.getEmail() , registerForm); + redisService.setCacheObject(uuid, registerForm); try { String EM = "

欢迎来到我们的服务！！

" + "

请点击下面的网址确认您的注册:

" @@ -250,16 +250,17 @@ public class AppLoginController { @RequestMapping(path = "/activation/{token}/{email}", method = RequestMethod.GET) public String activation(@PathVariable String token, @PathVariable String email) { - Map cacheMap = redisService.getCacheMap(token); - if (email.equals(cacheMap.get("email"))) { - AppRegister appRegister = (AppRegister) cacheMap.get("email"); + RegisterForm cacheMap = redisService.getCacheObject(token); + if (email.equals(cacheMap.getEmail())) { + /* AppRegister appRegister = (AppRegister) cacheMap.getEmail(); appRegister.setStatus(1); - appRegisterService.updateAppRegister(appRegister); + appRegisterService.updateAppRegister(appRegister);*/ + /*AppRegister appRegister = appRegisterService.selectAppRegisterByEmail(email); AppUser appUser = new AppUser(); BeanUtils.copyBeanProp(appUser, appRegister); - appUserService.insertAppUser(appUser); + appUserService.insertAppUser(appUser);*/ } 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 index 74e5160..174812e 100644 --- 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 @@ -4,7 +4,9 @@ import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; +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.domain.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -46,14 +48,22 @@ public class AppSkillController extends BaseController */ @GetMapping("/list") @ApiOperation(value = "查询标签信息", notes = "查询标签信息", httpMethod = "GET") - public TableDataInfo list(AppSkill appSkill) + public AjaxResult list(AppSkill appSkill) { - startPage(); List list = appSkillService.selectAppSkillList(appSkill); + return success(list); + } + + @GetMapping("/skillList") + @ApiOperation(value = "组装过查询话题信息列表", notes = "组装过查询话题信息列表", httpMethod = "GET") + public TableDataInfo skillList(AppSkill appSkill) + { + List list = appSkillService.skillList(appSkill); return getDataTable(list); } + @GetMapping("/list/tree") @ApiOperation(value = "查询标签信息", notes = "查询标签信息", httpMethod = "GET") public AjaxResult listTree(AppSkill appSkill) 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 index 9f18d1b..a35eabb 100644 --- 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 @@ -62,4 +62,6 @@ public interface IAppSkillService List selectAppSkillTreeList(AppSkill appSkill); + + List skillList(AppSkill appSkill); } 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 index fe4b0ee..1f35872 100644 --- 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 @@ -117,4 +117,20 @@ public class AppSkillServiceImpl implements IAppSkillService return appSkillVos; } + + @Override + public List skillList(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); + appSkill = new AppSkill(); + appSkill.setParentId(appSkillVo.getId()); + appSkillVo.setChildren(appSkillMapper.selectAppSkillList(appSkill)); + appSkillVos.add(appSkillVo); + } + return appSkillVos; + } } 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 b000efa..e1deed1 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 @@ -260,6 +260,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_end_time, `check`, `back_ground_img`, + push_id + province_id + city_id + town_id #{username}, @@ -300,6 +304,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderEndTime}, #{check}, #{backGroundImg}, + #{pushId} + #{provinceId} + #{cityId} + #{townId} diff --git a/gan-ui/src/api/app/code.js b/gan-ui/src/api/app/code.js new file mode 100644 index 0000000..5c75907 --- /dev/null +++ b/gan-ui/src/api/app/code.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询兑换码列表 +export function listCode(query) { + return request({ + url: '/app/code/list', + method: 'get', + params: query + }) +} + +// 查询兑换码详细 +export function getCode(id) { + return request({ + url: '/app/code/' + id, + method: 'get' + }) +} + +// 新增兑换码 +export function addCode(data) { + return request({ + url: '/app/code', + method: 'post', + data: data + }) +} + +// 修改兑换码 +export function updateCode(data) { + return request({ + url: '/app/code', + method: 'put', + data: data + }) +} + +// 删除兑换码 +export function delCode(id) { + return request({ + url: '/app/code/' + id, + method: 'delete' + }) +} diff --git a/gan-ui/src/api/app/skill.js b/gan-ui/src/api/app/skill.js index eca72e8..9359fc1 100644 --- a/gan-ui/src/api/app/skill.js +++ b/gan-ui/src/api/app/skill.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询标签信息列表 export function listSkill(query) { return request({ - url: '/app/skill/list', + url: 'app/app/skill/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listSkill(query) { // 查询标签信息详细 export function getSkill(id) { return request({ - url: '/app/skill/' + id, + url: 'app/app/skill/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getSkill(id) { // 新增标签信息 export function addSkill(data) { return request({ - url: '/app/skill', + url: 'app/app/skill', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addSkill(data) { // 修改标签信息 export function updateSkill(data) { return request({ - url: '/app/skill', + url: 'app/app/skill', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateSkill(data) { // 删除标签信息 export function delSkill(id) { return request({ - url: '/app/skill/' + id, + url: 'app/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 fe50f59..720f2ae 100644 --- a/gan-ui/src/views/app/school/index.vue +++ b/gan-ui/src/views/app/school/index.vue @@ -113,9 +113,15 @@ -
- -
+ + + + @@ -143,7 +149,6 @@ :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" - :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag @@ -219,6 +224,7 @@ export default { headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 url: process.env.VUE_APP_BASE_API + "app/school/importData", + uploadUrl: process.env.VUE_APP_BASE_API + "/app/api/oss/upload", }, }; }, @@ -226,6 +232,25 @@ export default { this.getList(); }, methods: { + + + handleAvatarSuccess(res, file) { + console.log(res); + this.form.schoolImg = res.data; + console.log(this.schoolImg); + }, + beforeAvatarUpload(file) { + const isJPG = file.type === 'image/jpeg'; + const isLt2M = file.size / 1024 / 1024 < 2; + + if (!isJPG) { + this.$message.error('上传头像图片只能是 JPG 格式!'); + } + if (!isLt2M) { + this.$message.error('上传头像图片大小不能超过 2MB!'); + } + return isJPG && isLt2M; + }, /** 查询学校配置列表 */ getList() { this.loading = true; diff --git a/gan-ui/src/views/app/skill/index.vue b/gan-ui/src/views/app/skill/index.vue index deb6b9b..a28567b 100644 --- a/gan-ui/src/views/app/skill/index.vue +++ b/gan-ui/src/views/app/skill/index.vue @@ -9,22 +9,6 @@ @keyup.enter.native="handleQuery" /> - - - - - - 搜索 重置 @@ -39,52 +23,30 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['app:skill:add']" >新增 修改 - - - 删除 - - - 导出 + type="info" + plain + icon="el-icon-sort" + size="mini" + @click="toggleExpandAll" + >展开/折叠 - - - - - - - - + + @@ -112,19 +72,84 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - + - - - - - - - - - + + + + + 分类 + 标签 + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -136,9 +161,13 @@ diff --git a/gan-ui/src/views/app/topic/index.vue b/gan-ui/src/views/app/topic/index.vue index e1942a0..fcdca69 100644 --- a/gan-ui/src/views/app/topic/index.vue +++ b/gan-ui/src/views/app/topic/index.vue @@ -1,5 +1,3 @@ - -