Parcourir la source

添加backend项目

yq il y a 3 ans
Parent
commit
74666bc46c
31 fichiers modifiés avec 840 ajouts et 323 suppressions
  1. 2 1
      pom.xml
  2. 18 0
      service-backend/pom.xml
  3. 27 0
      service-backend/service-backend-api/pom.xml
  4. 105 0
      service-backend/service-backend-api/src/main/java/com/usky/backend/domain/SysUserVO.java
  5. 135 0
      service-backend/service-backend-biz/pom.xml
  6. 37 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/RuoYiSystemApplication.java
  7. 108 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/MybatisGeneratorUtils.java
  8. 8 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/TestController.java
  9. 49 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/web/SysUserController.java
  10. 42 22
      service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/SysUser.java
  11. 16 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysUserMapper.java
  12. 16 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysUserService.java
  13. 20 0
      service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysUserServiceImpl.java
  14. 25 0
      service-backend/service-backend-biz/src/main/resources/bootstrap.yml
  15. 108 0
      service-backend/service-backend-biz/src/main/resources/doc/index.adoc
  16. 74 0
      service-backend/service-backend-biz/src/main/resources/logback.xml
  17. 28 0
      service-backend/service-backend-biz/src/main/resources/mapper.backend/SysUserMapper.xml
  18. 15 0
      service-backend/service-backend-biz/src/main/resources/smart-doc.json
  19. 2 5
      usky-module-demo/usky-module-demo-api/src/main/java/com/usky/demo/RemoteUserService.java
  20. 5 5
      usky-module-demo/usky-module-demo-biz/pom.xml
  21. 0 21
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/controller/web/SysConfigController.java
  22. 0 44
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/controller/web/SysDeptController.java
  23. 0 78
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/domain/SysConfig.java
  24. 0 16
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/mapper/SysConfigMapper.java
  25. 0 16
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/mapper/SysDeptMapper.java
  26. 0 16
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/SysConfigService.java
  27. 0 16
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/SysDeptService.java
  28. 0 20
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/impl/SysConfigServiceImpl.java
  29. 0 20
      usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/impl/SysDeptServiceImpl.java
  30. 0 19
      usky-module-demo/usky-module-demo-biz/src/main/resources/mapper.demo/SysConfigMapper.xml
  31. 0 24
      usky-module-demo/usky-module-demo-biz/src/main/resources/mapper.demo/SysDeptMapper.xml

+ 2 - 1
pom.xml

@@ -12,10 +12,11 @@
     <packaging>pom</packaging>
 
     <description>
-        usky-demo ????
+        usky-demo 测试
     </description>
     <modules>
         <module>usky-module-demo</module>
+    <module>service-backend</module>
   </modules>
 
 

+ 18 - 0
service-backend/pom.xml

@@ -0,0 +1,18 @@
+<?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-backend</artifactId>
+
+    <packaging>pom</packaging>
+    <version>0.0.1</version>
+
+<modules>  <module>service-backend-biz</module>
+    <module>service-backend-api</module>
+  </modules>
+</project>

+ 27 - 0
service-backend/service-backend-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-backend</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-backend-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>

+ 105 - 0
service-backend/service-backend-api/src/main/java/com/usky/backend/domain/SysUserVO.java

@@ -0,0 +1,105 @@
+package com.usky.backend.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;
+}

+ 135 - 0
service-backend/service-backend-biz/pom.xml

@@ -0,0 +1,135 @@
+<?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-backend</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-backend-biz</artifactId>
+    <dependencies>
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+<!--        &lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>-->
+<!--        </dependency>-->
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-spring</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-mvc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.18.Final</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.1</version>
+        </dependency>
+
+        <!-- mysql 驱动 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-backend-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-module-demo-api</artifactId>
+            <version>0.0.1</version>
+        </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>

+ 37 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/RuoYiSystemApplication.java

@@ -0,0 +1,37 @@
+package com.usky.backend;
+
+
+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.backend.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" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

+ 108 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/MybatisGeneratorUtils.java

@@ -0,0 +1,108 @@
+package com.usky.backend.controller;//package com.usky.backend.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.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/7/6 11:42
+ */
+public class MybatisGeneratorUtils {
+    public static void main(String[] args) {
+
+            shell("service-backend","service-backend-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://47.111.81.118:3306/dm?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("Yt2021");
+        mpg.setDataSource(dsc);
+
+        // 3、包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent("com.usky.backend");
+        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.mvc.base.CrudMapper");
+        strategy.setSuperServiceClass("com.usky.common.mvc.base.CrudService");
+        strategy.setSuperServiceImplClass("com.usky.common.mvc.base.AbstractCrudService");
+        // strategy.setTablePrefix("t_"); // 表名前缀
+        strategy.setEntityLombokModel(true); //使用lombok
+        //修改自己想要生成的表
+        strategy.setInclude("sys_config");  // 逆向工程使用的表   如果要生成多个,这里可以传入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.backend" + "/"
+                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        tc.setXml(null);
+        mpg.setTemplate(tc);
+        //5、执行
+        mpg.execute();
+    }
+}

+ 8 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/TestController.java

@@ -0,0 +1,8 @@
+package com.usky.backend.controller;//package com.usky.backend.controller;
+//
+//
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@RestController
+//public class TestController {
+//}

+ 49 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/web/SysUserController.java

@@ -0,0 +1,49 @@
+package com.usky.backend.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.backend.domain.SysUser;
+import com.usky.backend.service.SysUserService;
+import com.usky.demo.RemoteUserService;
+import com.usky.demo.domain.SysUserVO;
+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;
+
+
+    @Autowired
+    private RemoteUserService remoteUserService;
+
+    public ApiResult<List<SysUser>> list(){
+        return ApiResult.success(sysUserService.list());
+    }
+
+
+    @GetMapping("feginTest")
+    public ApiResult<List<SysUserVO>> feginTest() {
+        ApiResult<List<SysUserVO>> test = remoteUserService.getByUserName("test");
+        List<SysUserVO> data = test.getData();
+        return test;
+    }
+}
+

+ 42 - 22
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/domain/SysDept.java → service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/SysUser.java

@@ -1,4 +1,4 @@
-package com.usky.demo.domain;
+package com.usky.backend.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 部门
+ * 用户信息
  * </p>
  *
  * @author ya
@@ -19,53 +19,63 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysDept implements Serializable {
+public class SysUser implements Serializable {
 
     private static final long serialVersionUID=1L;
 
     /**
-     * 部门id
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Long userId;
+
+    /**
+     * 部门ID
      */
-    @TableId(value = "dept_id", type = IdType.AUTO)
     private Long deptId;
 
     /**
-     * 父部门id
+     * 用户账号
      */
-    private Long parentId;
+    private String userName;
 
     /**
-     * 祖级列表
+     * 用户昵称
      */
-    private String ancestors;
+    private String nickName;
 
     /**
-     * 部门名称
+     * 用户类型(00系统用户)
      */
-    private String deptName;
+    private String userType;
 
     /**
-     * 显示顺序
+     * 用户邮箱
      */
-    private Integer orderNum;
+    private String email;
 
     /**
-     * 负责人
+     * 手机号码
      */
-    private String leader;
+    private String phonenumber;
 
     /**
-     * 联系电话
+     * 用户性别(0男 1女 2未知)
      */
-    private String phone;
+    private String sex;
 
     /**
-     * 邮箱
+     * 头像地址
      */
-    private String email;
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
 
     /**
-     * 部门状态(0正常 1停用)
+     * 帐号状态(0正常 1停用)
      */
     private String status;
 
@@ -74,6 +84,16 @@ public class SysDept implements Serializable {
      */
     private String delFlag;
 
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
     /**
      * 创建者
      */
@@ -95,9 +115,9 @@ public class SysDept implements Serializable {
     private LocalDateTime updateTime;
 
     /**
-     * 建筑id
+     * 备注
      */
-    private Long bId;
+    private String remark;
 
 
 }

+ 16 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysUserMapper.java

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

+ 16 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysUserService.java

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

+ 20 - 0
service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysUserServiceImpl.java

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

+ 25 - 0
service-backend/service-backend-biz/src/main/resources/bootstrap.yml

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

+ 108 - 0
service-backend/service-backend-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
+|====================
+
+
+== &lt;p&gt;参数配置表 前端控制器&lt;/p&gt;
+== &lt;p&gt;部门信息&lt;/p&gt;
+=== 查看部门信息
+*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"
+}
+----
+
+== &lt;p&gt;用户信息表 前端控制器&lt;/p&gt;
+

+ 74 - 0
service-backend/service-backend-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="logs/ruoyi-system" />
+   <!-- 日志输出格式 -->
+	<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>

+ 28 - 0
service-backend/service-backend-biz/src/main/resources/mapper.backend/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.backend.mapper.SysUserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.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>

+ 15 - 0
service-backend/service-backend-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"
+}

+ 2 - 5
usky-module-demo/usky-module-demo-api/src/main/java/com/usky/demo/RemoteUserService.java

@@ -5,10 +5,7 @@ import com.usky.common.core.bean.ApiResult;
 import com.usky.demo.domain.SysUserVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -19,7 +16,7 @@ public interface RemoteUserService {
 
 
     @GetMapping("/byUserName")
-    ApiResult<List<SysUserVO>> getByUserName(String userName);
+    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
 
 
     @PostMapping("/byUserName")

+ 5 - 5
usky-module-demo/usky-module-demo-biz/pom.xml

@@ -23,11 +23,11 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>-->
+<!--        </dependency>-->
 
         <!-- SpringBoot Actuator -->
         <dependency>

+ 0 - 21
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/controller/web/SysConfigController.java

@@ -1,21 +0,0 @@
-package com.usky.demo.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 参数配置表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@Controller
-@RequestMapping("/sysConfig")
-public class SysConfigController {
-
-}
-

+ 0 - 44
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/controller/web/SysDeptController.java

@@ -1,44 +0,0 @@
-package com.usky.demo.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.demo.domain.SysDept;
-import com.usky.demo.domain.SysUser;
-import com.usky.demo.service.SysDeptService;
-import com.usky.demo.service.SysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 部门信息
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@RestController
-@RequestMapping("/sysDept")
-public class SysDeptController {
-
-
-    @Autowired
-    private SysDeptService sysDeptService;
-
-    /**
-     * 查看部门信息
-     * @return
-     */
-    @PostMapping("list")
-    public ApiResult<List<SysDept>> list(@RequestBody SysDept sysDept){
-        return ApiResult.success(sysDeptService.list());
-    }
-}
-

+ 0 - 78
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/domain/SysConfig.java

@@ -1,78 +0,0 @@
-package com.usky.demo.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 SysConfig implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 参数主键
-     */
-    @TableId(value = "config_id", type = IdType.AUTO)
-    private Integer configId;
-
-    /**
-     * 参数名称
-     */
-    private String configName;
-
-    /**
-     * 参数键名
-     */
-    private String configKey;
-
-    /**
-     * 参数键值
-     */
-    private String configValue;
-
-    /**
-     * 系统内置(Y是 N否)
-     */
-    private String configType;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}

+ 0 - 16
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/mapper/SysConfigMapper.java

@@ -1,16 +0,0 @@
-package com.usky.demo.mapper;
-
-import com.usky.demo.domain.SysConfig;
-import com.usky.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- * 参数配置表 Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysConfigMapper extends CrudMapper<SysConfig> {
-
-}

+ 0 - 16
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/mapper/SysDeptMapper.java

@@ -1,16 +0,0 @@
-package com.usky.demo.mapper;
-
-import com.usky.demo.domain.SysDept;
-import com.usky.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- * 部门表 Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysDeptMapper extends CrudMapper<SysDept> {
-
-}

+ 0 - 16
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/SysConfigService.java

@@ -1,16 +0,0 @@
-package com.usky.demo.service;
-
-import com.usky.demo.domain.SysConfig;
-import com.usky.common.mvc.base.CrudService;
-
-/**
- * <p>
- * 参数配置表 服务类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysConfigService extends CrudService<SysConfig> {
-
-}

+ 0 - 16
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/SysDeptService.java

@@ -1,16 +0,0 @@
-package com.usky.demo.service;
-
-import com.usky.demo.domain.SysDept;
-import com.usky.common.mvc.base.CrudService;
-
-/**
- * <p>
- * 部门表 服务类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysDeptService extends CrudService<SysDept> {
-
-}

+ 0 - 20
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/impl/SysConfigServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.demo.service.impl;
-
-import com.usky.demo.domain.SysConfig;
-import com.usky.demo.mapper.SysConfigMapper;
-import com.usky.demo.service.SysConfigService;
-import com.usky.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 参数配置表 服务实现类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@Service
-public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, SysConfig> implements SysConfigService {
-
-}

+ 0 - 20
usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/impl/SysDeptServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.demo.service.impl;
-
-import com.usky.demo.domain.SysDept;
-import com.usky.demo.mapper.SysDeptMapper;
-import com.usky.demo.service.SysDeptService;
-import com.usky.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 部门表 服务实现类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@Service
-public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDept> implements SysDeptService {
-
-}

+ 0 - 19
usky-module-demo/usky-module-demo-biz/src/main/resources/mapper.demo/SysConfigMapper.xml

@@ -1,19 +0,0 @@
-<?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.demo.mapper.SysConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.demo.domain.SysConfig">
-        <id column="config_id" property="configId" />
-        <result column="config_name" property="configName" />
-        <result column="config_key" property="configKey" />
-        <result column="config_value" property="configValue" />
-        <result column="config_type" property="configType" />
-        <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>

+ 0 - 24
usky-module-demo/usky-module-demo-biz/src/main/resources/mapper.demo/SysDeptMapper.xml

@@ -1,24 +0,0 @@
-<?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.demo.mapper.SysDeptMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.demo.domain.SysDept">
-        <id column="dept_id" property="deptId" />
-        <result column="parent_id" property="parentId" />
-        <result column="ancestors" property="ancestors" />
-        <result column="dept_name" property="deptName" />
-        <result column="order_num" property="orderNum" />
-        <result column="leader" property="leader" />
-        <result column="phone" property="phone" />
-        <result column="email" property="email" />
-        <result column="status" property="status" />
-        <result column="del_flag" property="delFlag" />
-        <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="b_id" property="bId" />
-    </resultMap>
-
-</mapper>