fix bug

2025-01-10 13:56:00 +08:00 · 2025-01-10 13:56:00 +08:00 · 4f55e0e9f8
parent ec5fcacf64
commit 4f55e0e9f8
9 changed files with 82 additions and 253 deletions
--- a/ghy-admin/src/main/java/com/ghy/GhyApplication.java
+++ b/ghy-admin/src/main/java/com/ghy/GhyApplication.java
@ -6,6 +6,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;

 /**
 * 启动程序
@ -36,4 +39,25 @@ public class GhyApplication
    public RestTemplate restTemplate(){
        return new RestTemplate();
    }
+
+
+    private CorsConfiguration corsConfig() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 请求常用的三种配置，*代表允许所有，当时你也可以自定义属性（比如header只能带什么，只能是post方式等等）
+//        corsConfiguration.addAllowedOrigin("*");
+        corsConfiguration.addAllowedHeader("*");
+        corsConfiguration.addAllowedMethod("*");
+        corsConfiguration.setAllowCredentials(true);
+        corsConfiguration.addAllowedOriginPattern("*");
+        corsConfiguration.setMaxAge(3600L);
+        return corsConfiguration;
+    }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", corsConfig());
+        return new CorsFilter(source);
+    }
+
 }
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
@ -30,6 +30,7 @@ import java.util.List;
 import java.util.stream.Collectors;

@Controller
+@CrossOrigin(origins = "*")
@RequestMapping("goods/deptcategory")
 public class GoodsDeptCategoryController extends BaseController {

--- a/ghy-admin/src/main/resources/application-druid.yml
+++ b/ghy-admin/src/main/resources/application-druid.yml
@ -45,8 +45,8 @@ spring:
        druid:
            # 主库数据源
            master:
-                url: jdbc:mysql://121.62.23.77:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-                username: gqz
+                url: jdbc:mysql://58.49.150.163:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                username: root
                password: Clunt@12345
            # 从库数据源
            slave:
--- a/ghy-admin/src/main/resources/application.yaml
+++ b/ghy-admin/src/main/resources/application.yaml
@ -121,7 +121,7 @@ qiniu:
 adapay:
  debug: true
  prod-mode: true
-  notifyUrl: 'https://gmhl.opsoul.com/adapay/callback'
+  notifyUrl: 'https://gmhl.gmjlb.com/adapay/callback'

 jim:
  appKey: '110e8830290152d76e2f1d97'
--- a/ghy-admin/src/main/resources/templates/login.html
+++ b/ghy-admin/src/main/resources/templates/login.html
@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>工盟互联</title>
+    <title>叮咚工链</title>
    <meta name="description" content="后台管理框架">
    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@ -64,9 +64,9 @@
        </div>
        <div class="signup-footer">
            <div class="pull-left">
-                Copyright © 2018-2021 opsoul.com All Rights Reserved. <br>
+                Copyright © 2018-2021 gmjlb.com All Rights Reserved. <br>
                <a href="https://beian.miit.gov.cn/" target="_blank">备案号:</a>
-                <a href="https://beian.miit.gov.cn/" target="_blank">粤ICP备2021044349号-1</a>
+                <a href="https://beian.miit.gov.cn/" target="_blank">桂ICP备2024024616号-3</a>
            </div>
        </div>
    </div>
--- a/ghy-admin/src/main/resources/templates/worker/certification/certification.html
+++ b/ghy-admin/src/main/resources/templates/worker/certification/certification.html
@ -123,19 +123,23 @@
                },
                {
                    field: 'businessLicenseUrl',
-                    title: '执照号码照片'
+                    title: '营业执照',
+                    formatter: function(value) {
+                        if (value != null && value !== ''){return '<a target="_blank" href="' + value+ '" >查看图片<a/>';}
+                        else {return '<a>无<a/>'}
+                    }
                },
                {
-                    field: 'companyProvinceId',
-                    title: '公司地址所在省id'
+                    field: 'companyProvinceName',
+                    title: '省份'
                },
                {
-                    field: 'companyCityId',
-                    title: '公司地址所在市id'
+                    field: 'companyCityName',
+                    title: '城市'
                },
                {
-                    field: 'companyCountryId',
-                    title: '公司地址所在区id'
+                    field: 'companyCountryName',
+                    title: '区域'
                },
                {
                    field: 'companyAddress',
@ -151,7 +155,8 @@
                },
                {
                    field: 'otherServ',
-                    title: '其他服务'
+                    title: '其他服务',
+                    visible: false
                },
                {
                    field: 'status',
--- a/ghy-framework/src/main/java/com/ghy/framework/config/ResourcesConfig.java
+++ b/ghy-framework/src/main/java/com/ghy/framework/config/ResourcesConfig.java
@ -3,10 +3,7 @@ package com.ghy.framework.config;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;
 import com.ghy.common.config.GhyConfig;
 import com.ghy.common.constant.Constants;
 import com.ghy.framework.interceptor.RepeatSubmitInterceptor;
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java
@ -1,5 +1,7 @@
 package com.ghy.worker.domain;

+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ghy.common.annotation.Excel;
@ -13,20 +15,14 @@ import java.util.List;
 * @author clunt
 * @date 2022-07-07
 */
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class WorkerCertification extends BaseEntity
 {
    private static final long serialVersionUID = 1L;

    private Long deptId;

-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
    /** 主键id */
    private String workerCertificationId;

@ -78,14 +74,20 @@ public class WorkerCertification extends BaseEntity
    @Excel(name = "公司地址所在省id")
    private Long companyProvinceId;

+    private String companyProvinceName;
+
    /** 公司地址所在市id */
    @Excel(name = "公司地址所在市id")
    private Long companyCityId;

+    private String companyCityName;
+
    /** 公司地址所在区id */
    @Excel(name = "公司地址所在区id")
    private Long companyCountryId;

+    private String companyCountryName;
+
    /** 公司详细地址 */
    @Excel(name = "公司详细地址")
    private String companyAddress;
@ -112,230 +114,4 @@ public class WorkerCertification extends BaseEntity
    // province，city，country三者的合并名称
    private String mergerName;

-    public void setWorkerCertificationId(String workerCertificationId)
-    {
-        this.workerCertificationId = workerCertificationId;
-    }
-
-    public String getWorkerCertificationId()
-    {
-        return workerCertificationId;
-    }
-    public void setWorkerId(Long workerId)
-    {
-        this.workerId = workerId;
-    }
-
-    public Long getWorkerId()
-    {
-        return workerId;
-    }
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-    public void setIdCardNum(String idCardNum)
-    {
-        this.idCardNum = idCardNum;
-    }
-
-    public String getIdCardNum()
-    {
-        return idCardNum;
-    }
-    public void setIdCardUrl1(String idCardUrl1)
-    {
-        this.idCardUrl1 = idCardUrl1;
-    }
-
-    public String getIdCardUrl1()
-    {
-        return idCardUrl1;
-    }
-    public void setIdCardUrl2(String idCardUrl2)
-    {
-        this.idCardUrl2 = idCardUrl2;
-    }
-
-    public String getIdCardUrl2()
-    {
-        return idCardUrl2;
-    }
-    public void setBrandName(String brandName)
-    {
-        this.brandName = brandName;
-    }
-
-    public String getBrandName()
-    {
-        return brandName;
-    }
-    public void setCompanySize(Long companySize)
-    {
-        this.companySize = companySize;
-    }
-
-    public Long getCompanySize()
-    {
-        return companySize;
-    }
-    public void setCompanyName(String companyName)
-    {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyName()
-    {
-        return companyName;
-    }
-    public void setBusinessLicenseNum(String businessLicenseNum)
-    {
-        this.businessLicenseNum = businessLicenseNum;
-    }
-
-    public String getBusinessLicenseNum()
-    {
-        return businessLicenseNum;
-    }
-    public void setBusinessLicenseUrl(String businessLicenseUrl)
-    {
-        this.businessLicenseUrl = businessLicenseUrl;
-    }
-
-    public String getBusinessLicenseUrl()
-    {
-        return businessLicenseUrl;
-    }
-    public void setCompanyProvinceId(Long companyProvinceId)
-    {
-        this.companyProvinceId = companyProvinceId;
-    }
-
-    public Long getCompanyProvinceId()
-    {
-        return companyProvinceId;
-    }
-    public void setCompanyCityId(Long companyCityId)
-    {
-        this.companyCityId = companyCityId;
-    }
-
-    public Long getCompanyCityId()
-    {
-        return companyCityId;
-    }
-    public void setCompanyCountryId(Long companyCountryId)
-    {
-        this.companyCountryId = companyCountryId;
-    }
-
-    public Long getCompanyCountryId()
-    {
-        return companyCountryId;
-    }
-    public void setCompanyAddress(String companyAddress)
-    {
-        this.companyAddress = companyAddress;
-    }
-
-    public String getCompanyAddress()
-    {
-        return companyAddress;
-    }
-    public void setLegalPersionName(String legalPersionName)
-    {
-        this.legalPersionName = legalPersionName;
-    }
-
-    public String getLegalPersionName()
-    {
-        return legalPersionName;
-    }
-    public void setLegalPersionPhoneNum(String legalPersionPhoneNum)
-    {
-        this.legalPersionPhoneNum = legalPersionPhoneNum;
-    }
-
-    public String getLegalPersionPhoneNum()
-    {
-        return legalPersionPhoneNum;
-    }
-    public void setOtherServ(String otherServ)
-    {
-        this.otherServ = otherServ;
-    }
-
-    public String getOtherServ()
-    {
-        return otherServ;
-    }
-    public void setStatus(Long status)
-    {
-        this.status = status;
-    }
-
-    public Long getStatus()
-    {
-        return status;
-    }
-
-    public List<WorkerSpecialSkill> getSpecialSkills() {
-        return specialSkills;
-    }
-
-    public void setSpecialSkills(List<WorkerSpecialSkill> specialSkills) {
-        this.specialSkills = specialSkills;
-    }
-
-    public String getMergerName() {
-        return mergerName;
-    }
-
-    public void setMergerName(String mergerName) {
-        this.mergerName = mergerName;
-    }
-
-    public String getSurname() {
-        return surname;
-    }
-
-    public void setSurname(String surname) {
-        this.surname = surname;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("workerCertificationId", getWorkerCertificationId())
-            .append("workerId", getWorkerId())
-            .append("surname", getSurname())
-            .append("name", getName())
-            .append("idCardNum", getIdCardNum())
-            .append("idCardUrl1", getIdCardUrl1())
-            .append("idCardUrl2", getIdCardUrl2())
-            .append("brandName", getBrandName())
-            .append("companySize", getCompanySize())
-            .append("companyName", getCompanyName())
-            .append("businessLicenseNum", getBusinessLicenseNum())
-            .append("businessLicenseUrl", getBusinessLicenseUrl())
-            .append("companyProvinceId", getCompanyProvinceId())
-            .append("companyCityId", getCompanyCityId())
-            .append("companyCountryId", getCompanyCountryId())
-            .append("companyAddress", getCompanyAddress())
-            .append("legalPersionName", getLegalPersionName())
-            .append("legalPersionPhoneNum", getLegalPersionPhoneNum())
-            .append("otherServ", getOtherServ())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
--- a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerCertificationServiceImpl.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerCertificationServiceImpl.java
@ -2,6 +2,8 @@ package com.ghy.worker.service.impl;

 import java.util.List;
 import com.ghy.common.utils.DateUtils;
+import com.ghy.system.domain.SysArea;
+import com.ghy.system.service.ISysAreaService;
 import org.springframework.stereotype.Service;
 import com.ghy.worker.mapper.WorkerCertificationMapper;
 import com.ghy.worker.domain.WorkerCertification;
@ -22,6 +24,9 @@ public class WorkerCertificationServiceImpl implements IWorkerCertificationServi
    @Resource
    private WorkerCertificationMapper workerCertificationMapper;

+    @Resource
+    private ISysAreaService sysAreaService;
+
    /**
     * 查询师傅实名审核
     *
@ -43,7 +48,28 @@ public class WorkerCertificationServiceImpl implements IWorkerCertificationServi
    @Override
    public List<WorkerCertification> selectWorkerCertificationList(WorkerCertification workerCertification)
    {
-        return workerCertificationMapper.selectWorkerCertificationList(workerCertification);
+        List<WorkerCertification> workerCertifications = workerCertificationMapper.selectWorkerCertificationList(workerCertification);
+        workerCertifications.forEach(model->{
+            if(model.getCompanyProvinceId() != null){
+                SysArea area = sysAreaService.selectById(model.getCompanyProvinceId());
+                if(area != null){
+                    model.setCompanyProvinceName(area.getAreaName());
+                }
+            }
+            if(model.getCompanyCityId() != null){
+                SysArea area = sysAreaService.selectById(model.getCompanyCityId());
+                if(area != null){
+                    model.setCompanyCityName(area.getAreaName());
+                }
+            }
+            if(model.getCompanyCountryId() != null){
+                SysArea area = sysAreaService.selectById(model.getCompanyCountryId());
+                if(area != null){
+                    model.setCompanyCountryName(area.getAreaName());
+                }
+            }
+        });
+        return workerCertifications;
    }

    /**