mirror of
https://github.com/zykzhangyukang/Xinguan.git
synced 2024-09-20 06:46:03 +08:00
更新sql文件
This commit is contained in:
zykzhangyukang
parent
9b88d3e047
commit
e87aafabe4
|
|
@ -2,26 +2,12 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="bc0098de-1555-475b-b0df-4f7e5b9cd099" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/mapper/OutStockInfoMapper.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/vo/OutStockDetailVO.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/vo/OutStockItemVO.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/mbg.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mbg.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/controller/OutStockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/controller/OutStockController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/converter/OutStockConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/converter/OutStockConverter.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/pojo/Consumer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/pojo/Consumer.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/ConsumerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/ConsumerService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/InStockService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/InStockService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/OutStockService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/OutStockService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/imp/ConsumerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/imp/ConsumerServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/imp/InStockServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/imp/InStockServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/imp/OutStockServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/service/imp/OutStockServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/vo/OutStockVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/vo/OutStockVO.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/vo/ProductStockVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/biz/vo/ProductStockVO.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/config/JWTFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/config/JWTFilter.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/enums/ErrorCodeEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/enums/ErrorCodeEnum.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/util/JWTUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/util/JWTUtils.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/biz/ProductStockMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/biz/ProductStockMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/aspect/ControllerEndpointAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/aspect/ControllerEndpointAspect.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/config/SSLConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/config/SSLConfig.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/test/JWTTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/coderman/api/system/test/JWTTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -49,9 +35,7 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="1bAcWvbNGttQep23Om4oagD645X" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
||||
<ConfirmationsSetting value="2" id="Add" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
|
|
@ -69,7 +53,7 @@
|
|||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588053406354" />
|
||||
<property name="extract.method.default.visibility" value="private" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/images" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/sql" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="project.structure.last.edited" value="Modules" />
|
||||
|
|
@ -78,8 +62,12 @@
|
|||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CreateClassDialog.RecentsKey">
|
||||
<recent name="com.coderman.api.biz.vo" />
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\sql" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\images" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\src\main\resources\mapper\system" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\src\main\java\com\coderman\api\system\config" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\src\main\resources" />
|
||||
</key>
|
||||
<key name="CopyClassDialog.RECENTS_KEY">
|
||||
<recent name="com.coderman.api.biz.mapper" />
|
||||
|
|
@ -88,12 +76,8 @@
|
|||
<recent name="com.coderman.api.biz.service.imp" />
|
||||
<recent name="com.coderman.api.system.controller" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\images" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\sql" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\src\main\resources\mapper\system" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\src\main\java\com\coderman\api\system\config" />
|
||||
<recent name="D:\myworkspace\workspace_idea2\Xinguan\src\main\resources" />
|
||||
<key name="CreateClassDialog.RecentsKey">
|
||||
<recent name="com.coderman.api.biz.vo" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RestClientSettings">
|
||||
|
|
@ -2291,20 +2275,7 @@
|
|||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.VuePermission">
|
||||
<configuration name="TestMbg" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.coderman.api.system.test.TestMbg" />
|
||||
<module name="Xinguan" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.coderman.api.system.test.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<component name="RunManager" selected="JUnit.JWTTest.testMd5">
|
||||
<configuration name="HttpTest.testGetJson" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||
<module name="Xinguan" />
|
||||
<extension name="coverage">
|
||||
|
|
@ -2321,6 +2292,22 @@
|
|||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="JWTTest.testMd5" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||
<module name="Xinguan" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.coderman.api.system.test.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<option name="PACKAGE_NAME" value="com.coderman.api.system.test" />
|
||||
<option name="MAIN_CLASS_NAME" value="com.coderman.api.system.test.JWTTest" />
|
||||
<option name="METHOD_NAME" value="testMd5" />
|
||||
<option name="TEST_OBJECT" value="method" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ProductCategoryMapperTest.test2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||
<module name="Xinguan" />
|
||||
<extension name="coverage">
|
||||
|
|
@ -2368,8 +2355,8 @@
|
|||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="JUnit.JWTTest.testMd5" />
|
||||
<item itemvalue="Spring Boot.VuePermission" />
|
||||
<item itemvalue="Application.TestMbg" />
|
||||
<item itemvalue="JUnit.ProductCategoryMapperTest.test2" />
|
||||
<item itemvalue="JUnit.HttpTest.testGetJson" />
|
||||
<item itemvalue="JUnit.TestMbg.test" />
|
||||
|
|
@ -2459,7 +2446,8 @@
|
|||
<workItem from="1590319814898" duration="5323000" />
|
||||
<workItem from="1590372507886" duration="9051000" />
|
||||
<workItem from="1590392524102" duration="5349000" />
|
||||
<workItem from="1590454949172" duration="3089000" />
|
||||
<workItem from="1590454949172" duration="5467000" />
|
||||
<workItem from="1590677263281" duration="989000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -2504,38 +2492,38 @@
|
|||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state x="524" y="119" key="#xdebugger.evaluate/0.0.1536.834@0.0.1536.834" timestamp="1588300742809" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.bottom" timestamp="1590458670287">
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.bottom" timestamp="1590678260654">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.bottom/0.0.1536.834@0.0.1536.834" timestamp="1590458670287" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.center" timestamp="1590458670287">
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.bottom/0.0.1536.834@0.0.1536.834" timestamp="1590678260654" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.center" timestamp="1590678260654">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.center/0.0.1536.834@0.0.1536.834" timestamp="1590458670287" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.left" timestamp="1590458670287">
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.center/0.0.1536.834@0.0.1536.834" timestamp="1590678260654" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.left" timestamp="1590678260654">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.left/0.0.1536.834@0.0.1536.834" timestamp="1590458670287" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.right" timestamp="1590458670287">
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.left/0.0.1536.834@0.0.1536.834" timestamp="1590678260654" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.right" timestamp="1590678260654">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.right/0.0.1536.834@0.0.1536.834" timestamp="1590458670287" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.bottom" timestamp="1590458670289">
|
||||
<state width="1493" height="368" key="GridCell.Tab.0.right/0.0.1536.834@0.0.1536.834" timestamp="1590678260654" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.bottom" timestamp="1590458907575">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.bottom/0.0.1536.834@0.0.1536.834" timestamp="1590458670289" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.center" timestamp="1590458670287">
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.bottom/0.0.1536.834@0.0.1536.834" timestamp="1590458907575" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.center" timestamp="1590458907575">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.center/0.0.1536.834@0.0.1536.834" timestamp="1590458670287" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.left" timestamp="1590458670287">
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.center/0.0.1536.834@0.0.1536.834" timestamp="1590458907575" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.left" timestamp="1590458907575">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.left/0.0.1536.834@0.0.1536.834" timestamp="1590458670287" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.right" timestamp="1590458670288">
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.left/0.0.1536.834@0.0.1536.834" timestamp="1590458907575" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.right" timestamp="1590458907575">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.right/0.0.1536.834@0.0.1536.834" timestamp="1590458670288" />
|
||||
<state width="1493" height="368" key="GridCell.Tab.1.right/0.0.1536.834@0.0.1536.834" timestamp="1590458907575" />
|
||||
<state width="1493" height="624" key="GridCell.Tab.2.bottom" timestamp="1590381858534">
|
||||
<screen x="0" y="0" width="1536" height="834" />
|
||||
</state>
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ public class OutStockController {
|
|||
@ControllerEndpoint(exceptionMessage = "发放单申请失败", operation = "发放单申请")
|
||||
@ApiOperation("提交发放单")
|
||||
@PostMapping("/addOutStock")
|
||||
@RequiresPermissions({"outStock:out"})
|
||||
public ResponseBean addOutStock(@RequestBody @Validated OutStockVO outStockVO){
|
||||
if(outStockVO.getConsumerId()==null){
|
||||
//说明现在添加物资来源
|
||||
|
|
|
|||
|
|
@ -3,19 +3,16 @@ package com.coderman.api.system.aspect;
|
|||
import com.alibaba.fastjson.JSON;
|
||||
import com.coderman.api.system.annotation.ControllerEndpoint;
|
||||
import com.coderman.api.system.bean.ActiveUser;
|
||||
import com.coderman.api.system.bean.ResponseBean;
|
||||
import com.coderman.api.system.enums.ErrorCodeEnum;
|
||||
import com.coderman.api.system.exception.BizException;
|
||||
import com.coderman.api.system.pojo.Log;
|
||||
import com.coderman.api.system.service.LogService;
|
||||
import com.coderman.api.system.util.AddressUtil;
|
||||
import com.coderman.api.system.util.IPUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.*;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.aspectj.lang.reflect.MethodSignature;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
|
||||
|
|
@ -25,7 +22,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
|
|||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.SocketTimeoutException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,14 +32,7 @@ public class JWTTest {
|
|||
System.out.println(token);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMd5(){
|
||||
String salt= UUID.randomUUID().toString();
|
||||
String password="zhangyukang";
|
||||
String s = MD5Utils.md5Encryption(password, salt);
|
||||
System.out.println("salt="+salt);
|
||||
System.out.println("password="+s);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test1(){
|
||||
System.out.println(new Date());
|
||||
|
|
@ -69,4 +62,13 @@ public class JWTTest {
|
|||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMd5(){
|
||||
String salt= UUID.randomUUID().toString();
|
||||
String password="zyk199907316414";
|
||||
String s = MD5Utils.md5Encryption(password, salt);
|
||||
System.out.println("salt="+salt);
|
||||
System.out.println("password="+s);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue