From 9ffb34d10b81aa0141cc5d7246e3280dfe4c4442 Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Sat, 12 Jan 2019 12:22:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../train/course/controller/ApiTrainCourseController.java | 8 ++------ .../com/ruoyi/vip/controller/ApiVipUserController.java | 2 -- ruoyi-vip/src/main/resources/templates/vip/user/add.html | 8 ++++---- ruoyi-vip/src/main/resources/templates/vip/user/edit.html | 6 +++--- .../src/main/resources/templates/vip/user/resetPwd.html | 2 +- ruoyi-vip/src/main/resources/templates/vip/user/user.html | 2 +- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java index 779092fc8..8d0fc812a 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java @@ -1,5 +1,6 @@ package com.ruoyi.train.course.controller; +import cn.hutool.json.JSONObject; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.framework.web.base.BaseController; import com.ruoyi.train.course.domain.TrainCourse; @@ -8,7 +9,6 @@ import com.ruoyi.train.course.domain.TrainCourseSection; import com.ruoyi.train.course.service.ITrainCourseCategoryService; import com.ruoyi.train.course.service.ITrainCourseSectionService; import com.ruoyi.train.course.service.ITrainCourseService; -import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -49,12 +49,8 @@ public class ApiTrainCourseController extends BaseController { @GetMapping("/trainCourse/{id}") public AjaxResult get(@PathVariable("id") Integer id) { TrainCourse trainCourse = trainCourseService.selectById( id ); -// TrainCourseCategory courseCategory = trainCourseCategoryService.selectById( trainCourse.getTrainCourseCategoryId() ); - JSONObject jsonObject = JSONObject.fromObject( trainCourse ); -// JSONObject courseCategoryJSON = JSONObject.fromObject( courseCategory ); -// jsonObject.put( "courseCategory", courseCategory ); AjaxResult success = success( "查询成功" ); - success.put( "data", jsonObject ); + success.put( "data", trainCourse ); return success; } diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java index dc0f19532..93b88668f 100644 --- a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java @@ -16,8 +16,6 @@ import com.ruoyi.framework.web.util.ServletUtils; import com.ruoyi.framework.web.util.ShiroUtils; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.vip.domain.VipUser; -import com.ruoyi.vip.service.IVipUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.SecurityUtils; diff --git a/ruoyi-vip/src/main/resources/templates/vip/user/add.html b/ruoyi-vip/src/main/resources/templates/vip/user/add.html index e1db1bb1a..68c4714e0 100644 --- a/ruoyi-vip/src/main/resources/templates/vip/user/add.html +++ b/ruoyi-vip/src/main/resources/templates/vip/user/add.html @@ -75,7 +75,7 @@ minlength: 2, maxlength: 20, remote: { - url: ctx + "system/user/checkLoginNameUnique", + url: ctx + "vip/user/checkLoginNameUnique", type: "post", dataType: "json", data: { @@ -103,7 +103,7 @@ required:true, email:true, remote: { - url: ctx + "system/user/checkEmailUnique", + url: ctx + "vip/user/checkEmailUnique", type: "post", dataType: "json", data: { @@ -120,7 +120,7 @@ required:true, isPhone:true, remote: { - url: ctx + "system/user/checkPhoneUnique", + url: ctx + "vip/user/checkPhoneUnique", type: "post", dataType: "json", data: { @@ -168,7 +168,7 @@ $.ajax({ cache : true, type : "POST", - url : ctx + "system/user/add", + url : ctx + "vip/user/add", data : { "userId": userId, "deptId": deptId, diff --git a/ruoyi-vip/src/main/resources/templates/vip/user/edit.html b/ruoyi-vip/src/main/resources/templates/vip/user/edit.html index fa817106a..36b14a734 100644 --- a/ruoyi-vip/src/main/resources/templates/vip/user/edit.html +++ b/ruoyi-vip/src/main/resources/templates/vip/user/edit.html @@ -74,7 +74,7 @@ required:true, email:true, remote: { - url: ctx + "system/user/checkEmailUnique", + url: ctx + "vip/user/checkEmailUnique", type: "post", dataType: "json", data: { @@ -94,7 +94,7 @@ required:true, isPhone:true, remote: { - url: ctx + "system/user/checkPhoneUnique", + url: ctx + "vip/user/checkPhoneUnique", type: "post", dataType: "json", data: { @@ -143,7 +143,7 @@ $.ajax({ cache : true, type : "POST", - url : ctx + "system/user/edit", + url : ctx + "vip/user/edit", data : { "userId": userId, "deptId": deptId, diff --git a/ruoyi-vip/src/main/resources/templates/vip/user/resetPwd.html b/ruoyi-vip/src/main/resources/templates/vip/user/resetPwd.html index caac6f6c7..8cc16884c 100644 --- a/ruoyi-vip/src/main/resources/templates/vip/user/resetPwd.html +++ b/ruoyi-vip/src/main/resources/templates/vip/user/resetPwd.html @@ -34,7 +34,7 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(ctx + "system/user/resetPwd", $('#form-user-resetPwd').serialize()); + $.operate.save(ctx + "vip/user/resetPwd", $('#form-user-resetPwd').serialize()); } } diff --git a/ruoyi-vip/src/main/resources/templates/vip/user/user.html b/ruoyi-vip/src/main/resources/templates/vip/user/user.html index 37cd2dc26..aa8110150 100644 --- a/ruoyi-vip/src/main/resources/templates/vip/user/user.html +++ b/ruoyi-vip/src/main/resources/templates/vip/user/user.html @@ -93,7 +93,7 @@ var removeFlag = [[${@permission.hasPermi('system:user:remove')}]]; var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]]; var datas = [[${@dict.getType('sys_normal_disable')}]]; - var prefix = ctx + "system/user"; + var prefix = ctx + "vip/user"; $(function() { $('body').layout({ west__size: 185 });