a

jiangping

2023-10-16 a69578ed877252e70d45d4753258b3d7b6937606

a

 .idea/dmMes.iml

@@ -5,5 +5,14 @@
    <content url="file://$MODULE_DIR$" />
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library" exported="">
      <library>
        <CLASSES>
          <root url="jar://$MODULE_DIR$/server/lib/antelope-other-client-20230203.0.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
      </library>
    </orderEntry>
  </component>
</module>

 h5_standard/.env

@@ -1,4 +1,8 @@
<<<<<<< HEAD
# æŽ¥å£å‰ç¼€  _api_api_test
=======
# æŽ¥å£å‰ç¼€  _api
>>>>>>> 1.0.3
VUE_APP_API_PREFIX = '/api'

# ä¸Šä¸‹æ–‡è·¯å¾„ --> é»˜è®¤./（可以部署在服务器任意路径）

 h5_standard/.env.development

@@ -11,20 +11,28 @@

# èå§æœ¬åœ°
<<<<<<< HEAD
<<<<<<< HEAD
#  VUE_APP_API = 'http://192.168.3.219:10021/'
=======
 VUE_APP_API = 'http://192.168.3.219:10021/'
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
=======
#  VUE_APP_API = 'http://192.168.3.219:10021/'
>>>>>>> 1.0.3

# ä»»åº·æœ¬åœ°
# VUE_APP_API = 'http://192.168.0.15:10021/'
# VUE_APP_API = 'http://192.168.0.127:10021/'

<<<<<<< HEAD
<<<<<<< HEAD
VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
=======
#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
=======
VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
>>>>>>> 1.0.3

# VUE_APP_API = 'http://192.168.0.13:10012/'


 h5_standard/.env.production

@@ -18,9 +18,13 @@
# VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'

# æµ‹è¯•
<<<<<<< HEAD
# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'

#VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
=======
#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
>>>>>>> 1.0.3

# æ¼”示
VUE_APP_API = 'https://www.mes.red/api/'

 h5_standard/public/redirect.html

@@ -9,10 +9,16 @@
  var url = window.location.href
  if (url.indexOf('?code') === -1) {
    let query = url.split('?')[1]
<<<<<<< HEAD
    let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
    // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
    // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
    // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
=======
    // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
    // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
    let tempUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
>>>>>>> 1.0.3
    window.location.replace(tempUrl)
  } else {
    var code = url.substring(url.indexOf('?') + 6, url.indexOf('&'))

 h5_standard/src/views/LogInAgain.vue

@@ -91,6 +91,7 @@
        uuid: '0000',
        code: '0000'
      })
<<<<<<< HEAD
      // let res = await testLogin({ // æ–‡æ­¦
      //   username: '18656077929',
      //   password: '123456',
@@ -101,6 +102,11 @@
      // let res = await testLogin({ // å¼ ç£Šé«˜
      //   username: '15256913207',
      //   password: '123456',
=======
      // let res = await testLogin({ // å¼ ç£Šé«˜
      //   username: '15256913207',
      //   password: '123456',
>>>>>>> 1.0.3
      //   companyId: '8',
      //   uuid: '0000',
      //   code: '0000'

 h5_standard/src/views/children.vue

@@ -37,10 +37,14 @@
    const title = ref<string>('')

<<<<<<< HEAD
<<<<<<< HEAD
    // alert(window.document.title)
=======
    alert(window.document.title)
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
=======
    // alert(window.document.title)
>>>>>>> 1.0.3
    const pathLists = reactive<string[]>([
        '/index',
        '/workbench',

 h5_standard/src/views/tabPage/my.vue

@@ -78,10 +78,16 @@
        }).then(res => {
            if (res.code === 200) {
                // window.parent.postMessage('阿康', '*')
<<<<<<< HEAD
                let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
=======
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
                let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
>>>>>>> 1.0.3
                window.open(href)
                // window.location.replace(href)
            }

 platform_web/.env.development

@@ -21,6 +21,18 @@
#焦松

#VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'



<<<<<<< HEAD

#任康本地

VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'

# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'

=======

#刘磊磊本地

# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'

VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'



# # æŽ¥å£å‰ç¼€

# VUE_APP_API_PREFIX = '/doumeeplant/'



# #正式环境

VUE_APP_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant/'

>>>>>>> 1.0.3


 platform_web/.env.lingyang

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
# ç”Ÿäº§çŽ¯å¢ƒé…ç½®

NODE_ENV = 'production'



# å…³é—­DEBUG

VUE_APP_DEBUG = 'off'



# è·¯ç”±æ–¹å¼

VUE_APP_ROUTER_MODE = 'hash'



# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„

VUE_APP_CONTEXT_PATH = '/admin'



# æŽ¥å£å‰ç¼€

VUE_APP_API_PREFIX = '/doumeeplant/'



#正式环境

VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'


 platform_web/.env.production

@@ -9,15 +9,9 @@


# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„

VUE_APP_CONTEXT_PATH = '/admin'





# æŽ¥å£å‰ç¼€

VUE_APP_API_PREFIX = '/doumeeplant/'



#测试服务器

#VUE_APP_BASE_URL = 'http://139.186.142.91:10012/'

#演示服务器

# VUE_APP_BASE_URL = 'http://121.41.112.139:10012/'

VUE_APP_API_PREFIX = '/api/'



#正式环境

VUE_APP_BASE_URL = 'https://www.mes.red/doumeeplant/'

VUE_APP_BASE_URL = 'https://www.mes.red/api/'




 platform_web/package.json

@@ -5,6 +5,7 @@
  "scripts": {
    "serve": "vue-cli-service serve",
    "build:pro": "vue-cli-service build",
    "build:ly": "vue-cli-service build --mode lingyang",
    "build:dev": "vue-cli-service build --mode staging",
    "lint": "vue-cli-service lint",
    "fix": "eslint --ext .js,.vue src --fix"

 platform_web/src/components/common/CommonHeader.vue

@@ -149,10 +149,11 @@
      logout()
        .then(() => {
          this.setUserInfo(null)
          this.$router.push({ name: 'login' })
          // this.$router.push({ path: '/login' })
          window.location.reload()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
          this.$tips.apiFailed(e)
        })
    }
  }

 platform_web/src/views/business/clientManger.vue

@@ -1,6 +1,6 @@
<template>
  <!-- :permissions="['business:appliancechange:query']" -->
  <TableLayout>
  <TableLayout :permissions="['ext:companyext:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" label-suffix="：" inline>
      <el-form-item label="客户名称" prop="name">
@@ -26,11 +26,11 @@
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar">
        <!-- v-permissions="['ext:workorderrecordext:exportExcel']" -->
        <li><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '新增客户')">新增</el-button></li>
        <!-- -->
        <li v-permissions="['ext:companyext:create']"><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '新增客户')">新增</el-button></li>
        <!-- <li><el-button type="primary" @click="exportExcel">调整有效期</el-button></li> -->
        <li><el-button type="primary" @click="resetUserPwd">重置主账号密码</el-button></li>
        <li><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">删除</el-button></li>
        <li v-permissions="['ext:companyext:delete']"><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">删除</el-button></li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe border
        @selection-change="handleSelectionChange">
@@ -65,13 +65,16 @@
              :inactive-value="0" @change="statusChange(row)"></el-switch>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" min-width="220px" fixed="right">
        <el-table-column
          v-if="containPermissions(['ext:companyext:update', 'ext:companyext:delete'])"
          
          label="操作" align="center" min-width="220px" fixed="right">
          <template slot-scope="{ row }">
            <!-- <el-button type="text" @click="$refs.operaClientMangerWindow.open('编辑客户', row)">编辑</el-button> -->
            <el-button type="text" @click="showDetail(row, true)">编辑</el-button>
            <el-button type="text" @click="$refs.operaClientValidDateWindow.open('调整', row)">调整</el-button>
            <el-button type="text" @click="$refs.operaDDSettingWindow.open('钉钉配置', row)">钉钉配置</el-button>
            <el-button type="text" style="color:red" :loading="isWorking.delete"
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="showDetail(row, true)">编辑</el-button>
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaClientValidDateWindow.open('调整', row)">调整</el-button>
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaDDSettingWindow.open('钉钉配置', row)">钉钉配置</el-button>
            <el-button type="text" v-permissions="['ext:companyext:delete']" style="color:red" :loading="isWorking.delete"
              @click="deleteById(row, false)">删除</el-button>
          </template>
        </el-table-column>

 platform_web/src/views/login.vue

@@ -46,7 +46,6 @@
      loading: false,

      username: '',

      password: '',

      companyId: 8,

      // éªŒè¯ç 

      captcha: {

        loading: false,

@@ -78,11 +77,13 @@
        username: this.username.trim(),

        password: this.password,

        code: this.captcha.value.trim(),

        companyId: this.companyId,

        uuid: this.captcha.uuid

      })

        .then(() => {

          window.location.href = process.env.VUE_APP_CONTEXT_PATH

          // console.log(process.env.VUE_APP_CONTEXT_PATH);

          // b7121c39-e109-472f-bb89-722b91289437

          // window.location.href = process.env.VUE_APP_CONTEXT_PATH

          window.location.reload()

        })

        .catch(e => {

          this.refreshCaptcha()


 screen_standard/.env.development

@@ -6,11 +6,10 @@
#VITE_BASE_URL='http://192.168.0.35:10021'

# VITE_BASE_PATH='/doumeeplant_api'
<<<<<<< HEAD
# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'

VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
=======

VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'
# VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
VITE_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant'

 screen_standard/.env.lingyang

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
NODE_ENV = production
VITE_NAME = '生产环境'
VITE_BASE_CONTEXT = 'screen'
VITE_BASE_PATH = '/doumeeplant/'
VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'

 screen_standard/.env.production

@@ -1,5 +1,5 @@
NODE_ENV = production
VITE_NAME = '生产环境'
VITE_BASE_CONTEXT = 'screen'
VITE_BASE_PATH = '/api'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
VITE_BASE_PATH = '/api/'
VITE_BASE_URL = 'https://www.mes.red/api'

 screen_standard/package.json

@@ -5,6 +5,7 @@
  "scripts": {
    "serve": "vite --mode development",
    "build:pro": "vite build --mode production",
    "build:ly": "vite build --mode lingyang",
    "build:dev": "vite build --mode staging",
    "preview": "vite preview"
  },

 screen_standard/vite.config.js

@@ -43,7 +43,7 @@
    // æœ¬åœ°è¿è¡Œé…ç½®ï¼ŒåŠåå‘代理配置
    server: {
      host: '192.168.0.3',
      port: '8080',
      port: '1801',
      cors: true, // é»˜è®¤å¯ç”¨å¹¶å…è®¸ä»»ä½•æº
      open: true, // åœ¨æœåŠ¡å™¨å¯åŠ¨æ—¶è‡ªåŠ¨åœ¨æµè§ˆå™¨ä¸­æ‰“开应用程序
      //反向代理配置，注意rewrite写法，开始没看文档在这里踩了坑

 server/src/main/java/doumeemes/api/system/SystemLoginLogController.java

@@ -6,10 +6,14 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
<<<<<<< HEAD
import doumeemes.dao.business.model.Backorder;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
=======
import doumeemes.dao.ext.dto.CompanyLoginDTO;
>>>>>>> 1.0.3
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -50,6 +54,24 @@
    @RequiresPermissions("system:loginLog:query")
    public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "登录日志_"+System.currentTimeMillis(),"登录日志-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
<<<<<<< HEAD
=======
    }


    @PostMapping("/companyLoginStatisticsPage")
    @ApiOperation("企业登录统计")
//    @RequiresPermissions("system:loginLog:query")
    public ApiResponse<PageData<CompanyLoginStatisticsVO>> companyLoginStatisticsPage (@RequestBody PageWrap<CompanyLoginDTO> pageWrap) {
        return ApiResponse.success(systemUserService.companyLoginStatisticsPage(pageWrap));
    }

    @PostMapping("/companyLoginStatisticsExport")
    @ApiOperation("企业登录统计导出")
//    @RequiresPermissions("system:loginLog:query")
    public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
>>>>>>> 1.0.3
    }



 server/src/main/java/doumeemes/config/shiro/ShiroToken.java

@@ -1,6 +1,9 @@
package doumeemes.config.shiro;

<<<<<<< HEAD
import doumeemes.core.model.LoginUserInfo;
=======
>>>>>>> 1.0.3
import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.stereotype.Component;


 server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java

@@ -17,6 +17,7 @@
public class CompanyLoginStatisticsVO {

    @ApiModelProperty(value = "时间 yyyy-MM-dd")
<<<<<<< HEAD
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER,index = 0)
    private String dataDate;

@@ -30,6 +31,21 @@

    @ApiModelProperty(value = "登录次数")
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER,index = 3)
=======
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER)
    private String dataDate;

    @ApiModelProperty(value = "登录企业名称")
    @ExcelColumn(name="登录企业名称",width = 6,align = HorizontalAlignment.CENTER)
    private String companyName;

    @ApiModelProperty(value = "渠道")
    @ExcelColumn(name="渠道", valueMapping = "0=PC平台;1=钉钉平台;2=羚羊平台;3=EDGP平台;4=微信小程序",width = 6,align = HorizontalAlignment.CENTER)
    private Integer orgin;

    @ApiModelProperty(value = "登录次数")
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER)
>>>>>>> 1.0.3
    private Integer loginNum;

}

 server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java

@@ -90,6 +90,7 @@
    @ExcelColumn(name="登录时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
    private Date loginTime;
<<<<<<< HEAD
<<<<<<< HEAD
=======
    @ApiModelProperty(value = "企业名称")
    @ExcelColumn(name="企业名称", color = IndexedColors.RED, width = 16)
@@ -102,4 +103,6 @@
    private String  companyUserName;

>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
=======
>>>>>>> 1.0.3
}

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -137,6 +137,9 @@
            for(WorkorderRecordExtListVO model : result){
                //查询生产人员姓名
                initProUser(user,model,allDepartList);
//                BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
//                s.divide(new BigDecimal(0),2);
//                model.setSalary(s.doubleValue());
            }
        }
        return PageData.from(new PageInfo<>(result));

 server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java

@@ -4,7 +4,10 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
<<<<<<< HEAD
import doumeemes.core.utils.DateUtil;
=======
>>>>>>> 1.0.3
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -198,9 +201,12 @@

    @Override
    public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
<<<<<<< HEAD
        if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
            activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
        }
=======
>>>>>>> 1.0.3
        return systemUserMapper.activityLoginVOList(activityLoginDTO);
    }


 server/src/main/resources/application-standardLingyang.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
# WEB服务器配置 æ¼”示环境
server:
  port: 10021
  servlet:
    session:
      timeout: PT3H  #表示12小时

spring:
  # æ•°æ®æºé…ç½®

  datasource:
    url: jdbc:mysql://192.168.10.147:3306/doumee_mes_standard?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: root
    password: Doumee@168_com
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource

  #  rabbitmq:
  #    host: amqp-cn-7mz2o4ddz00c.cn-hangzhou.amqp-2.net.mq.amqp.aliyuncs.com
  #    port: 5672
  #    username: MjphbXFwLWNuLTdtejJvNGRkejAwYzpMVEFJNXQ3QzFjdXJUNnlleGNoc1hMZWo=
  #    password: RkEwNjMzNUM5MTBENzE2QjQyQzE4OTc1ODREMEU5NzA4ODFBMkQ2NjoxNjUwOTU0NjI4MjYx
  #    virtual-host: mqtest

  #  redis:
  #    #    database: 0
  #    host: r-m5ece8e1y7649odr2xpd.redis.rds.aliyuncs.com
  #    port: 6379
  #    password: doumee:doumee@168
  #    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
  redis:
    #    database: 0
    host: 192.168.10.186
    port: 6379
    password: Doumee@168_com
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: doumee@168.com
debug_model: true

captcha_check: true

# Swagger配置
swagger:
  host:
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /

 server/src/main/resources/application.yml

@@ -9,7 +9,7 @@
#  application:
#  name: doumeemes
  profiles:
    active: standardPro
    active: standardLingyang
  # JSON返回配置
  jackson:
    # é»˜è®¤æ—¶åŒº

 server/src/main/resources/mappers/SystemUserMapper.xml

@@ -72,7 +72,11 @@
  </resultMap>

  <select id="activityLoginVOList" parameterType="doumeemes.dao.ext.dto.ActivityLoginDTO" resultMap="ActivityLoginVO">
<<<<<<< HEAD
    select a.DATA_DATE , count(b.id)  as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d')  DATA_DATE
=======
    select a.DATA_DATE , count(1)  as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d')  DATA_DATE
>>>>>>> 1.0.3
    FROM mysql.help_topic
    WHERE  TIMESTAMPDIFF(DAY,CONCAT(#{dto.startDate}),CONCAT(#{dto.endDate})) > help_topic_id )  a
    left join
@@ -97,11 +101,18 @@
    FROM `system_login_log` s left join company c on s.COMPANY_ID = c.ID
    <where>
      s.COMPANY_ID is not null
<<<<<<< HEAD
      and s.SUCCESS = 1
      and s.ORGIN is not null
      <if test="dto.orgin != null">
        AND s.orgin = #{dto.orgin}
      </if>
=======
      <if test="dto.orgin != null">
        AND s.orgin = #{dto.orgin}
      </if>

>>>>>>> 1.0.3
      <if test="dto.companyName != null and dto.companyName != ''">
        AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
      </if>

 web_standard/.env.lingyang

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
# ç”Ÿäº§çŽ¯å¢ƒé…ç½®
NODE_ENV = 'production'

# å…³é—­DEBUG
VUE_APP_DEBUG = 'off'

# è·¯ç”±æ–¹å¼
VUE_APP_ROUTER_MODE = 'hash'

# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„
VUE_APP_CONTEXT_PATH = '/web/'

# æŽ¥å£å‰ç¼€
VUE_APP_API_PREFIX = '/doumeeplant/'

VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'

 web_standard/.env.production

@@ -11,6 +11,6 @@
VUE_APP_CONTEXT_PATH = '/web/'

# æŽ¥å£å‰ç¼€
VUE_APP_API_PREFIX = '/doumeeplant'
VUE_APP_API_PREFIX = '/api/'

VUE_APP_BASE_URL = 'https://www.mes.red/doumeeplant/'
VUE_APP_BASE_URL = 'https://www.mes.red/api/'