feature:修改注释

jianshui-admin/src/main/resources/application-dev.yml

@@ -9,12 +9,12 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://127.0.0.1:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        url: jdbc:mysql://58.87.71.213:3306/bid_jianshui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        url: jdbc:mysql://58.87.71.213:3306/jianshui_dev_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jianshui_dev
+        username: root
 #        username: bid_jianshui
-        password: tHsWetXEjYFJsdAC
+        password: 1893
 #        password: ts3D5zYkFzcxbrPc
 #        password: kaMSddCzO54qtIg0I9N8iKA2iSFrm8YdBK55Zxdjxy8Zuo7+GoRcZHUOI9UmY1JtrMP6wA//Bftj8oq8zRbbPA==
           # 从库数据源

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java

@@ -1401,7 +1401,7 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
                 // 判断一下是否是需要的dto
                 if (StringUtils.isNotEmpty(downloadRedInfoDTO.getBillNo())) {
                     // if (!StringUtils.equals(tempDTO.getOutTradeOrderno(), downloadRedInfoDTO.getBillNo())) {
-                    if (!((StringUtils.equals(tempDTO.getOriginFpdm(), redInfoResult.getOriginFpdm())) && (StringUtils.equals(tempDTO.getOriginFphm(), redInfoResult.getOriginFphm())))) { // 狗比大象，他的申请单号是他们返回的，诺诺是我们上传的，我们只能用他们返回的申请单号
+                    if (!((StringUtils.equals(tempDTO.getOriginFpdm(), redInfoResult.getOriginFpdm())) && (StringUtils.equals(tempDTO.getOriginFphm(), redInfoResult.getOriginFphm())))) { // 大象，他的申请单号是他们返回的，诺诺是我们上传的，我们只能用他们返回的申请单号
                         continue;
                     } else {
                         page = 1000;

jianshui-invoice/src/main/java/com/jianshui/invoice/utils/ApiRequestUtils.java

@@ -7,12 +7,14 @@ import com.jianshui.common.enums.ErrorCode;
 import com.jianshui.common.exception.jianshui.JianshuiParamErrorException;
 import com.jianshui.common.utils.StringUtils;
 import com.jianshui.common.utils.spring.SpringUtils;
+import com.jianshui.common.utils.uuid.UUID;
 import com.jianshui.invoice.domain.BillInfo;
 import com.jianshui.invoice.domain.dto.HXResponse;
 import com.jianshui.invoice.service.IInvoiceApiService;
 import com.jianshui.system.mapper.CompanyserviceMapper;
 import com.jianshui.system.mapper.ServiceManageMapper;
 import com.jianshui.system.service.IServiceManageService;
+import nuonuo.open.sdk.NNOpenSDK;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -56,7 +58,7 @@ public class ApiRequestUtils {
             }
         }
 
-        // 坑比诺诺2.0
+        // 诺诺2.0
         sellertax = request.getHeader("taxNum");
         if (StringUtils.isNotEmpty(sellertax)) {
             CompanyserviceMapper companyserviceMapper = SpringUtils.getBean(CompanyserviceMapper.class);
@@ -66,7 +68,7 @@ public class ApiRequestUtils {
             }
         }
 
-        // 大坑比诺诺2.0
+        // 诺诺2.0
         sellertax = request.getHeader("taxnum");
         if (StringUtils.isNotEmpty(sellertax)) {
             CompanyserviceMapper companyserviceMapper = SpringUtils.getBean(CompanyserviceMapper.class);

jianshui-ui/vue.config.js

@@ -11,9 +11,9 @@ const name = process.env.VUE_APP_TITLE || '简税平台管理系统' // 网页
 const port = process.env.port || process.env.npm_config_port || 8088 // 端口
 // 'http://dev.goldentaxcloud.com:8081'
 // www.goldentaxcloud.com:8080
-let development = 'http://dev.goldentaxcloud.com:8081'
+// let development = 'http://dev.goldentaxcloud.com:8081'
 // let development = 'www.goldentaxcloud.com:8080'
-// let development = 'http://192.168.3.106:8081' //刑泽本地环境
+let development = 'http://127.0.0.1:8081' //刑泽本地环境
 const url = process.env.NODE_ENV === 'development' ? development : development
 
 // vue.config.js 配置说明