UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.整合MyBatis Plus

Browse Source 
2.合并api-admin和api-common模块，精简目录层级
3.删除无用和重复的依赖及目录
newFrame
x_z 3 years ago
parent 7349a95508
commit 8f09c46796
1290 changed files with 6617 additions and 8681 deletions
Show Stats Download Patch File Download Diff File

390
api-admin/pom.xml
Unescape Escape View File

@ -1,390 +0,0 @@
<?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>api</artifactId>
<groupId>com.glxp</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>api-admin</artifactId>
<dependencies>
<!--引入公共模块，版本继承父级-->
<dependency>
<groupId>com.glxp</groupId>
<artifactId>api-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<!--让配置文件有提示-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<!--AOP拦截-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!--Redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--热启动-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!--数据库相关-->
<!--MySQL-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.21</version>
<scope>runtime</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.oracle</groupId>-->
<!-- <artifactId>ojdbc6</artifactId>-->
<!-- <version>11.2.0.4</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.4.0</version>
<type>pom</type>
</dependency>
<!--连接池-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.10</version>
</dependency>
<!--mybatis -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>com.itfsw</groupId>
<artifactId>mybatis-generator-plugin</artifactId>
<version>1.3.8</version>
</dependency>
<!--分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.1.7</version>
</dependency>
<!--自动生成 GET SET-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<!--JWT-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!--Json 操作-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
<version>1.2.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!--解析excel-->
<!--xls-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.0</version>
</dependency>
<!--xlsx-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.0.0</version>
</dependency>
<!-- PDF打印 -->
<dependency>
<groupId>com.glxp</groupId>
<artifactId>tochina</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<!--Hutool是一个小而全的Java工具类库-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.9</version>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.0</version>
</dependency>
<!-- 二维码工具 考虑到Hutool的非强制依赖性，因此zxing需要用户自行引入 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.olap4j</groupId>
<artifactId>olap4j</artifactId>
<version>1.2.0</version>
</dependency>
<!-- jasperreports-dependency-begin -->
<!-- jasperreports-->
<!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j -->
<!-- jasperreports相关 -->
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.olap4je</groupId>
<artifactId>olap4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.5.1</version>
<exclusions>
<exclusion>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-fonts</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-pdfa</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.7</version>
</dependency>
<dependency>
<groupId>cn.lesper</groupId>
<artifactId>iTextAsian</artifactId>
<version>3.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-bridge -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.11</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-dom -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>com.lowagie.text</artifactId>
<version>2.1.7</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.30.0</version>
</dependency>
<!-- jasperreports end-->
<!-- jasperreports-dependency-end -->
</dependencies>
<build>
<finalName>UDI_WMS_MC</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<!-- 5、添加插件指定jdk -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<!-- executable 可指定也可不用 -->
<!--<executable>C:\Program Files\Java\jdk1.8.0_191\bin\javac</executable>-->
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork><!-- 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<!--生产-->
<id>pro</id>
<properties>
<profiles.active>pro</profiles.active>
</properties>
<!--是否默认，默认打包开发环境配置-->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!--开发-->
<id>dev</id>
<properties>
<profiles.active>dev</profiles.active>
</properties>
</profile>
<profile>
<!--测试1-->
<id>test1</id>
<properties>
<profiles.active>test1</profiles.active>
</properties>
</profile>
<profile>
<!--测试2-->
<id>test2</id>
<properties>
<profiles.active>test2</profiles.active>
</properties>
</profile>
</profiles>
</project>

18
api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java
Unescape Escape View File

@ -1,18 +0,0 @@
package com.glxp.api.admin.config;
import com.alibaba.druid.support.http.WebStatFilter;
import javax.servlet.annotation.WebFilter;
import javax.servlet.annotation.WebInitParam;
/**
* 配置监控拦截器 (过滤不需要监控的后缀)
* druid监控拦截器
*/
@WebFilter(filterName = "druidWebStatFilter", urlPatterns = "/*",
initParams = {
@WebInitParam(name = "exclusions", value = "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")//忽略资源
}
)
public class DruidStatFilter extends WebStatFilter {
}

21
api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java
Unescape Escape View File

@ -1,21 +0,0 @@
package com.glxp.api.admin.config;
import com.alibaba.druid.support.http.StatViewServlet;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
/**
* druid监控视图配置 (监控视图配置)
*/
@WebServlet(urlPatterns = "/druid/*", initParams={
@WebInitParam(name="allow",value="127.0.0.1"),// IP白名单 (没有配置或者为空，则允许所有访问)
@WebInitParam(name="deny",value="192.168.16.111"),// IP黑名单 (存在共同时，deny优先于allow)
@WebInitParam(name="loginUsername",value="api"),// 用户名
@WebInitParam(name="loginPassword",value="api"),// 密码
@WebInitParam(name="resetEnable",value="true")// 禁用HTML页面上的“Reset All”功能
})
public class DruidStatViewServlet extends StatViewServlet {
private static final long serialVersionUID = 2359758657306626394L;
}

34
api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java
Unescape Escape View File

@ -1,34 +0,0 @@
package com.glxp.api.admin.config;
import com.github.pagehelper.PageHelper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
@Configuration
public class PageHelperConfig {
/**
* 注入pagehelper配置
*
* @return
*/
@Bean
public PageHelper getPageHelper() {
PageHelper pageHelper = new PageHelper();
Properties properties = new Properties();
properties.setProperty("offsetAsPageNum", "false");
properties.setProperty("rowBoundsWithCount", "false");
properties.setProperty("pageSizeZero", "true");
properties.setProperty("reasonable", "false");
properties.setProperty("supportMethodsArguments", "false");
properties.setProperty("returnPageInfo", "none");
properties.setProperty("autoDialect", "true");
properties.setProperty("autoRuntimeDialect", "true"); //处理多数据源数据库
System.out.println("配置多数据"+properties.getProperty("autoRuntimeDialect"));
pageHelper.setProperties(properties);
return pageHelper;
}
}

4
api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java
Unescape Escape View File

@ -1,4 +0,0 @@
package com.glxp.api.admin.controller.inout.utils;
public class TransInoutUtil {
}

4
api-admin/src/main/java/com/glxp/api/admin/controller/scdemon/ScdemonController.java
Unescape Escape View File

@ -1,4 +0,0 @@
package com.glxp.api.admin.controller.scdemon;
public class ScdemonController {
}

20
api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java
Unescape Escape View File

@ -1,20 +0,0 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import lombok.Data;
import java.util.List;
@Data
public class PostInnerOrderRequest {
int editStatus;
InnerOrderEntity innerOrderEntity;
List<InnerOrderDetailEntity> innerOrderDetailEntities;
List<StockOrderDetailEntity> subErpOrders;
}

20
api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java
Unescape Escape View File

@ -1,20 +0,0 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity;
import com.glxp.api.admin.entity.purchase.PurPlanEntity;
import lombok.Data;
import java.util.List;
@Data
public class PostPurPlanRequest {
int editStatus;
PurPlanEntity purPlanEntity;
List<PurPlanDetailEntity> purPlanDetailEntities;
List<StockOrderDetailEntity> subErpOrders;
}

6
api-admin/src/main/java/com/glxp/api/admin/service/info/SysServerLogService.java
Unescape Escape View File

@ -1,6 +0,0 @@
package com.glxp.api.admin.service.info;
import org.springframework.stereotype.Service;
public interface SysServerLogService {
}

22
api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java
Unescape Escape View File

@ -1,22 +0,0 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import com.glxp.api.admin.entity.purchase.PurPlanEntity;
import com.glxp.api.admin.req.purchase.PurApplyRequest;
import com.glxp.api.admin.req.purchase.PurPlanRequest;
import com.glxp.api.admin.res.purchase.PurPlanResponse;
import java.util.List;
public interface IPurPlanService {
List<PurPlanResponse> queryPageList(PurPlanRequest purPlanRequest);
Boolean insert(PurPlanEntity purPlanRequest);
Boolean update(PurPlanEntity purPlanRequest);
Boolean deleteByIds(List<Integer> ids);
}

68
api-admin/src/main/resources/application-pro.properties
Unescape Escape View File

@ -1,68 +0,0 @@
# \u672C\u5730\u73AF\u5883
server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=Glxp@6066
#spring.datasource.password=89083fb2fc145533
server.servlet.context-path=
#logging.level.com.glxp.api.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
logging.level.com.glxp.api.admin.erp.second=debug
#logback配置
logging.path=output/logs
# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称
#logging.file=D:/udi.log
#file_path=D:/udi/udiwms/udiwmsfile/
file_path=/home/glxp/udiwms
#UDI数据下载
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
#中转服务IP地址
SPSYNC_IP=http://122.112.160.36:9150/SP_SYNC_SERVER
#SPSYNC_IP=http://127.0.0.1:9989
#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
#UDI_SERVER_URL=http://127.0.0.1:9995
##端口号
# Redis数据库索引（默认为0）
spring.redis.database=8
# Redis服务器地址
spring.redis.host=192.168.0.148
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=8
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=8
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.jedis.timeout=300
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
ok.http.connect-timeout=3000
ok.http.read-timeout=3000
ok.http.write-timeout=3000
# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
ok.http.max-idle-connections=200
# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
ok.http.keep-alive-duration=300

64
api-admin/src/main/resources/application-test1.properties
Unescape Escape View File

@ -1,64 +0,0 @@
# \u672C\u5730\u73AF\u5883
server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3360/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=root
#spring.datasource.password=89083fb2fc145533
server.servlet.context-path=
#logging.level.com.glxp.api.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
logging.level.com.glxp.api.admin.erp.second=debug
#file_path=D:/udi/udiwms/udiwmsfile/
file_path=/home/glxp/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740
#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
SPSYNC_IP=http://127.0.0.1:9989
#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
#UDI_SERVER_URL=http://127.0.0.1:9995
##\u7AEF\u53E3\u53F7
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=8
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=192.168.0.66
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6400
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=8
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=8
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.jedis.timeout=300
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
ok.http.connect-timeout=3000
ok.http.read-timeout=3000
ok.http.write-timeout=3000
# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
ok.http.max-idle-connections=200
# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
ok.http.keep-alive-duration=300

64
api-admin/src/main/resources/application-test2.properties
Unescape Escape View File

@ -1,64 +0,0 @@
# \u672C\u5730\u73AF\u5883
server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3361/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=root
#spring.datasource.password=89083fb2fc145533
server.servlet.context-path=
#logging.level.com.glxp.api.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
logging.level.com.glxp.api.admin.erp.second=debug
#file_path=D:/udi/udiwms/udiwmsfile/
file_path=/home/glxp/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740
#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
SPSYNC_IP=http://127.0.0.1:9989
#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
#UDI_SERVER_URL=http://127.0.0.1:9995
##\u7AEF\u53E3\u53F7
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=8
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=192.168.0.66
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6401
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=8
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=8
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.jedis.timeout=300
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
ok.http.connect-timeout=3000
ok.http.read-timeout=3000
ok.http.write-timeout=3000
# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
ok.http.max-idle-connections=200
# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
ok.http.keep-alive-duration=300

8
api-admin/src/main/resources/application.properties
Unescape Escape View File

@ -1,8 +0,0 @@
spring.profiles.active=dev
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
mybatis.config-location=classpath:mybatis/mybatis-config.xml
mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml
spring.jmx.enabled=false

55
api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml
Unescape Escape View File

@ -1,55 +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.glxp.api.admin.dao.auth.DeptHisStatusDao">
<select id="selectDeptHisStatus" parameterType="com.glxp.api.admin.req.auth.SysRoleMenuRequest"
resultType="com.glxp.api.admin.entity.auth.DeptHisStatusEntity">>
SELECT *
FROM auth_dept_status
<where>
<if test="deptId != null ">
and deptId = #{deptId}
</if>
<if test="statusId != null ">
and statusId = #{statusId}
</if>
</where>
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
delete
from auth_dept_status
where deptId = #{id}
</delete>
<delete id="deleteByList" parameterType="java.util.List"
>
delete
from auth_dept_status
where deptId in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
insert INTO auth_dept_status
(
deptId,statusId
)
values
<foreach collection="list" item="item" index="index"
separator=",">
(
#{item.deptId},
#{item.statusId}
)
</foreach>
</insert>
</mapper>

72
api-admin/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
Unescape Escape View File

@ -1,72 +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.glxp.api.admin.dao.auth.DeptUserDao">
<select id="selectDeptUser" parameterType="com.glxp.api.admin.req.auth.DeptUserReqeust"
resultType="com.glxp.api.admin.entity.auth.DeptUserEntity">>
SELECT *
FROM auth_dept_user
<where>
<if test="deptId != null ">
and deptId = #{deptId}
</if>
<if test="userId != null ">
and userId = #{userId}
</if>
</where>
</select>
<select id="selectJoinDeptUser" parameterType="com.glxp.api.admin.req.auth.DeptUserReqeust"
resultType="com.glxp.api.admin.entity.auth.DeptUserEntity">>
SELECT auth_dept_user.*,auth_user.userName,auth_user.employeeName
FROM auth_dept_user INNER JOIN auth_user
on auth_dept_user.userId = auth_user.id
<where>
<if test="deptId != null ">
and deptId = #{deptId}
</if>
<if test="userId != null ">
and userId = #{userId}
</if>
</where>
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
delete
from auth_dept_user
where deptId = #{id}
</delete>
<delete id="deleteByList" parameterType="java.util.List"
>
delete
from auth_dept_user
where deptId in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
insert INTO auth_dept_user
(
deptId,userId
)
values
<foreach collection="list" item="item" index="index"
separator=",">
(
#{item.deptId},
#{item.userId}
)
</foreach>
</insert>
</mapper>

110
api-admin/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml
Unescape Escape View File

@ -1,110 +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.glxp.api.admin.dao.auth.SysDictDataMapper">
<resultMap type="com.glxp.api.admin.entity.auth.SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code"/>
<result property="dictSort" column="dict_sort"/>
<result property="dictLabel" column="dict_label"/>
<result property="dictValue" column="dict_value"/>
<result property="dictType" column="dict_type"/>
<result property="cssClass" column="css_class"/>
<result property="listClass" column="list_class"/>
<result property="isDefault" column="is_default"/>
<result property="status" column="status"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="selectDictDataList" parameterType="com.glxp.api.admin.req.auth.SysDictDataRequest"
resultMap="SysDictDataResult">
SELECT *
FROM sys_dict_data
<where>
<if test="dictType != null ">
and dict_type = #{dictType}
</if>
<if test="status != null ">
and status = #{status}
</if>
<if test="dictLabel != null ">
and dict_label = #{dictLabel}
</if>
<if test="dictValue != null ">
and dict_value = #{dictValue}
</if>
</where>
</select>
<select id="selectById" parameterType="Map"
resultMap="SysDictDataResult">
SELECT *
FROM sys_dict_data
WHERE dict_code = #{dictCode}
</select>
<delete id="deleteById" parameterType="java.lang.Long">
delete
from sys_dict_data
where dict_code = #{dictCode}
</delete>
<insert id="insert" keyProperty="id" useGeneratedKeys="true"
parameterType="com.glxp.api.admin.entity.auth.SysDictData">
INSERT INTO sys_dict_data(`dict_code`, `dict_sort`, dict_label, dict_value
, dict_type, css_class, list_class, is_default, status, remark,
create_by, create_time, update_by)
values (#{dictCode},
#{dictSort}, #{dictLabel}, #{dictValue}, #{dictType}, #{cssClass}, #{listClass}
, #{isDefault}, #{status}, #{remark}, #{createBy}, #{createTime}, #{updateBy})
</insert>
<update id="updateById" parameterType="com.glxp.api.admin.entity.auth.SysRole">
UPDATE sys_dict_data
<trim prefix="set" suffixOverrides=",">
<if test="dictCode != null">`dict_code`=#{dictCode},</if>
<if test="dictSort != null">`dict_sort`=#{dictSort},</if>
<if test="dictLabel != null">dict_label=#{dictLabel},</if>
<if test="dictValue != null">`dict_value`=#{dictValue},</if>
<if test="dictType != null">dict_type=#{dictType},</if>
<if test="cssClass != null">`css_class`=#{cssClass},</if>
<if test="listClass != null">`list_class`=#{listClass},</if>
<if test="isDefault != null">is_default=#{isDefault},</if>
<if test="status != null">status=#{status},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="createBy != null">create_by=#{createBy},</if>
<if test="createTime != null">`create_time`=#{createTime},</if>
<if test="updateBy != null">`update_by`=#{updateBy},</if>
</trim>
WHERE dict_code=#{dictCode}
</update>
<select id="exists" parameterType="com.glxp.api.admin.req.auth.SysDictDataRequest"
resultMap="SysDictDataResult">
SELECT *
FROM sys_dict_data
<where>
<if test="dictType != null ">
and dict_type = #{dictType}
</if>
<if test="status != null ">
and status = #{status}
</if>
<if test="dictLabel != null ">
and dict_label = #{dictLabel}
</if>
<if test="dictValue != null ">
and dict_value = #{dictValue}
</if>
</where>
limit 1
</select>
</mapper>

113
api-admin/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml
Unescape Escape View File

@ -1,113 +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.glxp.api.admin.dao.auth.SysDictTypeMapper">
<resultMap type="com.glxp.api.admin.entity.auth.SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id"/>
<result property="dictName" column="dict_name"/>
<result property="dictType" column="dict_type"/>
<result property="status" column="status"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="selectDictTypeList" parameterType="com.glxp.api.admin.req.auth.SysDictTypeRequest"
resultMap="SysDictTypeResult">
SELECT *
FROM sys_dict_type
<where>
<if test="dictId != null ">
and dict_type = #{dictId}
</if>
<if test="dictName != null ">
and status = #{dictName}
</if>
<if test="dictType != null ">
and dict_label = #{dictType}
</if>
<if test="status != null ">
and status = #{status}
</if>
</where>
</select>
<select id="selectById" parameterType="Map"
resultMap="SysDictTypeResult">
SELECT *
FROM sys_dict_type
WHERE dict_id = #{dictId}
</select>
<delete id="deleteById" parameterType="java.lang.Long">
delete
from sys_dict_type
where dict_id = #{dictId}
</delete>
<delete id="deleteBatchIds" parameterType="java.util.List"
>
delete
from sys_dict_type
where dict_id in
<foreach item="item" index="index" collection="dictIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="insert" keyProperty="id" useGeneratedKeys="true"
parameterType="com.glxp.api.admin.entity.auth.SysDictData">
INSERT INTO sys_dict_type(`dict_id`, dict_name, `dict_type`, status
create_by, create_time, update_by, update_time)
values (#{dictId},
#{dictName}, #{dictType}, #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime})
</insert>
<update id="updateById" parameterType="com.glxp.api.admin.entity.auth.SysRole">
UPDATE sys_dict_type
<trim prefix="set" suffixOverrides=",">
<if test="dictName != null">`dict_name`=#{dictName},</if>
<if test="dictType != null">dict_type=#{dictType},</if>
<if test="status != null">`status`=#{status},</if>
<if test="updateTime != null">update_time=#{updateTime},</if>
<if test="createBy != null">create_by=#{createBy},</if>
<if test="createTime != null">`create_time`=#{createTime},</if>
<if test="updateBy != null">`update_by`=#{updateBy},</if>
</trim>
WHERE dict_id=#{dictId}
</update>
<select id="exists" parameterType="com.glxp.api.admin.req.auth.SysDictTypeRequest"
resultMap="SysDictTypeResult">
SELECT *
FROM sys_dict_type
<where>
<if test="dictType != null ">
and dict_type = #{dictType}
</if>
<if test="status != null ">
and status = #{status}
</if>
<if test="dictLabel != null ">
and dict_label = #{dictLabel}
</if>
<if test="dictValue != null ">
and dict_value = #{dictValue}
</if>
</where>
limit 1
</select>
</mapper>

68
api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml
Unescape Escape View File

@ -1,68 +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.glxp.api.admin.dao.auth.SysHisStatusDao">
<select id="selectList" parameterType="com.glxp.api.admin.req.auth.FilterSysHisStatusRequest"
resultType="com.glxp.api.admin.entity.auth.SysHisStatusEntity">
select A.*,B.typeName parentName from sys_his_status A left JOIN sys_his_status B on A.parentId = B.id
<where>
<if test="id != null ">
and A.id = #{id}
</if>
<if test=" parentId != null">
and A.parentId = #{parentId}
</if>
<if test="typeName != null and '' != typeName">
AND A.`typeName` LIKE CONCAT('%',#{typeName},'%')
</if>
<if test="type != null and '' != type">
AND A.`type` LIKE CONCAT('%',#{type},'%')
</if>
</where>
</select>
<insert id="insert" keyProperty="id" parameterType="com.glxp.api.admin.entity.auth.DeptEntity">
INSERT INTO sys_his_status(`type`, `typeName`, `parentId`, status, remark, updateTime)
values (#{type},
#{typeName},
#{parentId}, #{status}, #{remark}, #{updateTime})
</insert>
<update id="update" parameterType="com.glxp.api.admin.entity.auth.DeptEntity">
UPDATE sys_his_status
<trim prefix="set" suffixOverrides=",">
<if test="type != null">`type`=#{type},</if>
<if test="typeName != null">`typeName`=#{typeName},</if>
<if test="parentId != null">parentId=#{parentId},</if>
<if test="status != null">status=#{status},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="remark != null">remark=#{remark},</if>
</trim>
WHERE id=#{id}
</update>
<delete id="deleteById" parameterType="java.lang.Integer">
delete
from sys_his_status
where id = #{id}
</delete>
<select id="selectListByDeptId" resultType="java.lang.Integer">
select id
from sys_his_status
left join auth_dept_status on sys_his_status.id = auth_dept_status.statusId
where auth_dept_status.deptId = #{deptId}
and sys_his_status.id not in
(select parentId
from sys_his_status
INNER JOIN auth_dept_status
on sys_his_status.id = auth_dept_status.statusId
and auth_dept_status.deptId = #{deptId})
</select>
</mapper>

208
api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml
Unescape Escape View File

@ -1,208 +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.glxp.api.admin.dao.auth.SysMenuDao">
<resultMap type="com.glxp.api.admin.entity.auth.SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id"/>
<result property="menuName" column="menu_name"/>
<result property="parentName" column="parent_name"/>
<result property="parentId" column="parent_id"/>
<result property="orderNum" column="order_num"/>
<result property="path" column="path"/>
<result property="component" column="component"/>
<result property="queryParam" column="query_param"/>
<result property="isFrame" column="is_frame"/>
<result property="isCache" column="is_cache"/>
<result property="menuType" column="menu_type"/>
<result property="visible" column="visible"/>
<result property="status" column="status"/>
<result property="perms" column="perms"/>
<result property="icon" column="icon"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="selectById" parameterType="java.lang.Long"
resultMap="SysMenuResult">
select *
FROM sys_menu
WHERE menu_id = #{id}
</select>
<insert id="insert" keyProperty="id" parameterType="com.glxp.api.admin.entity.auth.SysMenu">
INSERT INTO sys_menu(`menu_id`, `menu_name`, parent_id, `order_num`, `path`, component
, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon,
remark, create_by, create_time, update_time, update_by)
values (#{menuId},
#{menuName}, #{parentId},
#{orderNum}, #{path}, #{component}, #{queryParam}, #{isFrame}, #{isCache}
, #{menuType}, #{visible}, #{status}, #{perms}, #{icon}, #{remark}
, #{createBy}, #{createTime}, #{updateTime}, #{updateBy})
</insert>
<update id="updateById" parameterType="com.glxp.api.admin.entity.auth.SysMenu">
UPDATE sys_menu
<trim prefix="set" suffixOverrides=",">
<if test="menuName != null">`menu_name`=#{menuName},</if>
<if test="parentId != null">`parent_id`=#{parentId},</if>
<if test="orderNum != null">order_num=#{orderNum},</if>
<if test="path != null">`path`=#{path},</if>
<if test="component != null">component=#{component},</if>
<if test="queryParam != null">`query_param`=#{queryParam},</if>
<if test="isFrame != null">is_frame=#{isFrame},</if>
<if test="isCache != null">is_cache=#{isCache},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="menuType != null">`menu_type`=#{menuType},</if>
<if test="visible != null">`visible`=#{visible},</if>
<if test="status != null">status=#{status},</if>
<if test="perms != null">perms=#{perms},</if>
<if test="icon != null">icon=#{icon},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="createBy != null">create_by=#{createBy},</if>
<if test="createTime != null">create_time=#{createTime},</if>
<if test="updateTime != null">update_time=#{updateTime},</if>
<if test="updateBy != null">update_by=#{updateBy},</if>
</trim>
WHERE menu_id=#{menuId}
</update>
<delete id="deleteById" parameterType="java.lang.Long">
delete
from sys_menu
where menu_id = #{id}
</delete>
<select id="selectMenuTreeAll" parameterType="com.glxp.api.admin.entity.auth.SysMenu"
resultMap="SysMenuResult">
select *
FROM sys_menu
order by order_num
</select>
<select id="selectMenuList" parameterType="com.glxp.api.admin.req.auth.SysMenuRequest"
resultMap="SysMenuResult">
select *
FROM sys_menu
<where>
<if test="menuId != null ">
and menu_id = #{menuId}
</if>
<if test="menuName != null and menuName != '' ">
AND menu_name LIKE CONCAT('%',#{menuName},'%')
</if>
<if test="parentName != null and parentName != '' ">
AND `parent_name` = #{parentName}
</if>
<if test="parentId != null ">
AND `parent_id` = #{parentId}
</if>
<if test="orderNum != null ">
AND `order_num` = #{orderNum}
</if>
<if test="neMenuId != null ">
and menu_id <![CDATA[ <> ]]> #{neMenuId}
</if>
</where>
order by order_num
</select>
<select id="selectMenuListByUserId" parameterType="com.glxp.api.admin.entity.auth.SysMenu"
resultMap="SysMenuResult">
select distinct m.menu_id,
m.parent_id,
m.menu_name,
m.path,
m.component,
m.query_param,
m.visible,
m.status,
m.perms,
m.is_frame,
m.is_cache,
m.menu_type,
m.icon,
m.order_num,
m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role sur on rm.role_id = sur.role_id
left join sys_role ro on sur.role_id = ro.role_id
</select>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id,
m.parent_id,
m.menu_name,
m.path,
m.component,
m.query_param,
m.visible,
m.status,
m.perms,
m.is_frame,
m.is_cache,
m.menu_type,
m.icon,
m.order_num,
m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role sur on rm.role_id = sur.role_id
left join sys_role ro on sur.role_id = ro.role_id
left join auth_user u on sur.user_id = u.id
where u.id = #{userId}
and m.menu_type in ('M', 'C')
and m.status = '0'
and ro.status = '0'
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId}
<if test="menuCheckStrictly">
and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id =
rm.menu_id and rm.role_id = #{roleId})
</if>
order by m.parent_id, m.order_num
</select>
<select id="selectMenuPerms" resultType="String">
select distinct m.perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role sur on rm.role_id = sur.role_id
</select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
select distinct m.perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role sur on rm.role_id = sur.role_id
left join sys_role r on r.role_id = sur.role_id
where m.status = '0'
and r.status = '0'
and sur.user_id = #{userId}
</select>
<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
select distinct m.perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where m.status = '0'
and rm.role_id = #{roleId}
</select>
</mapper>

177
api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml
Unescape Escape View File

@ -1,177 +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.glxp.api.admin.dao.auth.SysRoleMapper">
<resultMap type="com.glxp.api.admin.entity.auth.SysRole" id="SysRoleResult">
<id property="roleId" column="role_id"/>
<result property="roleName" column="role_name"/>
<result property="roleKey" column="role_key"/>
<result property="roleSort" column="role_sort"/>
<result property="dataScope" column="data_scope"/>
<result property="menuCheckStrictly" column="menu_check_strictly"/>
<result property="deptCheckStrictly" column="dept_check_strictly"/>
<result property="status" column="status"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<insert id="insert" keyProperty="roleId" useGeneratedKeys="true"
parameterType="com.glxp.api.admin.entity.auth.SysRole">
INSERT INTO sys_role(`role_name`, `role_key`, role_sort, data_scope
, menu_check_strictly, dept_check_strictly, status, del_flag, remark,
create_by, create_time, update_by)
values (#{roleName},
#{roleKey}, #{roleSort}, #{dataScope}, #{menuCheckStrictly}, #{deptCheckStrictly}, #{status}
, #{delFlag}, #{remark}, #{createBy}, #{createTime}, #{updateBy})
</insert>
<update id="updateById" parameterType="com.glxp.api.admin.entity.auth.SysRole">
UPDATE sys_role
<trim prefix="set" suffixOverrides=",">
<if test="roleName != null">`role_name`=#{roleName},</if>
<if test="roleKey != null">`role_key`=#{roleKey},</if>
<if test="roleSort != null">role_sort=#{roleSort},</if>
<if test="dataScope != null">`data_scope`=#{dataScope},</if>
<if test="menuCheckStrictly != null">menu_check_strictly=#{menuCheckStrictly},</if>
<if test="deptCheckStrictly != null">`dept_check_strictly`=#{deptCheckStrictly},</if>
<if test="status != null">`status`=#{status},</if>
<if test="delFlag != null">del_flag=#{delFlag},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="createBy != null">create_by=#{createBy},</if>
<if test="createTime != null">`create_time`=#{createTime},</if>
<if test="updateBy != null">`update_by`=#{updateBy},</if>
<if test="updateTime != null">`update_time`=#{updateTime},</if>
</trim>
WHERE role_id=#{roleId}
</update>
<delete id="deleteBatchIds" parameterType="java.util.List"
>
delete
from sys_role
where role_id in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<delete id="deleteById" parameterType="java.lang.Long">
delete
from sys_role
where role_id = #{id}
</delete>
<select id="selectById" parameterType="java.lang.Long"
resultMap="SysRoleResult">
select *
FROM sys_role
WHERE role_id = #{id}
</select>
<sql id="selectRoleVo">
select distinct r.role_id,
r.role_name,
r.role_key,
r.role_sort,
r.data_scope,
r.menu_check_strictly,
r.dept_check_strictly,
r.status,
r.del_flag,
r.create_time,
r.remark
from sys_role r
left join sys_user_role sur on sur.role_id = r.role_id
left join auth_user u on u.id = sur.user_id
</sql>
<select id="selectRoleList" parameterType="com.glxp.api.admin.req.auth.SysRoleRequest"
resultMap="SysRoleResult">
SELECT *
FROM sys_role
<where>
<if test="roleId != null ">
and role_id = #{roleId}
</if>
<if test="roleName != null and roleName != ''">
AND role_name LIKE CONCAT('%',#{roleName},'%')
</if>
<if test="roleKey != null and roleKey != ''">
AND `role_key` = #{roleKey}
</if>
<if test="status != null and status != ''">
AND `status` = #{status}
</if>
<if test="neRoleName != null and neRoleName != ''">
AND `role_name` <![CDATA[ <> ]]> #{neRoleName}
</if>
<if test="neRoleKey != null and neRoleKey != ''">
AND `role_key` <![CDATA[ <> ]]> #{neRoleKey}
</if>
<if test="neRoleId != null ">
AND `role_id` <![CDATA[ <> ]]> #{neRoleId}
</if>
</where>
order by role_sort
</select>
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
select distinct r.role_id,
r.role_name,
r.role_key,
r.role_sort,
r.data_scope,
r.menu_check_strictly,
r.dept_check_strictly,
r.status,
r.del_flag,
r.create_time,
r.remark
from sys_role r
left join sys_user_role sur on sur.role_id = r.role_id
left join auth_user u on u.id = sur.user_id
WHERE sur.user_id = #{userId}
</select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
select r.role_id
from sys_role r
left join sys_user_role sur on sur.role_id = r.role_id
left join auth_user u on u.id = sur.user_id
where u.id = #{userId}
</select>
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
select distinct r.role_id,
r.role_name,
r.role_key,
r.role_sort,
r.data_scope,
r.menu_check_strictly,
r.dept_check_strictly,
r.status,
r.del_flag,
r.create_time,
r.remark
from sys_role r
left join sys_user_role sur on sur.role_id = r.role_id
left join auth_user u on u.id = sur.user_id
WHERE u.userName = #{userName}
</select>
</mapper>

60
api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml
Unescape Escape View File

@ -1,60 +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.glxp.api.admin.dao.auth.SysRoleMenuMapper">
<resultMap type="com.glxp.api.admin.entity.auth.SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id"/>
<result property="menuId" column="menu_id"/>
</resultMap>
<select id="selectRoleMenuList" parameterType="com.glxp.api.admin.req.auth.SysRoleMenuRequest"
resultMap="SysRoleMenuResult">
SELECT *
FROM sys_role_menu
<where>
<if test="roleId != null ">
and role_id = #{roleId}
</if>
<if test="menuId != null ">
and menu_id = #{menuId}
</if>
</where>
</select>
<delete id="deleteById" parameterType="java.lang.Long">
delete
from sys_role_menu
where role_id = #{id}
</delete>
<delete id="deleteByList" parameterType="java.util.List"
>
delete
from sys_role_menu
where role_id in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
insert INTO sys_role_menu
(
role_id,menu_id
)
values
<foreach collection="list" item="item" index="index"
separator=",">
(
#{item.roleId},
#{item.menuId}
)
</foreach>
</insert>
</mapper>

47
api-admin/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml
Unescape Escape View File

@ -1,47 +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.glxp.api.admin.dao.auth.SysUserRoleMapper">
<resultMap type="com.glxp.api.admin.entity.auth.SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id"/>
<result property="roleId" column="role_id"/>
</resultMap>
<select id="selectUserIdsByRoleId" resultType="Long">
select u.id
from auth_user u
inner join sys_user_role sur
on u.id = sur.user_id and sur.role_id = #{roleId}
</select>
<delete id="delete" parameterType="com.glxp.api.admin.req.auth.SysUserRoleRequest">
DELETE
FROM sys_user_role
<where>
<if test="userId != '' and userId != null">
AND user_id = #{userId}
</if>
<if test="roleId != '' and roleId != null">
AND role_id = #{roleId}
</if>
</where>
</delete>
<insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
insert INTO sys_user_role
(
user_id,role_id
)
values
<foreach collection="sysUserRoles" item="item" index="index"
separator=",">
(
#{item.userId},
#{item.roleId}
)
</foreach>
</insert>
</mapper>

39
api-admin/src/main/resources/mybatis/mapper/info/SysServerLogDao.xml
Unescape Escape View File

@ -1,39 +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.glxp.api.admin.dao.info.SysServerLogDao">
<select id="filterLog" parameterType="com.glxp.api.admin.req.info.FilterSysLogRequest"
resultType="com.glxp.api.admin.entity.info.SysServerLogEntity">
SELECT * FROM sys_server_log
<where>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
<if test="fileName != '' and fileName != null">
AND fileName = #{fileName}
</if>
</where>
</select>
<insert id="insertLog" parameterType="com.glxp.api.admin.entity.info.SysServerLogEntity">
insert
INTO sys_server_log(genTime,
fileName,
filePath,
`type`,
remark)
values (#{genTime},
#{fileName},
#{companyName},
#{filePath},
#{type},
#{remark})
</insert>
</mapper>

79
api-admin/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml
Unescape Escape View File

@ -1,79 +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.glxp.api.admin.dao.monitor.SysLogininforMapper">
<resultMap type="com.glxp.api.admin.entity.monitor.SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id"/>
<result property="userName" column="user_name"/>
<result property="status" column="status"/>
<result property="ipaddr" column="ipaddr"/>
<result property="loginLocation" column="login_location"/>
<result property="browser" column="browser"/>
<result property="os" column="os"/>
<result property="msg" column="msg"/>
<result property="loginTime" column="login_time"/>
</resultMap>
<select id="selectLogininforList" parameterType="com.glxp.api.admin.req.monitor.SysLogininforRequest"
resultMap="SysLogininforResult">
select *
FROM sys_logininfor
<where>
<if test="infoId != null ">
and info_id = #{infoId}
</if>
<if test="userName != null and userName != '' ">
AND `user_name` = #{userName}
</if>
<if test="status != null and status != '' ">
AND `status` = #{status}
</if>
<if test="ipaddr != null ">
AND `ipaddr` = #{ipaddr}
</if>
<if test="loginLocation != null ">
AND `login_location` = #{loginLocation}
</if>
</where>
</select>
<select id="selectById" parameterType="java.lang.Long"
resultMap="SysLogininforResult">
select *
FROM sys_logininfor
WHERE oper_id = #{id}
</select>
<insert id="insert" keyProperty="infoId" useGeneratedKeys="true"
parameterType="com.glxp.api.admin.entity.monitor.SysLogininfor">
INSERT INTO sys_logininfor( `user_name`, `status`, ipaddr, `login_location`, browser, `os`, msg
, login_time)
values (#{userName},
#{status}, #{ipaddr},
#{loginLocation}, #{browser}, #{os}, #{msg}, #{loginTime})
</insert>
<delete id="delete" parameterType="java.lang.Long">
delete
from sys_logininfor
where info_id = #{id}
</delete>
<delete id="deleteBatchIds" parameterType="java.util.List"
>
delete
from sys_logininfor
where info_id in
<foreach item="item" index="index" collection="infoIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>

110
api-admin/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml
Unescape Escape View File

@ -1,110 +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.glxp.api.admin.dao.monitor.SysOperLogMapper">
<resultMap type="com.glxp.api.admin.entity.monitor.SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id"/>
<result property="title" column="title"/>
<result property="businessType" column="business_type"/>
<result property="method" column="method"/>
<result property="requestMethod" column="request_method"/>
<result property="operatorType" column="operator_type"/>
<result property="operName" column="oper_name"/>
<result property="deptName" column="dept_name"/>
<result property="operUrl" column="oper_url"/>
<result property="operIp" column="oper_ip"/>
<result property="operLocation" column="oper_location"/>
<result property="operParam" column="oper_param"/>
<result property="jsonResult" column="json_result"/>
<result property="status" column="status"/>
<result property="errorMsg" column="error_msg"/>
<result property="operTime" column="oper_time"/>
<result property="operUserName" column="operUserName"/>
</resultMap>
<select id="selectList" parameterType="com.glxp.api.admin.req.monitor.SysOperLogRequest"
resultMap="SysOperLogResult">
select sys_oper_log.*,auth_user.employeeName operUserName
FROM sys_oper_log
left join auth_user
on sys_oper_log.oper_name = auth_user.id
<where>
<if test="operId != null ">
and oper_id = #{operId}
</if>
<if test="title != null and title != '' ">
AND `title` = #{title}
</if>
<if test="businessType != null and businessType != '' ">
AND `business_type` = #{businessType}
</if>
<if test="method != null ">
AND `method` = #{method}
</if>
<if test="requestMethod != null ">
AND `request_method` = #{requestMethod}
</if>
<if test="operatorType != null ">
AND `operator_type` = #{operatorType}
</if>
<if test="operName != null ">
AND `oper_name` = #{operName}
</if>
<if test="deptName != null ">
AND `dept_name` = #{deptName}
</if>
<if test="operUrl != null ">
AND `oper_url` = #{operUrl}
</if>
<if test="operIp != null ">
AND `oper_ip` = #{operIp}
</if>
<if test="status != null ">
AND `status` = #{status}
</if>
</where>
</select>
<select id="selectById" parameterType="java.lang.Long"
resultMap="SysOperLogResult">
select *
FROM sys_oper_log
WHERE oper_id = #{id}
</select>
<insert id="insert" keyProperty="operIp" useGeneratedKeys="true"
parameterType="com.glxp.api.admin.entity.monitor.SysOperLog">
INSERT INTO sys_oper_log(`oper_id`, `title`, business_type, `method`, `request_method`, operator_type
, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status,
error_msg, oper_time)
values ( #{operId},
#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}
, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}
, #{errorMsg}, #{operTime})
</insert>
<delete id="delete" parameterType="java.lang.Long">
delete
from sys_oper_log
where oper_id = #{id}
</delete>
<delete id="deleteBatchIds" parameterType="java.util.List"
>
delete
from sys_oper_log
where oper_id in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>

24
api-admin/src/main/resources/mybatis/mybatis-config.xml
Unescape Escape View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<!--配置全局属性-->
<settings>
<!-- 允许JDBC 生成主键。需要驱动器支持。如果设为了true，这个设置将强制使用被生成的主键，有一些驱动器不兼容不过仍然可以执行。 default:false -->
<setting name="useGeneratedKeys" value="true"/>
<!-- 是否可以使用列的别名 (取决于驱动的兼容性) default:true -->
<setting name="useColumnLabel" value="true"/>
<!-- 使用驼峰命名法转换字段。 -->
<setting name="mapUnderscoreToCamelCase" value="true"/>
</settings>
<plugins>
<!-- com.github.pagehelper为PageHelper类所在包名 -->
<plugin interceptor="com.github.pagehelper.PageInterceptor">
</plugin>
</plugins>
</configuration>

0
api-admin/src/main/resources/schemas/schema_v2.2.sql
Unescape Escape View File

2
api-admin/src/main/resources/static/.gitignore vendored
Unescape Escape View File

@ -1,2 +0,0 @@
*
!.gitignore

2
api-admin/src/main/resources/templates/.gitignore vendored
Unescape Escape View File

@ -1,2 +0,0 @@
*
!.gitignore

10
api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java
Unescape Escape View File

@ -1,10 +0,0 @@
package com.glxp.api;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class BaseApiAdminApplicationTest {
}

70
api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java
Unescape Escape View File

@ -1,70 +0,0 @@
package com.glxp.api.admin.service.auth.impl;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.BaseApiAdminApplicationTest;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.service.auth.AuthAdminService;
import org.junit.Test;
import javax.annotation.Resource;
import java.util.*;
import static org.junit.Assert.*;
public class AuthAdminServiceImplTest extends BaseApiAdminApplicationTest {
@Resource
private AuthAdminService authAdminService;
@Test
public void listAdminPage() {
Integer page = 1;
Integer limit = 20;
Integer status = 1;
String username = "api";
Long roleId = 1L;
AuthAdminQueryRequest authAdminQueryForm = new AuthAdminQueryRequest();
authAdminQueryForm.setPage(page);
authAdminQueryForm.setLimit(limit);
authAdminQueryForm.setUserFlag(status);
authAdminQueryForm.setUserName(username);
List<AuthAdmin> authAdminList = authAdminService.listAdminPage(authAdminQueryForm);
PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdminList);
System.out.println(authAdminPageInfo.getList());
assertTrue(authAdminPageInfo.getList().size() > 0);
}
@Test
public void findByUserName() {
}
@Test
public void findById() {
}
@Test
public void findPwdById() {
}
@Test
public void insertAuthAdmin() {
AuthAdmin authAdmin = new AuthAdmin();
authAdmin.setUserName("sssfff4");
authAdmin.setCreateTime(new Date());
authAdmin.setUserFlag(1);
boolean b = authAdminService.insertAuthAdmin(authAdmin);
assertTrue(b);
}
@Test
public void updateAuthAdmin() {
}
}

26
api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java
Unescape Escape View File

@ -1,26 +0,0 @@
package com.glxp.api.admin.service.auth.impl;
import com.glxp.api.BaseApiAdminApplicationTest;
import com.glxp.api.admin.service.auth.AuthLoginService;
import org.junit.Test;
import javax.annotation.Resource;
import java.util.List;
public class AuthLoginServiceImplTest extends BaseApiAdminApplicationTest {
@Resource
private AuthLoginService authLoginService;
@Test
public void listRuleByAdminId() {
Long adminId = 2L;
List<String> strings = authLoginService.listRuleByAdminId(adminId);
}
}

37
api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java
Unescape Escape View File

@ -1,37 +0,0 @@
package com.glxp.api.admin.service.auth.impl;
import com.glxp.api.BaseApiAdminApplicationTest;
import com.glxp.api.admin.entity.auth.AuthPermissionRule;
import com.glxp.api.admin.service.auth.AuthPermissionRuleService;
import org.junit.Test;
import javax.annotation.Resource;
import java.util.List;
import static org.junit.Assert.*;
public class AuthPermissionRuleServiceImplTest extends BaseApiAdminApplicationTest {
@Resource
private AuthPermissionRuleService authPermissionRuleService;
@Test
public void listByIdIn() {
}
@Test
public void listByPid() {
List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listByPid(0L);
assertTrue(authPermissionRuleList.size() > 0);
}
@Test
public void listAll() {
List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listAll();
assertTrue(authPermissionRuleList.size() > 0);
}
}

46
api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java
Unescape Escape View File

@ -1,46 +0,0 @@
package com.glxp.api.admin.service.auth.impl;
import com.glxp.api.BaseApiAdminApplicationTest;
import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
import com.glxp.api.admin.service.auth.AuthRoleAdminService;
import org.junit.Test;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.*;
public class AuthRoleAdminServiceImplTest extends BaseApiAdminApplicationTest {
@Resource
private AuthRoleAdminService authRoleAdminService;
@Test
public void listByAdminId() {
}
@Test
public void listByRoleId() {
}
@Test
public void insertAuthRoleAdminAll() {
List<AuthRoleAdmin> authRoleAdminList = new ArrayList<>();
long len = 3;
for (long i = 1; i <= len; i++) {
AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin();
if (i % 2 == 0) {
authRoleAdmin.setRole_id(i);
}
authRoleAdmin.setAdmin_id(i + 1);
authRoleAdminList.add(authRoleAdmin);
}
int i = authRoleAdminService.insertAuthRoleAdminAll(authRoleAdminList);
System.out.println(i);
assertEquals(1, i);
}
}

39
api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java
Unescape Escape View File

@ -1,39 +0,0 @@
package com.glxp.api.admin.service.auth.impl;
import com.glxp.api.BaseApiAdminApplicationTest;
import com.glxp.api.admin.entity.auth.AuthRole;
import com.glxp.api.admin.service.auth.AuthRoleService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.NormalTest;
import com.glxp.api.admin.util.OrderNoTypeBean;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Resource;
import java.util.List;
import static org.junit.Assert.*;
public class AuthRoleServiceImplTest extends BaseApiAdminApplicationTest {
private static final Logger log = LoggerFactory.getLogger(AuthRoleServiceImplTest.class);
@Resource
private AuthRoleService authRoleService;
@Test
public void listAdminPage() {
}
@Test
public void listAuthAdminRolePage() {
Integer page = 1;
Integer limit = 20;
List<AuthRole> authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null);
assertTrue(authRoleList.size() > 0);
}
}

24
api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java
Unescape Escape View File

@ -1,24 +0,0 @@
package com.glxp.api.admin.service.auth.impl;
import com.alibaba.fastjson.JSONObject;
import com.glxp.api.BaseApiAdminApplicationTest;
import org.junit.Test;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
public class MmpaTest extends BaseApiAdminApplicationTest {
RestTemplate restTemplate = new RestTemplate();
@Test
public void testConnect() {
ResponseEntity<String> response = restTemplate.postForEntity("https://udid.nmpa.gov.cn/api/beta/v1/connection/erp", "", String.class);
System.out.println(response.getBody());
}
}

36
api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java
Unescape Escape View File

@ -1,36 +0,0 @@
package com.glxp.api.admin.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.glxp.api.admin.httpclient.UdiDlHttpClient;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class DlDeviceTest {
@Resource
UdiDlHttpClient udiDlHttpClient;
private static final Logger log = LoggerFactory.getLogger(JwtUtilsTest.class);
@Test
public void testDonwload() {
// downDevice();
}
@Test
public void getDi(){
List<UdiInfoEntity> udiInfoEntityList = udiDlHttpClient.getUdiByDi("08714729834663");
log.info("rrr");
}
}

67
api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java
Unescape Escape View File

@ -1,67 +0,0 @@
package com.glxp.api.admin.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.BaseApiAdminApplicationTest;
import io.jsonwebtoken.Claims;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.assertNotNull;
public class JwtUtilsTest extends BaseApiAdminApplicationTest {
private static final Logger log = LoggerFactory.getLogger(JwtUtilsTest.class);
@Test
public void createToken() {
Map<String, Object> claims = new HashMap<>();
claims.put("admin_id", 12222222);
String token = JwtUtils.createToken(claims, 86400L);
System.out.println(token);
System.out.println(token.length());
assertNotNull(token);
}
@Test
public void createToken1() {
Map<String, Object> claims = new HashMap<>();
String token = JwtUtils.createToken(claims);
System.out.println(token);
assertNotNull(token);
}
@Test
public void parse() {
Map<String, Object> claims = new HashMap<>();
claims.put("admin_id", 1);
String token = JwtUtils.createToken(claims, 1000L);
System.out.println(token);
System.out.println(token.length());
Claims claim = JwtUtils.parse(token);
System.out.println(claim);
assertNotNull(claim);
System.out.println(claim.get("admin_id"));
}
@Test
public void tetsArray(){
String data = "121212";
String[] datas = data.split(",");
System.out.println(datas[0]);
}
}

76
api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java
Unescape Escape View File

@ -1,76 +0,0 @@
package com.glxp.api.admin.util;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.glxp.api.BaseApiAdminApplicationTest;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
public class NormalTest extends BaseApiAdminApplicationTest {
private static final Logger log = LoggerFactory.getLogger(NormalTest.class);
@Test
public void testMA() {
String data = "MA.156.M0.100334.0FPN95-06E6";
log.info(FilterUdiUtils.getDiStr(data));
String data2 = "#32543535#5454#45#5453#";
log.info(FilterUdiUtils.getUdi(data2).toString());
}
@Test
public void testPinyin() {
log.info(PinyinUtil.getFirstLetter("厦门高理性派", ""));
}
public static long getStartTime(String startTime) {
final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
final Date datetime;//将你的日期转换为时间戳
try {
datetime = sdf.parse(startTime);
final long time = datetime.getTime();
long curTime = System.currentTimeMillis();
if (curTime - time > 0) {
return 24 * 60 * 60 * 1000 - (curTime - time);
} else
return time - curTime;
} catch (ParseException e) {
e.printStackTrace();
}
return 0;
}
@Test
@AutoConfigureWebTestClient
public void testTime() {
// log.info(getStartTime("17:30:01")+"");
String data = "2022-07-15";
String setTime = "2022-09-26";
if (data.length() > 10) {
String resultDate = data.substring(0, 10);
log.info("1=" + resultDate);
if (setTime.compareTo(resultDate) > 0) {
log.info(">1" + resultDate);
}
} else if (data.length() == 10) {
if (setTime.compareTo(data) > 0) {
log.info(">2" + data);
}
}
}
}

26
api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java
Unescape Escape View File

@ -1,26 +0,0 @@
package com.glxp.api.admin.util;
import com.glxp.api.BaseApiAdminApplicationTest;
import com.glxp.api.admin.entity.auth.AuthPermissionRule;
import com.glxp.api.admin.service.auth.AuthPermissionRuleService;
import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse;
import org.junit.Test;
import javax.annotation.Resource;
import java.util.List;
public class PermissionRuleTreeUtilsTest extends BaseApiAdminApplicationTest {
@Resource
private AuthPermissionRuleService authPermissionRuleService;
@Test
public void merge() {
List<AuthPermissionRule> authPermissionRules = authPermissionRuleService.listAll();
List<AuthPermissionRuleMergeResponse> merge = PermissionRuleTreeUtils.merge(authPermissionRules,0L);
System.out.println(merge);
}
}

29
api-common/pom.xml
Unescape Escape View File

@ -1,29 +0,0 @@
<?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>api</artifactId>
<groupId>com.glxp</groupId>
<version>0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>api-common</artifactId>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
</project>

0
api-common/src/main/resources/application.properties
Unescape Escape View File

8
api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java
Unescape Escape View File

@ -1,8 +0,0 @@
package com.glxp.api.common.util;
public class ResultVOUtilsTest {
public void success() {
}
}

350
pom.xml
Unescape Escape View File

@ -6,14 +6,10 @@
<groupId>com.glxp</groupId>
<artifactId>api</artifactId>
<version>0.0.1</version>
<modules>
<module>api-admin</module>
<module>api-common</module>
</modules>
<packaging>pom</packaging>
<packaging>war</packaging>
<name>api</name>
<description>vue后台管理系统</description>
<description>UDI管理系统后台</description>
<parent>
<groupId>org.springframework.boot</groupId>
@ -26,14 +22,7 @@
<java.version>1.8</java.version>
</properties>
<dependencyManagement>
<dependencies>
<!--公共模块-->
<dependency>
<groupId>com.glxp</groupId>
<artifactId>api-common</artifactId>
<version>${version}</version>
</dependency>
<!--Json 操作-->
<dependency>
@ -49,7 +38,340 @@
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<!--让配置文件有提示-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!--Redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--热启动-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!--数据库相关-->
<!--MySQL-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.21</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
<version>10.2.0.4.0</version>
<type>pom</type>
</dependency>
<!--mybatis plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.2</version>
</dependency>
<!--分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.3.0</version>
<!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
-->
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--自动生成 GET SET-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<!--JWT-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
<version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!--解析excel-->
<!--xls-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.0</version>
</dependency>
<!--xlsx-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.0.0</version>
</dependency>
<!-- PDF打印 -->
<dependency>
<groupId>com.glxp</groupId>
<artifactId>tochina</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.1</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<!--Hutool是一个小而全的Java工具类库-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.9</version>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.0</version>
</dependency>
<!-- 二维码工具 考虑到Hutool的非强制依赖性，因此zxing需要用户自行引入 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.olap4j</groupId>
<artifactId>olap4j</artifactId>
<version>1.2.0</version>
</dependency>
<!-- jasperreports-dependency-begin -->
<!-- jasperreports-->
<!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j -->
<!-- jasperreports相关 -->
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.olap4je</groupId>
<artifactId>olap4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.5.1</version>
<exclusions>
<exclusion>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-fonts</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-pdfa</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.7</version>
</dependency>
<dependency>
<groupId>cn.lesper</groupId>
<artifactId>iTextAsian</artifactId>
<version>3.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-bridge -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.11</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-dom -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>com.lowagie.text</artifactId>
<version>2.1.7</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
</dependency>
<!-- jasperreports end-->
<!-- jasperreports-dependency-end -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.30.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<finalName>UDI_WMS_MC</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<!-- 5、添加插件指定jdk -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<!-- executable 可指定也可不用 -->
<!--<executable>C:\Program Files\Java\jdk1.8.0_191\bin\javac</executable>-->
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork><!-- 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>

1
api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java → src/main/java/com/glxp/api/ApiAdminApplication.java
Unescape Escape View File

@ -1,6 +1,5 @@
package com.glxp.api;
import com.glxp.api.admin.util.DateUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;

2
api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java → src/main/java/com/glxp/api/ToolApplicationContextInitializer.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.glxp.api;
import com.glxp.api.admin.util.RsaUtils;
import com.glxp.api.util.RsaUtils;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;

2
api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java → src/main/java/com/glxp/api/annotation/AuthRuleAnnotation.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.annotation;
package com.glxp.api.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

6
api-admin/src/main/java/com/glxp/api/admin/annotation/Log.java → src/main/java/com/glxp/api/annotation/Log.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.glxp.api.admin.annotation;
package com.glxp.api.annotation;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.OperatorType;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.OperatorType;
import java.lang.annotation.*;

2
api-admin/src/main/java/com/glxp/api/admin/annotation/RepeatSubmit.java → src/main/java/com/glxp/api/annotation/RepeatSubmit.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.annotation;
package com.glxp.api.annotation;
import java.lang.annotation.*;
import java.util.concurrent.TimeUnit;

16
api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java → src/main/java/com/glxp/api/aspect/AuthorizeAspect.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.glxp.api.admin.aspect;
package com.glxp.api.aspect;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.dao.auth.AuthLicenseDao;
import com.glxp.api.admin.entity.auth.AuthLicense;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.service.auth.AuthLoginService;
import com.glxp.api.admin.util.JwtUtils;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.dao.auth.AuthLicenseDao;
import com.glxp.api.entity.auth.AuthLicense;
import com.glxp.api.exception.JsonException;
import com.glxp.api.service.auth.AuthLoginService;
import com.glxp.api.util.JwtUtils;
import com.glxp.api.common.enums.ResultEnum;
import io.jsonwebtoken.Claims;
import lombok.extern.slf4j.Slf4j;
@ -37,7 +37,7 @@ public class AuthorizeAspect {
@Resource
private AuthLicenseDao authLicenseDao;
@Pointcut("@annotation(com.glxp.api.admin.annotation.AuthRuleAnnotation)")
@Pointcut("@annotation(com.glxp.api.annotation.AuthRuleAnnotation)")
public void adminLoginVerify() {
}

18
api-admin/src/main/java/com/glxp/api/admin/aspect/LogAspect.java → src/main/java/com/glxp/api/aspect/LogAspect.java
Unescape Escape View File

@ -1,16 +1,16 @@
package com.glxp.api.admin.aspect;
package com.glxp.api.aspect;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessStatus;
import com.glxp.api.admin.entity.monitor.OperLogDTO;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.service.monitor.OperLogService;
import com.glxp.api.admin.util.JsonUtils;
import com.glxp.api.admin.util.ServletUtils;
import com.glxp.api.admin.util.SpringUtils;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessStatus;
import com.glxp.api.entity.monitor.OperLogDTO;
import com.glxp.api.exception.JsonException;
import com.glxp.api.service.monitor.OperLogService;
import com.glxp.api.util.JsonUtils;
import com.glxp.api.util.ServletUtils;
import com.glxp.api.util.SpringUtils;
import com.glxp.api.common.enums.ResultEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

0
api-common/src/main/java/com/glxp/api/common/constant/CacheConstant.java → src/main/java/com/glxp/api/common/constant/CacheConstant.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java → src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java → src/main/java/com/glxp/api/common/converter/String2LongListConverter.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java → src/main/java/com/glxp/api/common/converter/String2StringListConverter.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/enums/ResultEnum.java → src/main/java/com/glxp/api/common/enums/ResultEnum.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java → src/main/java/com/glxp/api/common/req/BaseLimitRequest.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/req/BaseRequest.java → src/main/java/com/glxp/api/common/req/BaseRequest.java
Unescape Escape View File

0
api-common/src/main/java/com/glxp/api/common/res/BaseResponse.java → src/main/java/com/glxp/api/common/res/BaseResponse.java
Unescape Escape View File

24
api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java → src/main/java/com/glxp/api/common/util/ResultVOUtils.java
Unescape Escape View File

@ -1,7 +1,9 @@
package com.glxp.api.common.util;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.res.PageSimpleResponse;
import java.util.HashMap;
import java.util.Map;
@ -13,6 +15,7 @@ public class ResultVOUtils {
/**
* 成功时返回
*
* @param data 返回的data对象
* @return {@link BaseResponse}
*/
@ -26,6 +29,7 @@ public class ResultVOUtils {
/**
* 成功时返回
*
* @return {@link BaseResponse}
*/
public static BaseResponse success() {
@ -35,7 +39,8 @@ public class ResultVOUtils {
/**
* 错误时返回
* @param code 错误码
*
* @param code 错误码
* @param message 错误信息
* @return {@link BaseResponse}
*/
@ -50,6 +55,7 @@ public class ResultVOUtils {
/**
* 错误时返回
*
* @param resultEnum 错误枚举类
* @return {@link BaseResponse}
*/
@ -59,12 +65,26 @@ public class ResultVOUtils {
/**
* 错误时返回
*
* @param resultEnum 错误枚举类
* @param message 错误的信息
* @param message 错误的信息
* @return {@link BaseResponse}
*/
public static BaseResponse error(ResultEnum resultEnum, String message) {
return error(resultEnum.getCode(), message);
}
/**
* 根据PageHelper分页对象，直接返回分页结果
*
* @param pageInfo
* @return
*/
public static BaseResponse page(PageInfo pageInfo) {
PageSimpleResponse pageSimpleResponse = new PageSimpleResponse();
pageSimpleResponse.setList(pageInfo.getList());
pageSimpleResponse.setTotal(pageInfo.getTotal());
return success(pageSimpleResponse);
}
}

2
api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java → src/main/java/com/glxp/api/config/CorsConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java → src/main/java/com/glxp/api/config/CorsFilter.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import org.springframework.beans.factory.annotation.Autowired;

8
api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java → src/main/java/com/glxp/api/config/HdSchemaExecutor.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.UUID;
import com.glxp.api.admin.dao.info.DbVersionDao;
import com.glxp.api.admin.entity.info.DbVersionEntity;
import com.glxp.api.admin.entity.info.SchemaData;
import com.glxp.api.dao.info.DbVersionDao;
import com.glxp.api.entity.info.DbVersionEntity;
import com.glxp.api.entity.info.SchemaData;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;

4
api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java → src/main/java/com/glxp/api/config/MasterDataSourceConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
@ -20,7 +20,7 @@ import javax.sql.DataSource;
public class MasterDataSourceConfig {
// 精确到 master 目录，以便跟其他数据源隔离
static final String PACKAGE = "com.glxp.api.admin.dao";
static final String PACKAGE = "com.glxp.api.dao";
static final String MAPPER_LOCATION = "classpath:mybatis/mapper/*/*.xml";
@Bean(name = "masterDataSource")

12
api-admin/src/main/java/com/glxp/api/admin/config/OkHttpConfiguration.java → src/main/java/com/glxp/api/config/OkHttpConfiguration.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@ -12,15 +13,6 @@ import javax.net.ssl.X509TrustManager;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.concurrent.TimeUnit;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import javax.net.ssl.*;
import java.security.*;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.concurrent.TimeUnit;

2
api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java → src/main/java/com/glxp/api/config/PublicFileUrlConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

2
api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java → src/main/java/com/glxp/api/config/RedisConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;

2
api-admin/src/main/java/com/glxp/api/admin/config/RuoYiConfig.java → src/main/java/com/glxp/api/config/RuoYiConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import lombok.Data;
import lombok.Getter;

2
api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java → src/main/java/com/glxp/api/config/WebMvcConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import org.springframework.context.annotation.Configuration;

2
api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java → src/main/java/com/glxp/api/config/WebSocketConfig.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;

4
api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java → src/main/java/com/glxp/api/config/WebSocketServer.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.glxp.api.admin.config;
package com.glxp.api.config;
import com.alibaba.fastjson.JSON;
import com.glxp.api.admin.entity.info.WebSocketEntity;
import com.glxp.api.entity.info.WebSocketEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;

2
api-admin/src/main/java/com/glxp/api/admin/constant/BasicProcessStatus.java → src/main/java/com/glxp/api/constant/BasicProcessStatus.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 基础信息导入导出处理状态

2
api-admin/src/main/java/com/glxp/api/admin/constant/BusinessStatus.java → src/main/java/com/glxp/api/constant/BusinessStatus.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 操作状态

2
api-admin/src/main/java/com/glxp/api/admin/constant/BusinessType.java → src/main/java/com/glxp/api/constant/BusinessType.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 业务操作类型

2
api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java → src/main/java/com/glxp/api/constant/BussinessTypeUtils.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
import java.util.ArrayList;
import java.util.HashMap;

2
api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java → src/main/java/com/glxp/api/constant/Constant.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
public class Constant {

2
api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java → src/main/java/com/glxp/api/constant/ConstantStatus.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 出入库单据校验状态

2
api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java → src/main/java/com/glxp/api/constant/ConstantType.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
public interface ConstantType {

2
api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java → src/main/java/com/glxp/api/constant/IncodeStatus.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 内部码处理状态

2
api-admin/src/main/java/com/glxp/api/admin/constant/OperatorType.java → src/main/java/com/glxp/api/constant/OperatorType.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 操作人类别

2
api-admin/src/main/java/com/glxp/api/admin/constant/RedisContant.java → src/main/java/com/glxp/api/constant/RedisContant.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
public class RedisContant {
public static String DL_ORDER_STATUS = "udiwms_dl_order_status";

2
api-admin/src/main/java/com/glxp/api/admin/constant/SetupType.java → src/main/java/com/glxp/api/constant/SetupType.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
public class SetupType {

2
api-admin/src/main/java/com/glxp/api/admin/constant/ThirdSysConstant.java → src/main/java/com/glxp/api/constant/ThirdSysConstant.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.admin.constant;
package com.glxp.api.constant;
/**
* 第三方系统配置参数实体

8
api-admin/src/main/java/com/glxp/api/admin/controller/BaseController.java → src/main/java/com/glxp/api/controller/BaseController.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.glxp.api.admin.controller;
package com.glxp.api.controller;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.constant.Constant;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.service.auth.CustomerService;
import javax.annotation.Resource;

44
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java → src/main/java/com/glxp/api/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -1,31 +1,31 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.AuthRole;
import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
import com.glxp.api.admin.entity.auth.DeptEntity;
import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
import com.glxp.api.admin.req.auth.FilterNoSelectUserRequest;
import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.auth.AuthAdminResponse;
import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
import com.glxp.api.admin.service.auth.*;
import com.glxp.api.admin.service.inout.WarehouseUserService;
import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.PasswordUtils;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.AuthRole;
import com.glxp.api.entity.auth.AuthRoleAdmin;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.inout.WarehouseUserEntity;
import com.glxp.api.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.req.auth.AuthAdminQueryRequest;
import com.glxp.api.req.auth.AuthAdminSaveRequest;
import com.glxp.api.req.auth.FilterNoSelectUserRequest;
import com.glxp.api.req.inventory.FilterInvLinkDataRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.AuthAdminResponse;
import com.glxp.api.res.auth.AuthAdminRoleResponse;
import com.glxp.api.service.inout.WarehouseUserService;
import com.glxp.api.service.inventory.InvSubWarehouseService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.PasswordUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.service.auth.*;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

17
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java → src/main/java/com/glxp/api/controller/auth/AuthCheckController.java
Unescape Escape View File

@ -1,16 +1,11 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
import com.glxp.api.admin.req.auth.AuthCheckRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.auth.AuthAdminResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.AuthCheckService;
import com.glxp.api.admin.util.RsaUtils;
import com.glxp.api.entity.auth.AuthCheckEntity;
import com.glxp.api.req.auth.AuthCheckRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.AuthCheckService;
import com.glxp.api.util.RsaUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;

21
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java → src/main/java/com/glxp/api/controller/auth/AuthPermissionRuleController.java
Unescape Escape View File

@ -1,17 +1,20 @@
package com.glxp.api.admin.controller.auth;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.req.auth.AuthPermissionRuleSaveRequest;
package com.glxp.api.controller.auth;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.entity.auth.AuthPermissionRule;
import com.glxp.api.req.auth.AuthPermissionRuleSaveRequest;
import com.glxp.api.res.auth.AuthPermissionRuleMergeResponse;
import com.glxp.api.service.auth.AuthPermissionRuleService;
import com.glxp.api.util.PermissionRuleTreeUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.admin.entity.auth.AuthPermissionRule;
import com.glxp.api.admin.service.auth.AuthPermissionRuleService;
import com.glxp.api.admin.util.PermissionRuleTreeUtils;
import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
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.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;

34
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java → src/main/java/com/glxp/api/controller/auth/AuthRoleController.java
Unescape Escape View File

@ -1,26 +1,26 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
import com.glxp.api.admin.req.auth.AuthRoleAuthRequest;
import com.glxp.api.admin.req.auth.AuthRoleQueryRequest;
import com.glxp.api.admin.req.auth.AuthRoleSaveRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthRoleAdminService;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.entity.auth.AuthPermission;
import com.glxp.api.entity.auth.AuthPermissionRule;
import com.glxp.api.entity.auth.AuthRole;
import com.glxp.api.entity.auth.AuthRoleAdmin;
import com.glxp.api.req.auth.AuthRoleAuthRequest;
import com.glxp.api.req.auth.AuthRoleQueryRequest;
import com.glxp.api.req.auth.AuthRoleSaveRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.AuthPermissionRuleMergeResponse;
import com.glxp.api.res.auth.AuthRoleResponse;
import com.glxp.api.service.auth.AuthPermissionRuleService;
import com.glxp.api.service.auth.AuthPermissionService;
import com.glxp.api.service.auth.AuthRoleAdminService;
import com.glxp.api.service.auth.AuthRoleService;
import com.glxp.api.util.PermissionRuleTreeUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.auth.AuthPermission;
import com.glxp.api.admin.entity.auth.AuthPermissionRule;
import com.glxp.api.admin.entity.auth.AuthRole;
import com.glxp.api.admin.service.auth.AuthPermissionRuleService;
import com.glxp.api.admin.service.auth.AuthPermissionService;
import com.glxp.api.admin.service.auth.AuthRoleService;
import com.glxp.api.admin.util.PermissionRuleTreeUtils;
import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse;
import com.glxp.api.admin.res.auth.AuthRoleResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

10
api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java → src/main/java/com/glxp/api/controller/auth/ConnectTestController.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import com.glxp.api.admin.entity.auth.AuthConnectEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.req.auth.ConnectRequest;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.entity.auth.AuthConnectEntity;
import com.glxp.api.entity.info.CompanyEntity;
import com.glxp.api.req.auth.ConnectRequest;
import com.glxp.api.service.info.CompanyService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.GetMapping;

22
api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java → src/main/java/com/glxp/api/controller/auth/DeptController.java
Unescape Escape View File

@ -1,16 +1,16 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.DeptEntity;
import com.glxp.api.admin.req.auth.FilterDeptRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.DeptService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.req.auth.FilterDeptRequest;
import com.glxp.api.req.inout.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.DeptService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.GetMapping;

12
api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptUserController.java → src/main/java/com/glxp/api/controller/auth/DeptUserController.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.req.auth.DeptUserReqeust;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.auth.DeptUserResponse;
import com.glxp.api.admin.service.auth.DeptUserService;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.req.auth.DeptUserReqeust;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.DeptUserResponse;
import com.glxp.api.service.auth.DeptUserService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.GetMapping;

50
api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java → src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -1,33 +1,33 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.dao.auth.AuthLicenseDao;
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
import com.glxp.api.admin.entity.auth.SysMenu;
import com.glxp.api.admin.entity.auth.SysRole;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.info.DeviceKeyEntity;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.req.auth.LoginRequest;
import com.glxp.api.admin.req.auth.PCLoginRequest;
import com.glxp.api.admin.req.auth.UpdatePasswordRequest;
import com.glxp.api.admin.res.auth.LoginResponse;
import com.glxp.api.admin.service.auth.*;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.service.monitor.LogininforService;
import com.glxp.api.admin.util.*;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController;
import com.glxp.api.dao.auth.AuthLicenseDao;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.AuthCheckEntity;
import com.glxp.api.entity.auth.SysMenu;
import com.glxp.api.entity.auth.SysRole;
import com.glxp.api.entity.info.CompanyEntity;
import com.glxp.api.entity.info.DeviceKeyEntity;
import com.glxp.api.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.entity.inventory.InvWarehouseEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.auth.LoginRequest;
import com.glxp.api.req.auth.PCLoginRequest;
import com.glxp.api.req.auth.UpdatePasswordRequest;
import com.glxp.api.res.auth.LoginResponse;
import com.glxp.api.res.auth.LoginUserInfoResponse;
import com.glxp.api.service.info.CompanyService;
import com.glxp.api.service.inventory.InvSubWarehouseService;
import com.glxp.api.service.inventory.InvWarehouseService;
import com.glxp.api.service.monitor.LogininforService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.res.auth.LoginUserInfoResponse;
import com.glxp.api.service.auth.*;
import com.glxp.api.util.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;

12
api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictDataController.java → src/main/java/com/glxp/api/controller/auth/SysDictDataController.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.SysDictData;
import com.glxp.api.admin.req.auth.SysDictDataRequest;
import com.glxp.api.admin.service.auth.ISysDictDataService;
import com.glxp.api.admin.service.auth.ISysDictTypeService;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysDictData;
import com.glxp.api.req.auth.SysDictDataRequest;
import com.glxp.api.service.auth.ISysDictDataService;
import com.glxp.api.service.auth.ISysDictTypeService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.RequiredArgsConstructor;

14
api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysDictTypeController.java → src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java
Unescape Escape View File

@ -1,14 +1,14 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.SysDictType;
import com.glxp.api.admin.req.auth.SysDictTypeRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.ISysDictTypeService;
import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysDictType;
import com.glxp.api.req.auth.SysDictTypeRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.ISysDictTypeService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.validation.annotation.Validated;

20
api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java → src/main/java/com/glxp/api/controller/auth/SysHisStatusController.java
Unescape Escape View File

@ -1,15 +1,15 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.SysHisStatusEntity;
import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.ISysHisStatusService;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysHisStatusEntity;
import com.glxp.api.req.auth.FilterSysHisStatusRequest;
import com.glxp.api.req.inout.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.ISysHisStatusService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.GetMapping;

14
api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysMenuController.java → src/main/java/com/glxp/api/controller/auth/SysMenuController.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.hutool.http.HttpUtil;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.SysMenu;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.auth.ISysMenuService;
import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.SysMenu;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.ISysMenuService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.validation.annotation.Validated;

22
api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java → src/main/java/com/glxp/api/controller/auth/SysRoleController.java
Unescape Escape View File

@ -1,17 +1,17 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.SysRole;
import com.glxp.api.admin.entity.auth.SysUserRole;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.auth.SysRoleRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.ISysRoleService;
import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.SysRole;
import com.glxp.api.entity.auth.SysUserRole;
import com.glxp.api.req.auth.AuthAdminQueryRequest;
import com.glxp.api.req.auth.SysRoleRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.ISysRoleService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.RequiredArgsConstructor;

34
api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysUserController.java → src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -1,27 +1,25 @@
package com.glxp.api.admin.controller.auth;
package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.controller.BaseController;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
import com.glxp.api.admin.entity.auth.SysMenu;
import com.glxp.api.admin.entity.auth.SysRole;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.auth.AuthAdminResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.AuthRoleAdminService;
import com.glxp.api.admin.service.auth.ISysMenuService;
import com.glxp.api.admin.service.auth.ISysRoleService;
import com.glxp.api.admin.util.PasswordUtils;
import com.glxp.api.admin.util.StreamUtils;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.AuthRoleAdmin;
import com.glxp.api.entity.auth.SysRole;
import com.glxp.api.req.auth.AuthAdminQueryRequest;
import com.glxp.api.req.auth.AuthAdminSaveRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.AuthAdminResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.AuthRoleAdminService;
import com.glxp.api.service.auth.ISysRoleService;
import com.glxp.api.util.PasswordUtils;
import com.glxp.api.util.StreamUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;

16
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicBusTypeChangeController.java → src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java
Unescape Escape View File

@ -1,13 +1,13 @@
package com.glxp.api.admin.controller.basic;
package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity;
import com.glxp.api.admin.req.basic.BasicBusTypeChangeRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BasicBusTypeChangeResponse;
import com.glxp.api.admin.service.basic.BasicBusTypeChangeService;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
import com.glxp.api.req.basic.BasicBusTypeChangeRequest;
import com.glxp.api.req.inout.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicBusTypeChangeResponse;
import com.glxp.api.service.basic.BasicBusTypeChangeService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save