diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java new file mode 100644 index 0000000..a7381d1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 小程序用户 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class UserController { + + /** + * 注册 + */ + + /** + * 登录 + */ + + /** + * 验证用户信息 + */ + + /** + * 找回密码 + */ + + /** + * 用户信息 + */ + + /** + * 修改照片 + */ + + /** + * 修改密码 + */ + + /** + * 员工导入 + */ +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java new file mode 100644 index 0000000..a7381d1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 小程序用户 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class UserController { + + /** + * 注册 + */ + + /** + * 登录 + */ + + /** + * 验证用户信息 + */ + + /** + * 找回密码 + */ + + /** + * 用户信息 + */ + + /** + * 修改照片 + */ + + /** + * 修改密码 + */ + + /** + * 员工导入 + */ +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java new file mode 100644 index 0000000..b28a32b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 访客信息提交 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class VisitController { + /** + * + */ + +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java new file mode 100644 index 0000000..a7381d1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 小程序用户 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class UserController { + + /** + * 注册 + */ + + /** + * 登录 + */ + + /** + * 验证用户信息 + */ + + /** + * 找回密码 + */ + + /** + * 用户信息 + */ + + /** + * 修改照片 + */ + + /** + * 修改密码 + */ + + /** + * 员工导入 + */ +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java new file mode 100644 index 0000000..b28a32b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 访客信息提交 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class VisitController { + /** + * + */ + +} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 73e9d68..bd4cef8 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini ../pom.xml 2.0.0 diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java new file mode 100644 index 0000000..a7381d1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 小程序用户 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class UserController { + + /** + * 注册 + */ + + /** + * 登录 + */ + + /** + * 验证用户信息 + */ + + /** + * 找回密码 + */ + + /** + * 用户信息 + */ + + /** + * 修改照片 + */ + + /** + * 修改密码 + */ + + /** + * 员工导入 + */ +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java new file mode 100644 index 0000000..b28a32b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 访客信息提交 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class VisitController { + /** + * + */ + +} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 73e9d68..bd4cef8 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini ../pom.xml 2.0.0 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 8c18554..e937cb1 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,29 +1,27 @@ server: - port: 8083 + port: 5904 ################### spring配置 ################### spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_template2.0?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/casic_security_cockpit_mini?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 -jms: - pub-sub-domain: true # session: # store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# serializer: org.springframework.data.redis.serializer.StringRedisSerializer -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer + casic: - #kaptcha-open: false #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken #flowable数据源和多数据源配置 db: init: enable: false + #图片下载本地地址 + file: + uploadPath: D:\tmp\ + commponentType: disk + logging: level.root: info level.com.casic: debug diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java new file mode 100644 index 0000000..a7381d1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 小程序用户 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class UserController { + + /** + * 注册 + */ + + /** + * 登录 + */ + + /** + * 验证用户信息 + */ + + /** + * 找回密码 + */ + + /** + * 用户信息 + */ + + /** + * 修改照片 + */ + + /** + * 修改密码 + */ + + /** + * 员工导入 + */ +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java new file mode 100644 index 0000000..b28a32b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 访客信息提交 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class VisitController { + /** + * + */ + +} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 73e9d68..bd4cef8 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini ../pom.xml 2.0.0 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 8c18554..e937cb1 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,29 +1,27 @@ server: - port: 8083 + port: 5904 ################### spring配置 ################### spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_template2.0?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/casic_security_cockpit_mini?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 -jms: - pub-sub-domain: true # session: # store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# serializer: org.springframework.data.redis.serializer.StringRedisSerializer -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer + casic: - #kaptcha-open: false #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken #flowable数据源和多数据源配置 db: init: enable: false + #图片下载本地地址 + file: + uploadPath: D:\tmp\ + commponentType: disk + logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 200ca46..9dc8566 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev servlet: multipart: max-file-size: 50MB @@ -11,6 +11,15 @@ #mybatis-plus: # sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector ################### mybatis-plus配置 ################### +mybatis-plus: + global-config: + #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串" + field-strategy: 1 + enable-sql-runner: true + configuration: + # 配置结果集属性为空时 是否映射返回结果 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用 + map-underscore-to-camel-case: true ################### guns配置 ################### casic: swagger-open: false #是否开启swagger (true/false) @@ -19,8 +28,9 @@ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 - no-login-urls: /user/login,/kaptcha,/config/baseConfig - - config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ \ No newline at end of file + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + file: + uploadPath: D:\tmp\ +# config: +# export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ +# config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ \ No newline at end of file diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 913a287..cd24fd8 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 ../pom.xml diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java new file mode 100644 index 0000000..9eb2f3a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 物联设备状态查看 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class DeviceController { + /** + * + */ + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java new file mode 100644 index 0000000..a7381d1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 小程序用户 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class UserController { + + /** + * 注册 + */ + + /** + * 登录 + */ + + /** + * 验证用户信息 + */ + + /** + * 找回密码 + */ + + /** + * 用户信息 + */ + + /** + * 修改照片 + */ + + /** + * 修改密码 + */ + + /** + * 员工导入 + */ +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java new file mode 100644 index 0000000..b28a32b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.controller; + +/** + * @Description: 访客信息提交 + * @Author: wangpeng + * @Date: 2022/11/8 14:39 + */ +public class VisitController { + /** + * + */ + +} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 73e9d68..bd4cef8 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-security-cockpit-mini ../pom.xml 2.0.0 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 8c18554..e937cb1 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,29 +1,27 @@ server: - port: 8083 + port: 5904 ################### spring配置 ################### spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_template2.0?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/casic_security_cockpit_mini?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 -jms: - pub-sub-domain: true # session: # store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# serializer: org.springframework.data.redis.serializer.StringRedisSerializer -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer + casic: - #kaptcha-open: false #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken #flowable数据源和多数据源配置 db: init: enable: false + #图片下载本地地址 + file: + uploadPath: D:\tmp\ + commponentType: disk + logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 200ca46..9dc8566 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev servlet: multipart: max-file-size: 50MB @@ -11,6 +11,15 @@ #mybatis-plus: # sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector ################### mybatis-plus配置 ################### +mybatis-plus: + global-config: + #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串" + field-strategy: 1 + enable-sql-runner: true + configuration: + # 配置结果集属性为空时 是否映射返回结果 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用 + map-underscore-to-camel-case: true ################### guns配置 ################### casic: swagger-open: false #是否开启swagger (true/false) @@ -19,8 +28,9 @@ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 - no-login-urls: /user/login,/kaptcha,/config/baseConfig - - config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ \ No newline at end of file + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + file: + uploadPath: D:\tmp\ +# config: +# export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ +# config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7e80eeb..bfe1cc1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.casic - casic-template + casic-security-cockpit-mini 2.0.0 - casic-template + casic-security-cockpit-mini pom casic-web