Merge branch 'usky-website' of uskycloud/usky-modules into master

pom.xml

@@ -18,6 +18,7 @@
         <module>usky-module-demo</module>
     <module>service-backend</module>
     <module>service-system</module>
+    <module>service-website</module>
   </modules>
 
 

service-website/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>usky-modules</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-website</artifactId>
+
+    <groupId>com.usky</groupId>
+    <packaging>pom</packaging>
+    <version>0.1</version>
+
+<modules>  <module>service-website-biz</module>
+    <module>service-website-api</module>
+  </modules>
+</project>

service-website/service-website-api/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service-website</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-website-api</artifactId>
+    <!-- SpringCloud Openfeign -->
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

service-website/service-website-api/src/main/java/com/usky/website/RemoteUserService.java

@@ -0,0 +1,28 @@
+package com.usky.website;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.website.domain.SysUserVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@FeignClient(contextId = "remoteUserService", value = "usky-demo")
+public interface RemoteUserService {
+
+
+
+    @GetMapping("/byUserName")
+    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
+
+
+    @PostMapping("/byUserName")
+    ApiResult<List<SysUserVO>> add(@RequestBody SysUserVO sysUserVO);
+
+
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    ApiResult<String> upload(@RequestPart(value = "file") MultipartFile file);
+}

service-website/service-website-api/src/main/java/com/usky/website/domain/SysUserVO.java

@@ -0,0 +1,105 @@
+package com.usky.website.domain;
+
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SysUserVO {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（00系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

service-website/service-website-api/src/main/java/com/usky/website/factory/RemoteUserFallbackFactory.java

@@ -0,0 +1,48 @@
+package com.usky.website.factory;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.website.RemoteUserService;
+import com.usky.website.domain.SysUserVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+
+/**
+ * 用户服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteUserService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteUserService() {
+            @Override
+            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+                throw new BusinessException(throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+                throw new BusinessException(throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<String> upload(MultipartFile file) {
+                throw new BusinessException(throwable.getMessage());
+            }
+        };
+    }
+}

service-website/service-website-biz/pom.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service-website</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-website-biz</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>common-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Pagehelper -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.shalousun</groupId>
+                <artifactId>smart-doc-maven-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <!--指定生成文档的使用的配置文件,配置文件放在自己的项目中-->
+                    <configFile>./src/main/resources/smart-doc.json</configFile>
+                    <!--指定项目名称-->
+                    <projectName>test</projectName>
+                    <!--                    <excludes>-->
+                    <!--                        <exclude>com.bizmatics:product-service-provider</exclude>-->
+                    <!--                        <exclude>cn.afterturn:easypoi-web</exclude>-->
+                    <!--                    </excludes>-->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

service-website/service-website-biz/src/main/java/com/usky/website/MybatisGenerator.java

@@ -0,0 +1,108 @@
+package com.usky.website;//package com.usky.website.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/7/6 11:42
+ */
+public class MybatisGenerator {
+    public static void main(String[] args) {
+
+            shell("service-website","service-website-biz");
+    }
+
+    private static void shell(String parentName,String model) {
+
+        AutoGenerator mpg = new AutoGenerator();
+        //1、全局配置
+        GlobalConfig gc = new GlobalConfig();
+//        File file = new File(model);
+//        String path = file.getAbsolutePath();
+        String projectPath = System.getProperty("user.dir");
+        projectPath+="/"+parentName;
+        projectPath+="/"+model;
+        gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
+        //修改为自己的名字
+        gc.setAuthor("ya"); //设置作者
+        gc.setOpen(false);
+        gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
+        gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
+        gc.setBaseResultMap(true); //生成resultMap
+        mpg.setGlobalConfig(gc);
+
+        //2、数据源配置
+        //修改数据源
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://101.133.214.75:3306/usky_website?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("usky");
+        dsc.setPassword("Yt#75Usky");
+        mpg.setDataSource(dsc);
+
+        // 3、包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent("com.usky.website");
+        pc.setController("controller.web");
+        pc.setEntity("domain");
+        pc.setMapper("mapper");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+//        pc.setXml("mapper.demo");
+        //pc.setModuleName("test");
+        mpg.setPackageInfo(pc);
+
+        // 4、策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperMapperClass("com.usky.common.mybatis.core.CrudMapper");
+        strategy.setSuperServiceClass("com.usky.common.mybatis.core.CrudService");
+        strategy.setSuperServiceImplClass("com.usky.common.mybatis.core.AbstractCrudService");
+        // strategy.setTablePrefix("t_"); // 表名前缀
+        strategy.setEntityLombokModel(true); //使用lombok
+        //修改自己想要生成的表
+        strategy.setInclude(new String[]{"site_article","site_category"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        mpg.setStrategy(strategy);
+
+        // 关闭默认 xml 生成，调整生成 至 根目录
+        //修改对应的模块名称
+        TemplateConfig tc = new TemplateConfig();
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        //如果模板引擎是 velocity
+        String templatePath = "/templates/mapper.xml.vm";
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+        String finalProjectPath = projectPath;
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                return finalProjectPath + "/src/main/resources/mapper/website" + "/"
+                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        tc.setXml(null);
+        mpg.setTemplate(tc);
+        //5、执行
+        mpg.execute();
+    }
+}

service-website/service-website-biz/src/main/java/com/usky/website/RuoYiSystemApplication.java

@@ -0,0 +1,37 @@
+package com.usky.website;
+
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * 系统模块
+ * 
+ * @author ruoyi
+ */
+
+
+@EnableFeignClients(basePackages = "com.usky")
+@MapperScan(value = "com.usky.website.mapper")
+@ComponentScan("com.usky")
+@SpringBootApplication
+public class RuoYiSystemApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(RuoYiSystemApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  永天测试模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

service-website/service-website-biz/src/main/java/com/usky/website/controller/api/SysUserControllerApi.java

@@ -0,0 +1,60 @@
+//package com.usky.website.controller.api;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.usky.common.core.bean.ApiResult;
+//import com.usky.common.core.exception.BusinessException;
+//import com.usky.common.core.util.BeanMapperUtils;
+//import com.usky.common.core.util.FileUtils;
+//import com.usky.common.core.util.GlobalUtils;
+//import com.usky.website.domain.SysUser;
+//import com.usky.website.service.SysUserService;
+//import com.usky.system.RemoteUserService;
+//import com.usky.system.domain.SysUserVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.io.File;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Optional;
+//
+//@RestController
+//public class SysUserControllerApi implements RemoteUserService {
+//
+//    @Autowired
+//    private SysUserService sysUserService;
+//    @Override
+//    public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+//        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(SysUser::getUserName,userName);
+//        return ApiResult.success(BeanMapperUtils.mapList(sysUserService.list(queryWrapper),SysUser.class,SysUserVO.class));
+//    }
+//
+//    @Override
+//    public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+//        sysUserService.save(BeanMapperUtils.map(sysUserVO, SysUser.class));
+//        return ApiResult.success(new ArrayList<>());
+//    }
+//
+//    @Override
+//    public ApiResult<String> upload(MultipartFile multipartFile) {
+//        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
+//        String originalFilename = multipartFile.getOriginalFilename();
+//        String newFileName = System.currentTimeMillis() + originalFilename;
+//        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), newFileName);
+//        String urlPath = "";
+//        try {
+//            try {
+//                multipartFile.transferTo(file);
+//            } catch (IOException e) {
+//                throw new BusinessException("文件上传失败");
+//            }
+//        } catch (Exception e) {
+//
+//        }
+//        return ApiResult.success(urlPath);
+//    }
+//}

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteArticleController.java

@@ -0,0 +1,81 @@
+package com.usky.website.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.website.domain.SiteArticle;
+import com.usky.website.service.SiteArticleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 官网_内容管理 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@RestController
+@RequestMapping("/siteArticle")
+public class SiteArticleController {
+
+    @Autowired
+    private SiteArticleService siteArticleService;
+
+    /**
+     * 官网-内容管理查询
+     *
+     * @param categoryid 栏目ID
+     * @param id         主键ID
+     * @param pageNum    页数
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("siteArticleList")
+    public ApiResult<CommonPage<SiteArticle>> siteArticleList(@RequestParam(value = "categoryid", required = false) Integer categoryid,
+                                                              @RequestParam(value = "id", required = false) Integer id,
+                                                              @RequestParam(value = "title", required = false) String title,
+                                                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(siteArticleService.siteArticleList(categoryid, id, title, pageNum, pageSize));
+    }
+
+    /**
+     * 官网-内容新增
+     *
+     * @param siteArticle
+     * @return
+     */
+    @PostMapping("addSiteArticle")
+    public ApiResult<Void> addSiteArticle(@RequestBody SiteArticle siteArticle) {
+        siteArticleService.addSiteArticle(siteArticle);
+        return ApiResult.success();
+    }
+
+    /**
+     * 官网-内容修改
+     *
+     * @param siteArticle
+     * @return
+     */
+    @PutMapping("updateSiteArticle")
+    public ApiResult<Void> updateSiteArticle(@RequestBody SiteArticle siteArticle) {
+        siteArticleService.updateSiteArticle(siteArticle);
+        return ApiResult.success();
+    }
+
+    /**
+     * 官网-内容删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @DeleteMapping("delSiteArticle")
+    public ApiResult<Void> delSiteArticle(@RequestParam(value = "id") Integer id) {
+        siteArticleService.delSiteArticle(id);
+        return ApiResult.success();
+    }
+
+}
+

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteCategoryController.java

@@ -0,0 +1,86 @@
+package com.usky.website.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.website.domain.SiteCategory;
+import com.usky.website.service.SiteCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 官网_栏目管理 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@RestController
+@RequestMapping("/siteCategory")
+public class SiteCategoryController {
+
+    @Autowired
+    private SiteCategoryService siteCategoryService;
+
+    /**
+     * 官网-栏目查询
+     *
+     * @return
+     */
+    @GetMapping("siteCategoryList")
+    public ApiResult<List<SiteCategory>> siteCategoryList(@RequestParam(value = "categoryName", required = false) String categoryName) {
+        return ApiResult.success(siteCategoryService.siteCategoryList(categoryName));
+    }
+
+    /**
+     * 官网-子级栏目查询
+     *
+     * @param pid 父级ID
+     * @return
+     */
+    @GetMapping("siteCategorySonList")
+    public ApiResult<List<SiteCategory>> siteCategorySonList(@RequestParam(value = "pid") Integer pid) {
+        return ApiResult.success(siteCategoryService.siteCategorySonList(pid));
+    }
+
+    /**
+     * 官网-栏目新增
+     *
+     * @param siteCategory
+     * @return
+     */
+    @PostMapping("addSiteCategory")
+    public ApiResult<Void> addSiteCategory(@RequestBody SiteCategory siteCategory) {
+        siteCategoryService.addSiteCategory(siteCategory);
+        return ApiResult.success();
+    }
+
+    /**
+     * 官网-栏目修改
+     *
+     * @param siteCategory
+     * @return
+     */
+    @PutMapping("updateSiteCategory")
+    public ApiResult<Void> updateSiteCategory(@RequestBody SiteCategory siteCategory) {
+        siteCategoryService.updateSiteCategory(siteCategory);
+        return ApiResult.success();
+    }
+
+    /**
+     * 官网-栏目删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @DeleteMapping("delSiteCategory")
+    public ApiResult<Void> delSiteCategory(@RequestParam(value = "id") Integer id) {
+        siteCategoryService.delSiteCategory(id);
+        return ApiResult.success();
+    }
+
+
+}
+

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SysUserController.java

@@ -0,0 +1,36 @@
+package com.usky.website.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.website.domain.SysUser;
+import com.usky.website.service.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户信息表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-21
+ */
+@RestController
+@RequestMapping("/sysUser")
+public class SysUserController {
+
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @GetMapping("/list")
+    public ApiResult<List<SysUser>> list(){
+        return ApiResult.success(sysUserService.list());
+    }
+}
+

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteArticle.java

@@ -0,0 +1,93 @@
+package com.usky.website.domain;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 官网_内容管理
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SiteArticle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 内容标题;
+     */
+    private String title;
+
+    /**
+     * 作者
+     */
+    private String author;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 点击量;
+     */
+    private Integer hits;
+
+    /**
+     * 内容文件路径
+     */
+    private String htmlfilepath;
+
+    /**
+     * 是否置顶;0:否 1:是
+     */
+    private Integer istop;
+
+    /**
+     * 栏目ID
+     */
+    private Integer categoryid;
+
+    /**
+     * 内容图片;
+     */
+    private String image;
+
+    /**
+     * 内容副标题;
+     */
+    private String lmtitle;
+
+    /**
+     * 内容摘要;
+     */
+    private String zhaiyao;
+
+    /**
+     * 创建时间;
+     */
+    private LocalDateTime createdate;
+
+    /**
+     * 修改时间;
+     */
+    private LocalDateTime modifydate;
+
+    /**
+     * 栏目名称
+     */
+    @TableField(exist = false)
+    private String categoryName;
+
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteCategory.java

@@ -0,0 +1,97 @@
+package com.usky.website.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 官网_栏目管理
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SiteCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父级ID
+     */
+    private Integer pid;
+
+    /**
+     * 栏目名称
+     */
+    private String categoryName;
+
+    /**
+     * 栏目简称
+     */
+    private String sname;
+
+    /**
+     * 是否新栏目;0:否 1:是
+     */
+    @TableField("isNew")
+    private Integer isNew;
+
+    /**
+     * 页面模板
+     */
+    private String tpl;
+
+    /**
+     * 栏目图片;
+     */
+    @TableField("imagePath")
+    private String imagePath;
+
+    /**
+     * SEO关键字;
+     */
+    private String metakeywords;
+
+    /**
+     * SEO描述;
+     */
+    private String metadescription;
+
+    /**
+     * 创建时间;
+     */
+    private LocalDateTime createdate;
+
+    /**
+     * 修改时间;
+     */
+    private LocalDateTime modifydate;
+
+    /**
+     * 栏目排序
+     */
+    private Integer sortindex;
+
+    /**
+     * 状态;0:关闭 1:开启
+     */
+    private Integer status;
+
+    /**
+     * 子级
+     */
+    @TableField(exist = false)
+    private List<SiteCategory> children;
+}

service-website/service-website-biz/src/main/java/com/usky/website/domain/SysUser.java

@@ -0,0 +1,123 @@
+package com.usky.website.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 用户信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（00系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/mapper/SiteArticleMapper.java

@@ -0,0 +1,16 @@
+package com.usky.website.mapper;
+
+import com.usky.website.domain.SiteArticle;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 官网_内容管理 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+public interface SiteArticleMapper extends CrudMapper<SiteArticle> {
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/mapper/SiteCategoryMapper.java

@@ -0,0 +1,18 @@
+package com.usky.website.mapper;
+
+import com.usky.website.domain.SiteCategory;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 官网_栏目管理 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@Repository
+public interface SiteCategoryMapper extends CrudMapper<SiteCategory> {
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/mapper/SysUserMapper.java

@@ -0,0 +1,16 @@
+package com.usky.website.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.website.domain.SysUser;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-21
+ */
+public interface SysUserMapper extends CrudMapper<SysUser> {
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/service/SiteArticleService.java

@@ -0,0 +1,48 @@
+package com.usky.website.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.website.domain.SiteArticle;
+
+/**
+ * <p>
+ * 官网_内容管理 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+public interface SiteArticleService extends CrudService<SiteArticle> {
+
+    /**
+     * 官网-内容管理查询
+     *
+     * @param categoryid 栏目ID
+     * @param id         主键ID
+     * @param pageNum    页数
+     * @param pageSize   每页条数
+     * @return
+     */
+    CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, Integer pageNum, Integer pageSize);
+
+    /**
+     * 官网-内容的新增
+     *
+     * @param siteArticle
+     */
+    void addSiteArticle(SiteArticle siteArticle);
+
+    /**
+     * 官网-内容的修改
+     *
+     * @param siteArticle
+     */
+    void updateSiteArticle(SiteArticle siteArticle);
+
+    /**
+     * 官网-内容的删除
+     *
+     * @param id 主键ID
+     */
+    void delSiteArticle(Integer id);
+}

service-website/service-website-biz/src/main/java/com/usky/website/service/SiteCategoryService.java

@@ -0,0 +1,53 @@
+package com.usky.website.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.website.domain.SiteCategory;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 官网_栏目管理 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+public interface SiteCategoryService extends CrudService<SiteCategory> {
+
+    /**
+     * 官网-栏目查询
+     *
+     * @return
+     */
+    List<SiteCategory> siteCategoryList(String categoryName);
+
+    /**
+     * 官网-子级栏目查询
+     *
+     * @param pid 父级ID
+     * @return
+     */
+    List<SiteCategory> siteCategorySonList(Integer pid);
+
+    /**
+     * 官网-栏目的新增
+     *
+     * @param siteCategory
+     */
+    void addSiteCategory(SiteCategory siteCategory);
+
+    /**
+     * 官网-栏目的修改
+     *
+     * @param siteCategory
+     */
+    void updateSiteCategory(SiteCategory siteCategory);
+
+    /**
+     * 官网-栏目的删除
+     *
+     * @param id 主键ID
+     */
+    void delSiteCategory(Integer id);
+}

service-website/service-website-biz/src/main/java/com/usky/website/service/SysUserService.java

@@ -0,0 +1,17 @@
+package com.usky.website.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.website.domain.SysUser;
+
+
+/**
+ * <p>
+ * 用户信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-21
+ */
+public interface SysUserService extends CrudService<SysUser> {
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteArticleServiceImpl.java

@@ -0,0 +1,94 @@
+package com.usky.website.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.website.domain.SiteArticle;
+import com.usky.website.domain.SiteCategory;
+import com.usky.website.mapper.SiteArticleMapper;
+import com.usky.website.mapper.SiteCategoryMapper;
+import com.usky.website.service.SiteArticleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 官网_内容管理 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@Service
+public class SiteArticleServiceImpl extends AbstractCrudService<SiteArticleMapper, SiteArticle> implements SiteArticleService {
+
+    @Autowired
+    private SiteCategoryMapper siteCategoryMapper;
+
+    @Override
+    public CommonPage<SiteArticle> siteArticleList(Integer categoryid, Integer id, String title, Integer pageNum, Integer pageSize) {
+        IPage<SiteArticle> page = new Page<>(pageNum, pageSize);
+        List<Integer> categoryidList = new ArrayList<>();
+        if (categoryid != null && categoryid != 0) {
+            if (categoryid == 18) {
+                LambdaQueryWrapper<SiteCategory> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(SiteCategory::getId)
+                        .eq(SiteCategory::getPid, categoryid)
+                        .eq(SiteCategory::getStatus, 1);
+                List<SiteCategory> list = siteCategoryMapper.selectList(queryWrapper1);
+                for (int i = 0; i < list.size(); i++) {
+                    categoryidList.add(list.get(i).getId());
+                }
+            } else {
+                categoryidList.add(categoryid);
+            }
+        }
+
+        LambdaQueryWrapper<SiteCategory> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(SiteCategory::getStatus, 1)
+                .in(CollectionUtil.isNotEmpty(categoryidList), SiteCategory::getId, categoryidList);
+        List<SiteCategory> list = siteCategoryMapper.selectList(queryWrapper1);
+
+        LambdaQueryWrapper<SiteArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(CollectionUtil.isNotEmpty(categoryidList), SiteArticle::getCategoryid, categoryidList)
+                .eq(id != null, SiteArticle::getId, id)
+                .like(StringUtils.isNotBlank(title), SiteArticle::getTitle, title)
+                .orderByDesc(SiteArticle::getIstop, SiteArticle::getId);
+        page = this.page(page, queryWrapper);
+
+        for (int i = 0; i < page.getRecords().size(); i++) {
+            for (int j = 0; j < list.size(); j++) {
+                if (page.getRecords().get(i).getCategoryid() == list.get(j).getId()) {
+                    page.getRecords().get(i).setCategoryName(list.get(j).getCategoryName());
+                }
+            }
+        }
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public void addSiteArticle(SiteArticle siteArticle) {
+        siteArticle.setCreatedate(LocalDateTime.now());
+        this.save(siteArticle);
+    }
+
+    @Override
+    public void updateSiteArticle(SiteArticle siteArticle) {
+        siteArticle.setModifydate(LocalDateTime.now());
+        this.updateById(siteArticle);
+    }
+
+    @Override
+    public void delSiteArticle(Integer id) {
+        this.removeById(id);
+    }
+}

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteCategoryServiceImpl.java

@@ -0,0 +1,119 @@
+package com.usky.website.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.website.domain.SiteArticle;
+import com.usky.website.domain.SiteCategory;
+import com.usky.website.mapper.SiteCategoryMapper;
+import com.usky.website.service.SiteArticleService;
+import com.usky.website.service.SiteCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 官网_栏目管理 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-31
+ */
+@Service
+public class SiteCategoryServiceImpl extends AbstractCrudService<SiteCategoryMapper, SiteCategory> implements SiteCategoryService {
+
+    @Autowired
+    private SiteArticleService siteArticleService;
+
+    @Override
+    public List<SiteCategory> siteCategoryList(String categoryName) {
+        LambdaQueryWrapper<SiteCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SiteCategory::getStatus, 1)
+                .like(StringUtils.isNotBlank(categoryName),SiteCategory::getCategoryName,categoryName)
+                .orderByAsc(SiteCategory::getSortindex);
+        List<SiteCategory> list = this.list(queryWrapper);
+        //取得所有parentId为0的数据，也就是一级目录
+        //用于封装数据，取得他的孩子（也就是下级目录）的数据
+        List<SiteCategory> list1 = list.stream().filter(subjectVO ->
+                subjectVO.getPid() == 0
+        ).map((menu) -> {
+            menu.setChildren(getChildrenData(menu, list));
+            return menu;
+        }).collect(Collectors.toList());
+        return list1;
+    }
+
+
+    @Override
+    public List<SiteCategory> siteCategorySonList(Integer pid) {
+        LambdaQueryWrapper<SiteCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SiteCategory::getStatus, 1)
+                .eq(SiteCategory::getPid, pid)
+                .orderByAsc(SiteCategory::getSortindex);
+        List<SiteCategory> list = this.list(queryWrapper);
+        return list;
+    }
+
+
+    @Override
+    public void addSiteCategory(SiteCategory siteCategory) {
+        LambdaQueryWrapper<SiteCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SiteCategory::getStatus, 1)
+                .eq(SiteCategory::getPid, siteCategory.getPid())
+                .eq(SiteCategory::getCategoryName, siteCategory.getCategoryName());
+        List<SiteCategory> list = this.list(queryWrapper);
+        if (list.size() > 0) {
+            throw new BusinessException("栏目名称不能重复，请重新填写栏目名称");
+        }
+        siteCategory.setCreatedate(LocalDateTime.now());
+        siteCategory.setStatus(1);
+        this.save(siteCategory);
+    }
+
+    @Override
+    public void updateSiteCategory(SiteCategory siteCategory) {
+        LambdaQueryWrapper<SiteCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SiteCategory::getStatus, 1)
+                .eq(SiteCategory::getPid, siteCategory.getPid())
+                .eq(SiteCategory::getCategoryName, siteCategory.getCategoryName())
+                .ne(SiteCategory::getId, siteCategory.getId());
+        List<SiteCategory> list = this.list(queryWrapper);
+        if (list.size() > 0) {
+            throw new BusinessException("栏目名称不能重复，请重新填写栏目名称");
+        }
+        siteCategory.setModifydate(LocalDateTime.now());
+        this.updateById(siteCategory);
+    }
+
+    @Override
+    public void delSiteCategory(Integer id) {
+        if (id == null || id == 0) {
+            throw new BusinessException("ID不能等于空或者等于0");
+        }
+        LambdaQueryWrapper<SiteArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SiteArticle::getCategoryid, id);
+        List<SiteArticle> list = siteArticleService.list(queryWrapper);
+        if (list.size() > 0) {
+            throw new BusinessException("该栏目存在栏目内容不可删除");
+        }
+        this.removeById(id);
+    }
+
+
+    private List<SiteCategory> getChildrenData(SiteCategory root, List<SiteCategory> all) {
+        List<SiteCategory> children = all.stream().filter(subjectVO ->
+                subjectVO.getPid() == root.getId() && !root.getCategoryName().equals("产品服务") && !root.getCategoryName().equals("客户案例")
+        ).map(subjectVO -> {
+            subjectVO.setChildren(getChildrenData(subjectVO, all));
+            return subjectVO;
+        }).collect(Collectors.toList());
+        return children;
+    }
+
+}

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.website.service.impl;
+
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.website.domain.SysUser;
+import com.usky.website.mapper.SysUserMapper;
+import com.usky.website.service.SysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-21
+ */
+@Service
+public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUser> implements SysUserService {
+
+}

service-website/service-website-biz/src/main/resources/bootstrap.yml

@@ -0,0 +1,25 @@
+# Tomcat
+server:
+  port: 9001
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: service-website
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: usky-cloud-nacos:8848
+      config:
+        # 配置中心地址
+        server-addr: usky-cloud-nacos:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

service-website/service-website-biz/src/main/resources/doc/index.adoc

@@ -0,0 +1,108 @@
+= 安防项目
+
+[width="100%",options="header"]
+[stripes=even]
+|====================
+|Version |  Update Time  | Status | Author |  Description
+|v2022-04-21 16:57:08|2022-04-21 16:57:08|auto|@yq|Created by smart-doc
+|====================
+
+
+== <p>参数配置表 前端控制器</p>
+== <p>部门信息</p>
+=== 查看部门信息
+*URL:* http:10.23.39.1:8082/sysDept/list
+
+*Type:* POST
+
+*Author:* ya
+
+*Content-Type:* application/json; charset=utf-8
+
+
+
+
+*Body-parameters:*
+
+[width="100%",options="header"]
+[stripes=even]
+|====================
+|Parameter | Type|Description|Required|Since
+|deptId|int64|部门id|false|-
+|parentId|int64|父部门id|false|-
+|ancestors|string|祖级列表|false|-
+|deptName|string|部门名称|false|-
+|orderNum|int32|显示顺序|false|-
+|leader|string|负责人|false|-
+|phone|string|联系电话|false|-
+|email|string|邮箱|false|-
+|status|string|部门状态（0正常 1停用）|false|-
+|delFlag|string|删除标志（0代表存在 2代表删除）|false|-
+|createBy|string|创建者|false|-
+|createTime|string|创建时间|false|-
+|updateBy|string|更新者|false|-
+|updateTime|string|更新时间|false|-
+|bId|int64|建筑id|false|-
+|====================
+
+*Response-fields:*
+
+[width="100%",options="header"]
+[stripes=even]
+|====================
+|Field | Type|Description|Since
+|status|object|No comments found.|-
+|code|string|No comments found.|-
+|msg|string|No comments found.|-
+|data|object|No comments found.|-
+|└─deptId|int64|部门id|-
+|└─parentId|int64|父部门id|-
+|└─ancestors|string|祖级列表|-
+|└─deptName|string|部门名称|-
+|└─orderNum|int32|显示顺序|-
+|└─leader|string|负责人|-
+|└─phone|string|联系电话|-
+|└─email|string|邮箱|-
+|└─status|string|部门状态（0正常 1停用）|-
+|└─delFlag|string|删除标志（0代表存在 2代表删除）|-
+|└─createBy|string|创建者|-
+|└─createTime|string|创建时间|-
+|└─updateBy|string|更新者|-
+|└─updateTime|string|更新时间|-
+|└─bId|int64|建筑id|-
+|exception|string|No comments found.|-
+|====================
+
+*Response-example:*
+----
+{
+	"status": {
+		
+	},
+	"code": "97564",
+	"msg": "wnr5qt",
+	"data": [
+		{
+			"deptId": 540,
+			"parentId": 858,
+			"ancestors": "o5lg60",
+			"deptName": "文.沈",
+			"orderNum": 260,
+			"leader": "ufz93p",
+			"phone": "17852835049",
+			"email": "智渊.徐@yahoo.com",
+			"status": "nu6cnp",
+			"delFlag": "72oiji",
+			"createBy": "5fxr6j",
+			"createTime": "2022-04-21 16:57:10",
+			"updateBy": "4kcs4e",
+			"updateTime": "2022-04-21 16:57:10",
+			"bId": 977
+		}
+	],
+	"exception": "53u6bg"
+}
+----
+
+== <p>用户信息表 前端控制器</p>
+

service-website/service-website-biz/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="/var/log/uskycloud/website-service" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.usky" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>

service-website/service-website-biz/src/main/resources/mapper/website/SiteArticleMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.website.mapper.SiteArticleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.website.domain.SiteArticle">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="author" property="author" />
+        <result column="content" property="content" />
+        <result column="hits" property="hits" />
+        <result column="htmlfilepath" property="htmlfilepath" />
+        <result column="istop" property="istop" />
+        <result column="categoryid" property="categoryid" />
+        <result column="image" property="image" />
+        <result column="lmtitle" property="lmtitle" />
+        <result column="zhaiyao" property="zhaiyao" />
+        <result column="createdate" property="createdate" />
+        <result column="modifydate" property="modifydate" />
+    </resultMap>
+
+</mapper>

service-website/service-website-biz/src/main/resources/mapper/website/SiteCategoryMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.website.mapper.SiteCategoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.website.domain.SiteCategory">
+        <id column="id" property="id" />
+        <result column="pid" property="pid" />
+        <result column="category_name" property="categoryName" />
+        <result column="sname" property="sname" />
+        <result column="isNew" property="isNew" />
+        <result column="tpl" property="tpl" />
+        <result column="imagePath" property="imagePath" />
+        <result column="metakeywords" property="metakeywords" />
+        <result column="metadescription" property="metadescription" />
+        <result column="createdate" property="createdate" />
+        <result column="modifydate" property="modifydate" />
+        <result column="sortindex" property="sortindex" />
+        <result column="status" property="status" />
+    </resultMap>
+
+</mapper>

service-website/service-website-biz/src/main/resources/mapper/website/SysUserMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.website.mapper.SysUserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.website.domain.SysUser">
+        <id column="user_id" property="userId" />
+        <result column="dept_id" property="deptId" />
+        <result column="user_name" property="userName" />
+        <result column="nick_name" property="nickName" />
+        <result column="user_type" property="userType" />
+        <result column="email" property="email" />
+        <result column="phonenumber" property="phonenumber" />
+        <result column="sex" property="sex" />
+        <result column="avatar" property="avatar" />
+        <result column="password" property="password" />
+        <result column="status" property="status" />
+        <result column="del_flag" property="delFlag" />
+        <result column="login_ip" property="loginIp" />
+        <result column="login_date" property="loginDate" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

service-website/service-website-biz/src/main/resources/smart-doc.json

@@ -0,0 +1,15 @@
+{
+  "outPath":"./src/main/resources/doc",
+  "serverUrl": "http:10.23.39.1:8082/",
+  "isStrict": false,
+  "coverOld": true,
+  "allInOne": true,
+  "packageFilters": "com.usky.demo.controller.web",
+  "requestExample":"false",
+  "responseExample":"true",
+  "projectName": "安防项目",
+  "appKey": "20211216921084883495813120",
+  "appToken":"36bde2426ad546a5a50311bb747e7e61",
+  "secret": "N@Pd,KXAHki*BW3=zK.XPNykf!=CM79J",
+  "openUrl": "http://101.133.214.75:7700/api"
+}