diff --git a/src/main/java/com/cetc32/dh/entity/pritrace.java b/src/main/java/com/cetc32/dh/entity/pritrace.java new file mode 100644 index 0000000000000000000000000000000000000000..196a714c33c114807df1fb96cd157c3bd918adb4 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/pritrace.java @@ -0,0 +1,23 @@ +package com.cetc32.dh.entity; + +public class pritrace { + private String user; + + private Integer departid; + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user == null ? null : user.trim(); + } + + public Integer getDepartid() { + return departid; + } + + public void setDepartid(Integer departid) { + this.departid = departid; + } +} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java index 4ad5e6c93edfd1bafa7c7ffce8531b37fec48d68..3101dacac1c3deaf6e201390a7402cb5a3a8f3c4 100644 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java @@ -13,7 +13,6 @@ import com.cetc32.dh.dto.AdminUserDTO; import com.cetc32.dh.dto.UserSearchDTO; import com.cetc32.dh.entity.BaseAdminUser; import org.apache.ibatis.annotations.Param; -import org.omg.PortableInterceptor.INACTIVE; import org.springframework.stereotype.Repository; import tk.mapper.MyMapper; diff --git a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..29e5ae972d955328dc14ef1cf2d9fa9a2731dac3 --- /dev/null +++ b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java @@ -0,0 +1,9 @@ +package com.cetc32.dh.mybatis; + +import com.cetc32.dh.entity.pritrace; + +public interface pritraceMapper { + int insert(pritrace record); + + int insertSelective(pritrace record); +} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java index 0044e657e58023460c11b1e67b6394a6e26ebbae..07ad3421cac17560f259d23bd7bfc6df646f643c 100644 --- a/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java @@ -14,7 +14,6 @@ import com.cetc32.dh.entity.NumberS; import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; import com.cetc32.dh.mybatis.BaseAdminRoleMapper; import com.cetc32.dh.service.AdminRoleService; -import org.omg.CORBA.PUBLIC_MEMBER; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c98000a1840c3fb6e2e2bf3ba16adba1ae72ba55..f00fda1dbba9320afd68455a5d8ebb8ff7c09a68 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://172.16.0.223:5432/dhmanage username: postgres password: 123456 driver-class-name: org.postgresql.Driver @@ -56,17 +56,17 @@ upLoadPath: ${storePath}upLoad rootPath: /root/daohang/data myPath: ${rootPath}myPath writePath: ${rootPath}/product -eip: http://192.168.1.42:8080/ +eip: http://172.16.0.223:8080/ #verifyUrl: ${sso.authcenter}/rest/auth/verify?token= #passportUrl: ${sso.authcenter}/?ReturnUrl= #defaultLoginRequiredEnable: false sso: - authcenter: http://192.168.1.42:8087 + authcenter: http://172.16.0.223:8087 verifyUrl: ${sso.authcenter}/rest/auth/verify?token= passportUrl: ${sso.authcenter}/?ReturnUrl= defaultLoginRequiredEnable: false permission: S000^接口用户@/rest/**;*权限管理@/rest/**; - sysurl : http://192.168.1.42:${server.port} + sysurl : http://172.16.0.223:${server.port} sysname : 认证中心门户 registerUrl : ${sso.authcenter}/rest/api/sys/sync #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** diff --git a/src/main/resources/application-win.yml b/src/main/resources/application-win.yml new file mode 100644 index 0000000000000000000000000000000000000000..2bed5865124f2e9c9c4a4395599376f1da6027fb --- /dev/null +++ b/src/main/resources/application-win.yml @@ -0,0 +1,77 @@ +server: + port: 8087 + server: + connectionTimeout: 18000000 + +spring: + application: + name: dhManager + datasource: + url: jdbc:postgresql://localhost:5432/dhmanage + username: postgres + password: 123456 + driver-class-name: org.postgresql.Driver + + # datasource: + # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 + # username: root + # password: 123 + # initial-size: 1 + # min-idle: 1 + # max-active: 20 + # test-on-borrow: true + # driver-class-name: com.mysql.cj.jdbc.Driver + # type: com.zaxxer.hikari.HikariDataSource + + servlet: + multipart: + max-file-size: 5GB + max-request-size: 5GB + + #设置静态资源路径,多个以逗号分隔 + resources: + static-locations: classpath:static/,file:static/ + thymeleaf: + cache: false + mode: HTML +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 + configuration: + map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 + +generator: + targetProject: src/main/java + mappers: tk.mybatis.mapper.common.Mapper + javaModel-targetPackage: com.cetc32.dh.entity + sqlMap-targetPackage: mapper + javaClient-targetPackage: com.cetc32.dh.mybatis +logging: + level: + com.cetc32.dh.mybatis: debug + +storePath: D:\daohang\ +upLoadPath: ${storePath}upLoad + +rootPath: D:\root\daohang\data +myPath: ${rootPath}myPath +writePath: ${rootPath}\product +eip: http://localhost:8080/ +startCode: 000000 +#verifyUrl: ${sso.authcenter}/rest/auth/verify?token= +#passportUrl: ${sso.authcenter}/?ReturnUrl= +#defaultLoginRequiredEnable: false +sso: + authcenter: http://localhost:8087 + verifyUrl: ${sso.authcenter}/rest/auth/verify?token= + passportUrl: ${sso.authcenter}/?ReturnUrl= + defaultLoginRequiredEnable: false + permission: S000^接口用户@/rest/**;*权限管理@/rest/**; + sysurl : http://localhost:${server.port} + sysname : 认证中心门户 + registerUrl : ${sso.authcenter}/rest/api/sys/sync + #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** + syscode: S000 + basePermission: S000接口用户 + #单位是毫秒 + tokeAge: 3600000 diff --git a/src/main/resources/generator.xml b/src/main/resources/generator.xml index ae8c7c5f8bbaacd21ac1e85b7e19ebf17adfdfbc..b5880b275a57a8c15d8506bd2aea13effe2fe5c8 100644 --- a/src/main/resources/generator.xml +++ b/src/main/resources/generator.xml @@ -6,18 +6,18 @@ - + - + - - - - + + + + @@ -25,14 +25,14 @@ - + - + @@ -57,14 +57,15 @@ -
- - + enableDeleteByPrimaryKey="true" + enableCountByExample="false" enableUpdateByExample="false" + enableDeleteByExample="false" enableSelectByExample="false" + selectByExampleQueryId="false">
-
+ \ No newline at end of file diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties new file mode 100644 index 0000000000000000000000000000000000000000..d05061e590cb4d361e74c57b38da8d4180dc0fb4 --- /dev/null +++ b/src/main/resources/jdbc.properties @@ -0,0 +1,32 @@ +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false +##spring.datasource.driverClassName=com.mysql.jdbc.Driver +#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver +#spring.datasource.username=root +#spring.datasource.password=123 + +spring.datasource.url=jdbc:postgresql://localhost:5432/dhmanage +spring.datasource.username=postgres +spring.datasource.password=123456 +spring.datasource.driver-class-name=org.postgresql.Driver + +#Mybatis扫描 +mybatis.mapper-locations=classpath*:com/**/mapper/**.xml + +# Generator +generator.targetProject=src/main/java +#mapper的父类 +generator.mappers=tk.mybatis.mapper.common.Mapper +#pojo所在报名 +generator.javaModel-targetPackage=com.cetc32.dh.entity +#mapper.xml位于resource文件夹下的哪个目录中 +generator.sqlMap-targetPackage=mapper +#mapper包名 +generator.javaClient-targetPackage=com.cetc32.dh.mybatis + +#配置文件传输 +spring.servlet.multipart.enabled =true +spring.servlet.multipart.file-size-threshold =0 +#单个数据的大小 +spring.servlet.multipart.max-file-size = 50GB +#总数据的大小 +spring.servlet.multipart.max-request-size=50GB \ No newline at end of file diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..b0418f45220f98027c994a528fbf6a214835e7b8 --- /dev/null +++ b/src/main/resources/mapper/pritraceMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + insert into pritrace (user, departId) + values (#{user,jdbcType=VARCHAR}, #{departid,jdbcType=INTEGER}) + + + insert into pritrace + + + user, + + + departId, + + + + + #{user,jdbcType=VARCHAR}, + + + #{departid,jdbcType=INTEGER}, + + + + \ No newline at end of file