mirror of
https://github.com/getrebuild/rebuild.git
synced 2024-09-20 15:35:55 +08:00
better code
This commit is contained in:
parent
cebce82fda
commit
c76eb3ee99
|
@ -121,6 +121,9 @@ public class RebuildWebConfigurer implements WebMvcConfigurer, ErrorViewResolver
|
|||
return createError(request, (Exception) request.getAttribute(ServletUtils.ERROR_EXCEPTION), status, model);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see ControllerResponseBodyAdvice
|
||||
*/
|
||||
private ModelAndView createError(HttpServletRequest request, Exception ex, HttpStatus status, Map<String, Object> model) {
|
||||
// IGNORED
|
||||
if (request.getRequestURI().contains("/assets/")) return null;
|
||||
|
|
|
@ -68,7 +68,9 @@ public class RolePrivilegesController extends EntityController {
|
|||
|
||||
@GetMapping("role-list")
|
||||
public JSON roleList() {
|
||||
Object[][] array = Application.createQuery("select roleId,name,isDisabled from Role").array();
|
||||
Object[][] array = Application.createQuery(
|
||||
"select roleId,name,isDisabled from Role")
|
||||
.array();
|
||||
// 排序 a-z
|
||||
Arrays.sort(array, (o1, o2) -> {
|
||||
if (RoleService.ADMIN_ROLE.equals(o1[0])) return -1;
|
||||
|
|
|
@ -5,11 +5,12 @@ rebuild is dual-licensed under commercial and open source licenses (GPLv3).
|
|||
See LICENSE and COMMERCIAL in the project root for license information.
|
||||
*/
|
||||
|
||||
package com.rebuild.web.extform;
|
||||
package com.rebuild.web.admin.extform;
|
||||
|
||||
import com.rebuild.core.support.i18n.Language;
|
||||
import com.rebuild.utils.RbAssert;
|
||||
import com.rebuild.web.BaseController;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
@ -18,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|||
* @author devezhao
|
||||
* @since 2020/12/8
|
||||
*/
|
||||
@RestController
|
||||
@Controller
|
||||
public class ExtformAdminController extends BaseController {
|
||||
|
||||
@GetMapping("/admin/extforms")
|
|
@ -90,7 +90,7 @@ public class UserSettings extends EntityController {
|
|||
|
||||
@RequestMapping("/user/save-passwd")
|
||||
public RespBody savePasswd(HttpServletRequest request) {
|
||||
ID user = getRequestUser(request);
|
||||
final ID user = getRequestUser(request);
|
||||
String oldp = getParameterNotNull(request, "oldp");
|
||||
String newp = getParameterNotNull(request, "newp");
|
||||
|
||||
|
|
|
@ -83,7 +83,10 @@ See LICENSE and COMMERCIAL in the project root for license information.
|
|||
}
|
||||
}
|
||||
|
||||
if (err && err.status) err = $L('Error' + err.status)
|
||||
if (err && err.status) {
|
||||
if (err.status === 404) err = $L('访问的页面/资源不存在')
|
||||
else err = $L('系统繁忙,请稍后重试')
|
||||
}
|
||||
RbHighbar.error(err)
|
||||
} else {
|
||||
var res = xhr.responseJSON
|
||||
|
|
Loading…
Reference in a new issue