!61 修改注册页面版本显示问题

Merge pull request !61 from 乾坤平台/jshdev

!61 修改注册页面版本显示问题
Merge pull request !61 from 乾坤平台/jshdev
6cc7496f · 季圣华 · Gitee · 6be4f901 · e1402fb1 · 6be4f901
Commit 6cc7496f authored Nov 08, 2019 by 季圣华 Committed by Gitee Nov 08, 2019
--- a/docs/jsh_erp.sql
+++ b/docs/jsh_erp.sql
--- a/docs/华夏ERP数据库设计汇总.xlsx
+++ b/docs/华夏ERP数据库设计汇总.xlsx
--- a/docs/数据库更新记录-方便升级.txt
+++ b/docs/数据库更新记录-方便升级.txt
--- a/erp_web/register.html
+++ b/erp_web/register.html
@@ -43,7 +43,7 @@
        <div class="register-logo">
            <a href="/">
                <b>华夏ERP</b>
-                <small>V1.0</small>
+                <small>V2.1</small>
            </a>
        </div>
        <div class="register-box-body">

--- a/src/main/java/com/jsh/erp/controller/FunctionsController.java
+++ b/src/main/java/com/jsh/erp/controller/FunctionsController.java
--- a/src/main/java/com/jsh/erp/datasource/entities/Tenant.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/Tenant.java
 package com.jsh.erp.datasource.entities;
 import java.util.Date;
 public class Tenant {
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database column jsh_tenant.id
     *
     * @mbggenerated
     */
    private Long id;
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database column jsh_tenant.tenant_id
     *
     * @mbggenerated
     */
    private Long tenantId;
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database column jsh_tenant.login_name
     *
     * @mbggenerated
     */
    private String loginName;
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database column jsh_tenant.user_num_limit
     *
     * @mbggenerated
     */
    private Integer userNumLimit;
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database column jsh_tenant.bills_num_limit
     *
     * @mbggenerated
     */
    private Integer billsNumLimit;
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database column jsh_tenant.create_time
     *
     * @mbggenerated
     */
    private Date createTime;
    /**
     * This method was generated by MyBatis Generator.
     * This method returns the value of the database column jsh_tenant.id
     *
     * @return the value of jsh_tenant.id
     *
     * @mbggenerated
     */
    public Long getId() {
        return id;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method sets the value of the database column jsh_tenant.id
     *
     * @param id the value for jsh_tenant.id
     *
     * @mbggenerated
     */
    public void setId(Long id) {
        this.id = id;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method returns the value of the database column jsh_tenant.tenant_id
     *
     * @return the value of jsh_tenant.tenant_id
     *
     * @mbggenerated
     */
    public Long getTenantId() {
        return tenantId;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method sets the value of the database column jsh_tenant.tenant_id
     *
     * @param tenantId the value for jsh_tenant.tenant_id
     *
     * @mbggenerated
     */
    public void setTenantId(Long tenantId) {
        this.tenantId = tenantId;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method returns the value of the database column jsh_tenant.login_name
     *
     * @return the value of jsh_tenant.login_name
     *
     * @mbggenerated
     */
    public String getLoginName() {
        return loginName;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method sets the value of the database column jsh_tenant.login_name
     *
     * @param loginName the value for jsh_tenant.login_name
     *
     * @mbggenerated
     */
    public void setLoginName(String loginName) {
        this.loginName = loginName == null ? null : loginName.trim();
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method returns the value of the database column jsh_tenant.user_num_limit
     *
     * @return the value of jsh_tenant.user_num_limit
     *
     * @mbggenerated
     */
    public Integer getUserNumLimit() {
        return userNumLimit;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method sets the value of the database column jsh_tenant.user_num_limit
     *
     * @param userNumLimit the value for jsh_tenant.user_num_limit
     *
     * @mbggenerated
     */
    public void setUserNumLimit(Integer userNumLimit) {
        this.userNumLimit = userNumLimit;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method returns the value of the database column jsh_tenant.bills_num_limit
     *
     * @return the value of jsh_tenant.bills_num_limit
     *
     * @mbggenerated
     */
    public Integer getBillsNumLimit() {
        return billsNumLimit;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method sets the value of the database column jsh_tenant.bills_num_limit
     *
     * @param billsNumLimit the value for jsh_tenant.bills_num_limit
     *
     * @mbggenerated
     */
    public void setBillsNumLimit(Integer billsNumLimit) {
        this.billsNumLimit = billsNumLimit;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method returns the value of the database column jsh_tenant.create_time
     *
     * @return the value of jsh_tenant.create_time
     *
     * @mbggenerated
     */
    public Date getCreateTime() {
        return createTime;
    }
    /**
     * This method was generated by MyBatis Generator.
     * This method sets the value of the database column jsh_tenant.create_time
     *
     * @param createTime the value for jsh_tenant.create_time
     *
     * @mbggenerated
     */
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
 }
\ No newline at end of file
--- a/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java
--- a/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java
 package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.Tenant;
 import com.jsh.erp.datasource.entities.TenantExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 public interface TenantMapper {
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int countByExample(TenantExample example);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int deleteByExample(TenantExample example);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int deleteByPrimaryKey(Long id);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int insert(Tenant record);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int insertSelective(Tenant record);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    List<Tenant> selectByExample(TenantExample example);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    Tenant selectByPrimaryKey(Long id);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int updateByExampleSelective(@Param("record") Tenant record, @Param("example") TenantExample example);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int updateByExample(@Param("record") Tenant record, @Param("example") TenantExample example);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int updateByPrimaryKeySelective(Tenant record);
    /**
     * This method was generated by MyBatis Generator.
     * This method corresponds to the database table jsh_tenant
     *
     * @mbggenerated
     */
    int updateByPrimaryKey(Tenant record);
 }
\ No newline at end of file
--- a/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
 package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.Tenant;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 public interface TenantMapperEx {
    List<Tenant> selectByConditionTenant(
            @Param("loginName") String loginName,
            @Param("offset") Integer offset,
            @Param("rows") Integer rows);
    Long countsByTenant(
            @Param("loginName") String loginName);
 }
\ No newline at end of file
--- a/src/main/java/com/jsh/erp/service/ResourceInfo.java
+++ b/src/main/java/com/jsh/erp/service/ResourceInfo.java
 package com.jsh.erp.service;
 import java.lang.annotation.*;
 /**
 * @author jishenghua 2018-10-7 15:25:39
 * user-5
 * role-10
 * depot-20
 * log-25
 * functions-30
 * inOutItem-35
 * unit-40
 * person-45
 * userBusiness-50
 * systemConfig-55
 * materialProperty-60
 * account-65
 * supplier-70
 * materialCategory-75
 * material-80
 * depotHead-85
 * depotItem-90
 * accountHead-95
 * accountItem-100
 * serialNumber-105
 * organization-110
 * orgaUserRel-115
 * tenant-120
 * msg-125
 */
 @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface ResourceInfo {
    String value();
    int type();
 }
--- a/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
+++ b/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
 package com.jsh.erp.service.tenant;
 import com.jsh.erp.service.ICommonQuery;
 import com.jsh.erp.service.user.UserResource;
 import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.QueryUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 @Service(value = "tenant_component")
 @TenantResource
 public class TenantComponent implements ICommonQuery {
    @Resource
    private TenantService tenantService;
    @Override
    public Object selectOne(Long id) throws Exception {
        return tenantService.getTenant(id);
    }
    @Override
    public List<?> select(Map<String, String> map)throws Exception {
        return getTenantList(map);
    }
    private List<?> getTenantList(Map<String, String> map)throws Exception {
        String search = map.get(Constants.SEARCH);
        String loginName = StringUtil.getInfo(search, "loginName");
        return tenantService.select(loginName, QueryUtils.offset(map), QueryUtils.rows(map));
    }
    @Override
    public Long counts(Map<String, String> map)throws Exception {
        String search = map.get(Constants.SEARCH);
        String loginName = StringUtil.getInfo(search, "loginName");
        return tenantService.countTenant(loginName);
    }
    @Override
    public int insert(String beanJson, HttpServletRequest request)throws Exception {
        return tenantService.insertTenant(beanJson, request);
    }
    @Override
    public int update(String beanJson, Long id)throws Exception {
        return tenantService.updateTenant(beanJson, id);
    }
    @Override
    public int delete(Long id)throws Exception {
        return tenantService.deleteTenant(id);
    }
    @Override
    public int batchDelete(String ids)throws Exception {
        return tenantService.batchDeleteTenant(ids);
    }
    @Override
    public int checkIsNameExist(Long id, String name)throws Exception {
        return tenantService.checkIsNameExist(id, name);
    }
 }
--- a/src/main/java/com/jsh/erp/service/tenant/TenantResource.java
+++ b/src/main/java/com/jsh/erp/service/tenant/TenantResource.java
 package com.jsh.erp.service.tenant;
 import com.jsh.erp.service.ResourceInfo;
 import java.lang.annotation.*;
 /**
 * @author jishenghua qq752718920  2019-6-27 22:56:56
 */
 @ResourceInfo(value = "tenant", type = 120)
 @Inherited
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TenantResource {
 }
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
 <configuration>
    <property name="LOG_FILE" value="${logs.home}/jshERP"/>
    <property name="LOG_PATTERN" value="%d{yyyy/MM/dd-HH:mm:ss} %-5level [%thread] %logger - %msg%n"/>
    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
            <pattern>${LOG_PATTERN}</pattern>
        </encoder>
    </appender>
    <appender name="TIME_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${LOG_FILE}.log</file>
        <encoder>
            <pattern>${LOG_PATTERN}</pattern>
        </encoder>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <maxHistory>10</maxHistory>
            <totalSizeCap>1GB</totalSizeCap>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
        </rollingPolicy>
    </appender>
    <root level="ERROR">
        <appender-ref ref="CONSOLE"/>
        <appender-ref ref="TIME_FILE"/>
    </root>
    <logger name="com.jsh" additivity="false" level="DEBUG">
        <appender-ref ref="CONSOLE"/>
        <appender-ref ref="TIME_FILE"/>
    </logger>
 </configuration>
\ No newline at end of file
--- a/src/main/resources/mapper_xml/FunctionsMapper.xml
+++ b/src/main/resources/mapper_xml/FunctionsMapper.xml
 <?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.jsh.erp.datasource.mappers.FunctionsMapper">
  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Functions">
    <!--

--- a/src/main/resources/mapper_xml/TenantMapper.xml
+++ b/src/main/resources/mapper_xml/TenantMapper.xml