Merge remote-tracking branch 'origin/master'

XWxiaowei · XWxiaowei · commit b4a9cb97449a · 2018-07-16T22:27:00.000+08:00
diff --git a/auto-java-code-upgrade/src/main/java/com/jay/generator/codegen/mybatis3/xmlmapper/MySimpleXMLMapperGenerator.java b/auto-java-code-upgrade/src/main/java/com/jay/generator/codegen/mybatis3/xmlmapper/MySimpleXMLMapperGenerator.java
@@ -7,6 +7,8 @@
 import org.mybatis.generator.api.dom.xml.XmlElement;
 import org.mybatis.generator.codegen.mybatis3.xmlmapper.SimpleXMLMapperGenerator;
 import org.mybatis.generator.codegen.mybatis3.xmlmapper.elements.AbstractXmlElementGenerator;
+import org.mybatis.generator.codegen.mybatis3.xmlmapper.elements.BaseColumnListElementGenerator;
+import org.mybatis.generator.codegen.mybatis3.xmlmapper.elements.UpdateByPrimaryKeyWithoutBLOBsElementGenerator;
 import org.mybatis.generator.internal.util.messages.Messages;
 
 /**
@@ -28,7 +30,7 @@ protected XmlElement getSqlMapElement() {
         answer.addAttribute(new Attribute("namespace", namespace));
         this.context.getCommentGenerator().addRootComment(answer);
         this.addResultMapElement(answer);
-        this.addDeleteByPrimaryKeyElement(answer);
+        this.addBaseColumnListElement(answer);
         this.addInsertElement(answer);
         this.addUpdateByPrimaryKeyElement(answer);
         this.addSelectByPrimaryKeyElement(answer);
@@ -49,6 +51,13 @@ protected void addQueryPageListElement(XmlElement parentElement) {
         this.initializeAndExecuteGenerator(elementGenerator, parentElement);
     }
 
+    protected void addBaseColumnListElement(XmlElement parentElement) {
+//        if (this.introspectedTable.getRules().generateBaseColumnList()) {
+            AbstractXmlElementGenerator elementGenerator = new BaseColumnListElementGenerator();
+            this.initializeAndExecuteGenerator(elementGenerator, parentElement);
+//        }
+
+    }
     /**
      * 统计数量语句
      *
@@ -58,4 +67,10 @@ protected void addCountListElement(XmlElement parentElement) {
         AbstractXmlElementGenerator elementGenerator = new MySimpleCountListElementGenerator();
         this.initializeAndExecuteGenerator(elementGenerator, parentElement);
     }
+    @Override
+    protected void addUpdateByPrimaryKeyElement(XmlElement parentElement) {
+            AbstractXmlElementGenerator elementGenerator = new UpdateByPrimaryKeyWithoutBLOBsElementGenerator(true);
+            this.initializeAndExecuteGenerator(elementGenerator, parentElement);
+
+    }
 }
diff --git a/auto-java-code-upgrade/src/main/resources/generatorConfig.properties b/auto-java-code-upgrade/src/main/resources/generatorConfig.properties
@@ -5,9 +5,9 @@
 projectPath=D:/Self_learn/JavaCode
 #jdbcConnection 连接
 driverClass=com.mysql.jdbc.Driver
-jdbcUrl=jdbc:mysql://localhost:3306/platformkf?useUnicode\=true&characterEncoding\=UTF-8
-user=root
-password=1234
+jdbcUrl=jdbc:mysql://192.168.210.33:3306/platformkf?useUnicode\=true&characterEncoding\=UTF-8
+user=dev
+password=dev123456
 
 #targetProject是包所在的位置:要写成相对路径
 #mac 下
@@ -16,11 +16,11 @@ password=1234
 targetProject=auto-java-code-upgrade\\src\\main\\java
 
 #model的目标包名
-modelTargetPackage=com.aisino.projects.task.model
+modelTargetPackage=com.zjaisino.shop.order.model
 #映射文件的目标包名
-sqlMapTargetPackage=com.aisino.projects.task.mybatis
+sqlMapTargetPackage=com.zjaisino.shop.order.mybatis
 #dao的目标包名
-daoTargetPackage=com.aisino.projects.task.mapper
+daoTargetPackage=com.zjaisino.shop.order.mapper
 
 service,controller的包名位置
-serviceName=com.aisino.projects.task.service
+serviceName=com.zjaisino.shop.order.service
diff --git a/auto-java-code-upgrade/src/main/resources/generatorConfig.xml b/auto-java-code-upgrade/src/main/resources/generatorConfig.xml
@@ -42,7 +42,7 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         <!--生成对应表及类名-->		
-              <table tableName="okwuyou_goods_images" domainObjectName="OkwuyouGoodsImages"
+        <table tableName="tax_shop_order" domainObjectName="TaxShopOrder"
              enableInsert="true" enableDeleteByPrimaryKey="false" enableUpdateByPrimaryKey="true"
              enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
              enableSelectByExample="false" selectByExampleQueryId="false" selectByPrimaryKeyQueryId="false"></table>
diff --git a/design-patterns/pom.xml b/design-patterns/pom.xml
@@ -14,7 +14,11 @@
 
     </properties>
     <dependencies>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>4.3.16.RELEASE</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/design-patterns/src/main/java/com/decorate/Client.java b/design-patterns/src/main/java/com/decorate/Client.java
@@ -9,9 +9,9 @@ public static void main(String[] args) {
         Coffee coffee1 = new Americano();
         Coffee coffee2 = new Latte();
         Flavour flavour = new Sugar(coffee1);
-        System.out.println(flavour.getCoffeeInfo());
+        System.out.println(flavour.getCoffeeInfo()+"现在的价格是:"+flavour.cost());
         Flavour flavour1 = new Milk(coffee2);
-        System.out.println(flavour1.getCoffeeInfo());
+        System.out.println(flavour1.getCoffeeInfo()+"现在的价格是:"+flavour1.cost());
 
     }
 }
diff --git a/design-patterns/src/main/java/com/decorate/doc/装饰者模式（以 coffee为例）.pos b/design-patterns/src/main/java/com/decorate/doc/装饰者模式（以 coffee为例）.pos
diff --git a/design-patterns/src/main/java/com/proxy/cglib/Client.java b/design-patterns/src/main/java/com/proxy/cglib/Client.java
@@ -0,0 +1,15 @@
+package com.proxy.cglib;
+
+/**
+ * @author xiang.wei
+ * @create 2018/5/28 15:19
+ */
+public class Client {
+    public static void main(String[] args) {
+        //目标对象
+        RealSubject realSubject = new RealSubject();
+        //代理对象
+        RealSubject proxy = (RealSubject) new ProxyFactory(realSubject).getProxyInstance();
+        proxy.buyCosmetics();
+    }
+}
diff --git a/design-patterns/src/main/java/com/proxy/cglib/ProxyFactory.java b/design-patterns/src/main/java/com/proxy/cglib/ProxyFactory.java
@@ -0,0 +1,42 @@
+package com.proxy.cglib;
+
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author xiang.wei
+ * @create 2018/5/28 15:03
+ */
+public class ProxyFactory implements MethodInterceptor{
+    //维护目标对象
+    private Object target;
+
+    public ProxyFactory(Object target) {
+        this.target = target;
+    }
+
+    /**
+     * 给目标对象创建一个代理对象
+     * @return
+     */
+    public Object getProxyInstance() {
+        //1.工具类
+        Enhancer enhancer = new Enhancer();
+        //2.设置代理目标
+        enhancer.setSuperclass(target.getClass());
+        //3.设置回调函数
+        enhancer.setCallback(this);
+        //4.创建子类（代理对象）
+        return enhancer.create();
+    }
+    @Override
+    public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
+        System.out.println("前置处理");
+        Object returnValue = methodProxy.invoke(target, objects);
+        System.out.println("后置处理");
+        return returnValue;
+    }
+}
diff --git a/design-patterns/src/main/java/com/proxy/cglib/RealSubject.java b/design-patterns/src/main/java/com/proxy/cglib/RealSubject.java
@@ -0,0 +1,11 @@
+package com.proxy.cglib;
+
+/**
+ * @author xiang.wei
+ * @create 2018/5/28 15:02
+ */
+public class RealSubject {
+    public void buyCosmetics() {
+        System.out.println("买某种进口化妆品");
+    }
+}
diff --git a/design-patterns/src/main/java/com/proxy/dynamic_proxy/Client.java b/design-patterns/src/main/java/com/proxy/dynamic_proxy/Client.java
@@ -0,0 +1,22 @@
+package com.proxy.dynamic_proxy;
+
+import java.lang.reflect.Proxy;
+
+/**
+ * @author xiang.wei
+ * @create 2018/5/28 13:30
+ */
+public class Client {
+    public static void main(String[] args) {
+        ISubject target =  new RealSubject();
+        //生成真实对象的代理
+        DynamicProxy handler = new DynamicProxy(target);
+        // 动态生成代理实例（HouseHold代理实例），代理支持的接口由初始化参数（第二个）指定，代理实例处理操作所调用的 handler 由第三个参数指定
+        ISubject proxy1 = (ISubject) Proxy.newProxyInstance(RealSubject.class.getClassLoader(),RealSubject.class.getInterfaces(),handler);
+        proxy1.buyCosmetics(); // 执行客户需要进行的行为操作，动态生成的代理实例直接调用指定 handler 的 invoke 方法
+
+        ProxyFactory proxyFactory = new ProxyFactory(target);
+        ISubject proxy = (ISubject) proxyFactory.getProxyInstance();
+        proxy.buyCosmetics();
+    }
+}
diff --git a/design-patterns/src/main/java/com/proxy/dynamic_proxy/DynamicProxy.java b/design-patterns/src/main/java/com/proxy/dynamic_proxy/DynamicProxy.java
@@ -0,0 +1,38 @@
+package com.proxy.dynamic_proxy;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * @author xiang.wei
+ * @create 2018/5/28 13:21
+ */
+public class DynamicProxy implements InvocationHandler {
+    private Object target;
+
+    public DynamicProxy(Object target) {
+        this.target = target;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        perHandle();
+        method.invoke(target,args);
+        nextHandle();
+        return null;
+    }
+
+    /**
+     * 代理类前置处理
+     */
+    public void perHandle() {
+        System.out.println("代理类前置处理");
+    }
+
+    /**
+     * 代理类后置处理
+     */
+    public void nextHandle() {
+        System.out.println("代理类后置处理");
+    }
+}
diff --git a/design-patterns/src/main/java/com/proxy/dynamic_proxy/ProxyFactory.java b/design-patterns/src/main/java/com/proxy/dynamic_proxy/ProxyFactory.java
@@ -0,0 +1,40 @@
+package com.proxy.dynamic_proxy;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * @author xiang.wei
+ */
+public class ProxyFactory {
+    /**
+     * 目标对象
+     */
+    private Object target;
+
+    public ProxyFactory(Object target) {
+        this.target = target;
+    }
+
+    /**
+     * 给目标对象生成代理对象
+     * @return
+     */
+    public Object getProxyInstance() {
+        return Proxy.newProxyInstance(
+                target.getClass().getClassLoader(),
+                target.getClass().getInterfaces(),
+                new InvocationHandler() {
+                    @Override
+                    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                        System.out.println("前置处理");
+                        //执行目标对象方法
+                        Object returnValue = method.invoke(target, args);
+                        System.out.println("后置处理");
+                        return returnValue;
+                    }
+                }
+        );
+    }
+}
diff --git a/design-patterns/src/main/java/com/proxy/dynamic_proxy/RealSubject.java b/design-patterns/src/main/java/com/proxy/dynamic_proxy/RealSubject.java
@@ -1,7 +1,5 @@
 package com.proxy.dynamic_proxy;
 
-import com.proxy.static_proxy.ISubject;
-
 /**
  * Created by xiang.wei on 2018/5/28
  *

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ public static void main(String[] args) {`
`9`	`9`	`Coffee coffee1 = new Americano();`
`10`	`10`	`Coffee coffee2 = new Latte();`
`11`	`11`	`Flavour flavour = new Sugar(coffee1);`
`12`		`- System.out.println(flavour.getCoffeeInfo());`
	`12`	`+ System.out.println(flavour.getCoffeeInfo()+"现在的价格是:"+flavour.cost());`
`13`	`13`	`Flavour flavour1 = new Milk(coffee2);`
`14`		`- System.out.println(flavour1.getCoffeeInfo());`
	`14`	`+ System.out.println(flavour1.getCoffeeInfo()+"现在的价格是:"+flavour1.cost());`
`15`	`15`
`16`	`16`	`}`
`17`	`17`	`}`