diff --git a/snow-admin/src/main/resources/application-druid.yml b/snow-admin/src/main/resources/application-druid.yml index f3eda0c..bb3eeed 100644 --- a/snow-admin/src/main/resources/application-druid.yml +++ b/snow-admin/src/main/resources/application-druid.yml @@ -14,7 +14,7 @@ spring: # 从数据源开关/默认关闭 enabled: false url: - username: + username: password: # 初始连接数 initialSize: 5 diff --git a/snow-from/src/main/java/com/snow/from/controller/FormController.java b/snow-from/src/main/java/com/snow/from/controller/FormController.java index 433548a..4007609 100644 --- a/snow-from/src/main/java/com/snow/from/controller/FormController.java +++ b/snow-from/src/main/java/com/snow/from/controller/FormController.java @@ -63,24 +63,24 @@ public class FormController{ * 跳转form表单首页 * @return 首页url路径 */ - @GetMapping("/formIndex") + @GetMapping("formIndex") public String fromPreview() { - return "/formIndex"; + return "formIndex"; } - @GetMapping("/preview.html") + @GetMapping("preview.html") public String preview() { - return "/preview"; + return "preview"; } - @GetMapping("/handwrittenSignature.html") + @GetMapping("handwrittenSignature.html") public String handwrittenSignature() { - return "/handwrittenSignature"; + return "handwrittenSignature"; } - @GetMapping("/editorMenu.html") + @GetMapping("editorMenu.html") public String editorMenu() { - return "/editorMenu"; + return "editorMenu"; } /** @@ -129,12 +129,12 @@ public class FormController{ * 预览 * @return 预览页 */ - @GetMapping("/fromPreview") + @GetMapping("fromPreview") public String fromPreview(@RequestParam Long id, ModelMap mmap) { SysFormInstance sysFormInstance = sysFormInstanceService.selectSysFormInstanceById(id); mmap.put("formId",id); mmap.put("name",sysFormInstance.getFormName()); - return "/fromPreview"; + return "fromPreview"; } /** diff --git a/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java b/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java index 20c50d7..e9ceae4 100644 --- a/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java +++ b/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java @@ -81,7 +81,7 @@ public class SysFormInstanceController extends BaseController public String fromPreview(@PathVariable("id") Long id,ModelMap mmap) { mmap.put("formId",id); - return "/fromPreview"; + return "fromPreview"; } /** * 获取表单内容 diff --git a/snow-from/src/main/resources/templates/system/instance/instance.html b/snow-from/src/main/resources/templates/system/instance/instance.html index 600696b..c24b097 100644 --- a/snow-from/src/main/resources/templates/system/instance/instance.html +++ b/snow-from/src/main/resources/templates/system/instance/instance.html @@ -52,7 +52,7 @@