company_admin/.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
platform/.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
platform/.env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
platform/src/views/business/companyUser.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
company_admin/.env.development
@@ -1,15 +1,9 @@ # 开发环境配置 NODE_ENV = 'development' VUE_APP_CONTEXT_PATH = '/' # VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/' # VUE_APP_API = 'http://192.168.0.35:10022/' # VUE_APP_API = 'http://192.168.0.15:10022/' VUE_APP_API_PREFIX = '/preselect_web_interface' VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface' # VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/' VUE_APP_CONTEXT_PATH = '/preselect_web' VUE_APP_API_PREFIX = '/preselect_web_interface' VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface' #VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface' VUE_APP_API = 'https://yx.ahapp.net/web_interface_v2/' platform/.env.development
@@ -9,7 +9,5 @@ # 焦松 #VUE_APP_API = 'http://192.168.0.36:10023' # 江萍 VUE_APP_API = 'http://192.168.0.35:10023' VUE_APP_API = 'http://localhost:10023' # #测试服务器 VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface' platform/.env.production
@@ -8,4 +8,4 @@ # http://yx.ahapp.net/admin_interface/doc.html # VUE_APP_API = 'https://yx.ahapp.net/admin_interface' VUE_APP_API = 'https://127.0.0.1:10023/ VUE_APP_API = 'https://127.0.0.1:10023/ platform/src/views/business/companyUser.vue
@@ -48,11 +48,22 @@ </el-table-column> <el-table-column prop="createTime" label="创建时间" min-width="140px" align="center"></el-table-column> <el-table-column v-permissions="['system:user:resetPwd']" label="操作" width="120" fixed="right" > <template slot-scope="{row}"> <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">重置密码</el-button> </template> </el-table-column> </el-table> <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination"> </pagination> </template> <ResetPwdWindow ref="resetPwdWindow"/> </TableLayout> </template> @@ -61,10 +72,11 @@ import TableLayout from '@/layouts/TableLayout' import Pagination from '@/components/common/Pagination' import { updateById } from '@/api/system/user' import ResetPwdWindow from '@/components/system/user/ResetPwdWindow' export default { name: 'Company', extends: BaseTable, components: { TableLayout, Pagination }, components: { TableLayout, Pagination, ResetPwdWindow}, data() { return { oepnValidDate: [], server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -14,8 +14,8 @@ * @date 2021-10-10 14:40:35 * https://www.bejson.com/othertools/cron/ cron 表达式生成地址 */ @Component @EnableScheduling //@Component //@EnableScheduling public class ScheduleTool { @Autowired server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -379,6 +379,7 @@ if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){ for (int i = 0; i < goodsParamList.size(); i++) { GoodsParam goodsParam = goodsParamList.get(i); goodsParam.setId(null); goodsParam.setCreator(user.getId()); goodsParam.setCreateDate(new Date()); goodsParam.setIsdeleted(Constants.ZERO); @@ -508,6 +509,7 @@ if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){ for (int i = 0; i < goodsParamList.size(); i++) { GoodsParam goodsParam = goodsParamList.get(i); goodsParam.setId(null); goodsParam.setCreator(user.getId()); goodsParam.setCreateDate(new Date()); goodsParam.setIsdeleted(Constants.ZERO);