+        "610404": "渭城区",

+        "610422": "三原县",

+        "610423": "泾阳县",

+        "610424": "乾县",

+        "610425": "礼泉县",

+        "610426": "永寿县",

+        "610427": "彬县",

+        "610428": "长武县",

+        "610429": "旬邑县",

+        "610430": "淳化县",

+        "610431": "武功县",

+        "610481": "兴平市"

+    },

+    "610500": {

+        "610502": "临渭区",

+        "610503": "华州区",

+        "610522": "潼关县",

+        "610523": "大荔县",

+        "610524": "合阳县",

+        "610525": "澄城县",

+        "610526": "蒲城县",

+        "610527": "白水县",

+        "610528": "富平县",

+        "610581": "韩城市",

+        "610582": "华阴市"

+    },

+    "610600": {

+        "610602": "宝塔区",

+        "610603": "安塞区",

+        "610621": "延长县",

+        "610622": "延川县",

+        "610623": "子长县",

+        "610625": "志丹县",

+        "610626": "吴起县",

+        "610627": "甘泉县",

+        "610628": "富县",

+        "610629": "洛川县",

+        "610630": "宜川县",

+        "610631": "黄龙县",

+        "610632": "黄陵县"

+    },

+    "610700": {

+        "610702": "汉台区",

+        "610721": "南郑县",

+        "610722": "城固县",

+        "610723": "洋县",

+        "610724": "西乡县",

+        "610725": "勉县",

+        "610726": "宁强县",

+        "610727": "略阳县",

+        "610728": "镇巴县",

+        "610729": "留坝县",

+        "610730": "佛坪县"

+    },

+    "610800": {

+        "610802": "榆阳区",

+        "610803": "横山区",

+        "610821": "神木县",

+        "610822": "府谷县",

+        "610824": "靖边县",

+        "610825": "定边县",

+        "610826": "绥德县",

+        "610827": "米脂县",

+        "610828": "佳县",

+        "610829": "吴堡县",

+        "610830": "清涧县",

+        "610831": "子洲县"

+    },

+    "610900": {

+        "610902": "汉滨区",

+        "610921": "汉阴县",

+        "610922": "石泉县",

+        "610923": "宁陕县",

+        "610924": "紫阳县",

+        "610925": "岚皋县",

+        "610926": "平利县",

+        "610927": "镇坪县",

+        "610928": "旬阳县",

+        "610929": "白河县"

+    },

+    "611000": {

+        "611002": "商州区",

+        "611021": "洛南县",

+        "611022": "丹凤县",

+        "611023": "商南县",

+        "611024": "山阳县",

+        "611025": "镇安县",

+        "611026": "柞水县"

+    },

+    "620000": {

+        "620100": "兰州市",

+        "620200": "嘉峪关市",

+        "620300": "金昌市",

+        "620400": "白银市",

+        "620500": "天水市",

+        "620600": "武威市",

+        "620700": "张掖市",

+        "620800": "平凉市",

+        "620900": "酒泉市",

+        "621000": "庆阳市",

+        "621100": "定西市",

+        "621200": "陇南市",

+        "622900": "临夏回族自治州",

+        "623000": "甘南藏族自治州"

+    },

+    "620100": {

+        "620102": "城关区",

+        "620103": "七里河区",

+        "620104": "西固区",

+        "620105": "安宁区",

+        "620111": "红古区",

+        "620121": "永登县",

+        "620122": "皋兰县",

+        "620123": "榆中县"

+    },

+    "620300": {

+        "620302": "金川区",

+        "620321": "永昌县"

+    },

+    "620400": {

+        "620402": "白银区",

+        "620403": "平川区",

+        "620421": "靖远县",

+        "620422": "会宁县",

+        "620423": "景泰县"

+    },

+    "620500": {

+        "620502": "秦州区",

+        "620503": "麦积区",

+        "620521": "清水县",

+        "620522": "秦安县",

+        "620523": "甘谷县",

+        "620524": "武山县",

+        "620525": "张家川回族自治县"

+    },

+    "620600": {

+        "620602": "凉州区",

+        "620621": "民勤县",

+        "620622": "古浪县",

+        "620623": "天祝藏族自治县"

+    },

+    "620700": {

+        "620702": "甘州区",

+        "620721": "肃南裕固族自治县",

+        "620722": "民乐县",

+        "620723": "临泽县",

+        "620724": "高台县",

+        "620725": "山丹县"

+    },

+    "620800": {

+        "620802": "崆峒区",

+        "620821": "泾川县",

+        "620822": "灵台县",

+        "620823": "崇信县",

+        "620824": "华亭县",

+        "620825": "庄浪县",

+        "620826": "静宁县"

+    },

+    "620900": {

+        "620902": "肃州区",

+        "620921": "金塔县",

+        "620922": "瓜州县",

+        "620923": "肃北蒙古族自治县",

+        "620924": "阿克塞哈萨克族自治县",

+        "620981": "玉门市",

+        "620982": "敦煌市"

+    },

+    "621000": {

+        "621002": "西峰区",

+        "621021": "庆城县",

+        "621022": "环县",

+        "621023": "华池县",

+        "621024": "合水县",

+        "621025": "正宁县",

+        "621026": "宁县",

+        "621027": "镇原县"

+    },

+    "621100": {

+        "621102": "安定区",

+        "621121": "通渭县",

+        "621122": "陇西县",

+        "621123": "渭源县",

+        "621124": "临洮县",

+        "621125": "漳县",

+        "621126": "岷县"

+    },

+    "621200": {

+        "621202": "武都区",

+        "621221": "成县",

+        "621222": "文县",

+        "621223": "宕昌县",

+        "621224": "康县",

+        "621225": "西和县",

+        "621226": "礼县",

+        "621227": "徽县",

+        "621228": "两当县"

+    },

+    "622900": {

+        "622901": "临夏市",

+        "622921": "临夏县",

+        "622922": "康乐县",

+        "622923": "永靖县",

+        "622924": "广河县",

+        "622925": "和政县",

+        "622926": "东乡族自治县",

+        "622927": "积石山保安族东乡族撒拉族自治县"

+    },

+    "623000": {

+        "623001": "合作市",

+        "623021": "临潭县",

+        "623022": "卓尼县",

+        "623023": "舟曲县",

+        "623024": "迭部县",

+        "623025": "玛曲县",

+        "623026": "碌曲县",

+        "623027": "夏河县"

+    },

+    "630000": {

+        "630100": "西宁市",

+        "630200": "海东市",

+        "632200": "海北藏族自治州",

+        "632300": "黄南藏族自治州",

+        "632500": "海南藏族自治州",

+        "632600": "果洛藏族自治州",

+        "632700": "玉树藏族自治州",

+        "632800": "海西蒙古族藏族自治州"

+    },

+    "630100": {

+        "630102": "城东区",

+        "630103": "城中区",

+        "630104": "城西区",

+        "630105": "城北区",

+        "630121": "大通回族土族自治县",

+        "630122": "湟中县",

+        "630123": "湟源县"

+    },

+    "630200": {

+        "630202": "乐都区",

+        "630203": "平安区",

+        "630222": "民和回族土族自治县",

+        "630223": "互助土族自治县",

+        "630224": "化隆回族自治县",

+        "630225": "循化撒拉族自治县"

+    },

+    "632200": {

+        "632221": "门源回族自治县",

+        "632222": "祁连县",

+        "632223": "海晏县",

+        "632224": "刚察县"

+    },

+    "632300": {

+        "632321": "同仁县",

+        "632322": "尖扎县",

+        "632323": "泽库县",

+        "632324": "河南蒙古族自治县"

+    },

+    "632500": {

+        "632521": "共和县",

+        "632522": "同德县",

+        "632523": "贵德县",

+        "632524": "兴海县",

+        "632525": "贵南县"

+    },

+    "632600": {

+        "632621": "玛沁县",

+        "632622": "班玛县",

+        "632623": "甘德县",

+        "632624": "达日县",

+        "632625": "久治县",

+        "632626": "玛多县"

+    },

+    "632700": {

+        "632701": "玉树市",

+        "632722": "杂多县",

+        "632723": "称多县",

+        "632724": "治多县",

+        "632725": "囊谦县",

+        "632726": "曲麻莱县"

+    },

+    "632800": {

+        "632801": "格尔木市",

+        "632802": "德令哈市",

+        "632821": "乌兰县",

+        "632822": "都兰县",

+        "632823": "天峻县"

+    },

+    "640000": {

+        "640100": "银川市",

+        "640200": "石嘴山市",

+        "640300": "吴忠市",

+        "640400": "固原市",

+        "640500": "中卫市"

+    },

+    "640100": {

+        "640104": "兴庆区",

+        "640105": "西夏区",

+        "640106": "金凤区",

+        "640121": "永宁县",

+        "640122": "贺兰县",

+        "640181": "灵武市"

+    },

+    "640200": {

+        "640202": "大武口区",

+        "640205": "惠农区",

+        "640221": "平罗县"

+    },

+    "640300": {

+        "640302": "利通区",

+        "640303": "红寺堡区",

+        "640323": "盐池县",

+        "640324": "同心县",

+        "640381": "青铜峡市"

+    },

+    "640400": {

+        "640402": "原州区",

+        "640422": "西吉县",

+        "640423": "隆德县",

+        "640424": "泾源县",

+        "640425": "彭阳县"

+    },

+    "640500": {

+        "640502": "沙坡头区",

+        "640521": "中宁县",

+        "640522": "海原县"

+    },

+    "650000": {

+        "650100": "乌鲁木齐市",

+        "650200": "克拉玛依市",

+        "650400": "吐鲁番市",

+        "650500": "哈密市",

+        "652300": "昌吉回族自治州",

+        "652700": "博尔塔拉蒙古自治州",

+        "652800": "巴音郭楞蒙古自治州",

+        "652900": "阿克苏地区",

+        "653000": "克孜勒苏柯尔克孜自治州",

+        "653100": "喀什地区",

+        "653200": "和田地区",

+        "654000": "伊犁哈萨克自治州",

+        "654200": "塔城地区",

+        "654300": "阿勒泰地区",

+        "659001": "石河子市",

+        "659002": "阿拉尔市",

+        "659003": "图木舒克市",

+        "659004": "五家渠市",

+        "659006": "铁门关市"

+    },

+    "650100": {

+        "650102": "天山区",

+        "650103": "沙依巴克区",

+        "650104": "新市区",

+        "650105": "水磨沟区",

+        "650106": "头屯河区",

+        "650107": "达坂城区",

+        "650109": "米东区",

+        "650121": "乌鲁木齐县"

+    },

+    "650200": {

+        "650202": "独山子区",

+        "650203": "克拉玛依区",

+        "650204": "白碱滩区",

+        "650205": "乌尔禾区"

+    },

+    "650400": {

+        "650402": "高昌区",

+        "650421": "鄯善县",

+        "650422": "托克逊县"

+    },

+    "650500": {

+        "650502": "伊州区",

+        "650521": "巴里坤哈萨克自治县",

+        "650522": "伊吾县"

+    },

+    "652300": {

+        "652301": "昌吉市",

+        "652302": "阜康市",

+        "652323": "呼图壁县",

+        "652324": "玛纳斯县",

+        "652325": "奇台县",

+        "652327": "吉木萨尔县",

+        "652328": "木垒哈萨克自治县"

+    },

+    "652700": {

+        "652701": "博乐市",

+        "652702": "阿拉山口市",

+        "652722": "精河县",

+        "652723": "温泉县"

+    },

+    "652800": {

+        "652801": "库尔勒市",

+        "652822": "轮台县",

+        "652823": "尉犁县",

+        "652824": "若羌县",

+        "652825": "且末县",

+        "652826": "焉耆回族自治县",

+        "652827": "和静县",

+        "652828": "和硕县",

+        "652829": "博湖县"

+    },

+    "652900": {

+        "652901": "阿克苏市",

+        "652922": "温宿县",

+        "652923": "库车县",

+        "652924": "沙雅县",

+        "652925": "新和县",

+        "652926": "拜城县",

+        "652927": "乌什县",

+        "652928": "阿瓦提县",

+        "652929": "柯坪县"

+    },

+    "653000": {

+        "653001": "阿图什市",

+        "653022": "阿克陶县",

+        "653023": "阿合奇县",

+        "653024": "乌恰县"

+    },

+    "653100": {

+        "653101": "喀什市",

+        "653121": "疏附县",

+        "653122": "疏勒县",

+        "653123": "英吉沙县",

+        "653124": "泽普县",

+        "653125": "莎车县",

+        "653126": "叶城县",

+        "653127": "麦盖提县",

+        "653128": "岳普湖县",

+        "653129": "伽师县",

+        "653130": "巴楚县",

+        "653131": "塔什库尔干塔吉克自治县"

+    },

+    "653200": {

+        "653201": "和田市",

+        "653221": "和田县",

+        "653222": "墨玉县",

+        "653223": "皮山县",

+        "653224": "洛浦县",

+        "653225": "策勒县",

+        "653226": "于田县",

+        "653227": "民丰县"

+    },

+    "654000": {

+        "654002": "伊宁市",

+        "654003": "奎屯市",

+        "654004": "霍尔果斯市",

+        "654021": "伊宁县",

+        "654022": "察布查尔锡伯自治县",

+        "654023": "霍城县",

+        "654024": "巩留县",

+        "654025": "新源县",

+        "654026": "昭苏县",

+        "654027": "特克斯县",

+        "654028": "尼勒克县"

+    },

+    "654200": {

+        "654201": "塔城市",

+        "654202": "乌苏市",

+        "654221": "额敏县",

+        "654223": "沙湾县",

+        "654224": "托里县",

+        "654225": "裕民县",

+        "654226": "和布克赛尔蒙古自治县"

+    },

+    "654300": {

+        "654301": "阿勒泰市",

+        "654321": "布尔津县",

+        "654322": "富蕴县",

+        "654323": "福海县",

+        "654324": "哈巴河县",

+        "654325": "青河县",

+        "654326": "吉木乃县"

+    },

+    "810000": {

+        "810001": "中西區",

+        "810002": "灣仔區",

+        "810003": "東區",

+        "810004": "南區",

+        "810005": "油尖旺區",

+        "810006": "深水埗區",

+        "810007": "九龍城區",

+        "810008": "黃大仙區",

+        "810009": "觀塘區",

+        "810010": "荃灣區",

+        "810011": "屯門區",

+        "810012": "元朗區",

+        "810013": "北區",

+        "810014": "大埔區",

+        "810015": "西貢區",

+        "810016": "沙田區",

+        "810017": "葵青區",

+        "810018": "離島區"

+    },

+    "820000": {

+        "820001": "花地瑪堂區",

+        "820002": "花王堂區",

+        "820003": "望德堂區",

+        "820004": "大堂區",

+        "820005": "風順堂區",

+        "820006": "嘉模堂區",

+        "820007": "路氹填海區",

+        "820008": "聖方濟各堂區"

+    }

+}

+

+

+def pre_area():

+    TamronCitiesInfo.objects.all().delete()

+

+    for province_code, province_name in AREA['86'].iteritems():

+        TamronCitiesInfo.objects.create(pk=province_code, pid=1, name=province_name)

+        try:

+            for city_code, city_name in AREA[province_code].iteritems():

+                TamronCitiesInfo.objects.create(pk=city_code, pid=province_code, name=city_name)

+        except KeyError:

+            continue

@@ -0,0 +1,7 @@

+# -*- coding: utf-8 -*-

+from __future__ import unicode_literals

+

+from django.test import TestCase

+

+

+# Create your tests here.

@@ -0,0 +1,7 @@

+# -*- coding: utf-8 -*-

+from __future__ import unicode_literals

+

+from django.shortcuts import render

+

+

+# Create your views here.

@@ -20,8 +20,8 @@ class TamronSliderInfo(models.Model):

     px = models.IntegerField(_(u'px'), default=1, help_text=u'???')

     class Meta:

-        verbose_name = _(u'轮播图')

-        verbose_name_plural = _(u'轮播图')

+        verbose_name = _(u'轮播图信息')

+        verbose_name_plural = _(u'轮播图信息')

         db_table = 'shidu_banner'

     def __unicode__(self):

@@ -41,6 +41,7 @@ INSTALLED_APPS = [

     'django.contrib.sessions',

     'django.contrib.messages',

     'django.contrib.staticfiles',

+    'area',

     'tamron',

 ]

Sākums Izpētīt Palīdzība

Reģistrēties Pierakstīties

Hanyuan

/

hanyuan

Vērot 2

Pievienot zvaigznīti 0

Atdalīts 0

Pārlūkot izejas kodu

:bug: Fix Bug: ERROR: CANT_REREAD: Invalid user name diors in section 'program:hanyuan' (file: '/etc/supervisor/conf.d/hanyuan_supervisor.conf')

huangqimin001 5 gadi atpakaļ

vecāks

400847740e

revīzija

96a1a6b372

2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām

Rādīt salīdzināšanas statistiku

1. 1 1
     hanyuan/deploy.bak/hanyuan_supervisor.ini
2. 1 1
     hanyuan/deploy.bak/hanyuan_supervisor2.ini

+ 1 - 1

hanyuan/deploy.bak/hanyuan_supervisor.ini

Parādīt failu

		@@ -9,4 +9,4 @@ stopasgroup=true
9	9	killasgroup=true
10	10	stdout_logfile=/var/log/supervisor_hanyuan_access.log
11	11	stderr_logfile=/var/log/supervisor_hanyuan_error.log
12		-user=diors
	12	+user=paiai

+ 1 - 1

hanyuan/deploy.bak/hanyuan_supervisor2.ini

Parādīt failu

		@@ -9,4 +9,4 @@ stopasgroup=true
9	9	killasgroup=true
10	10	stdout_logfile=/var/log/supervisor_hanyuan2_access.log
11	11	stderr_logfile=/var/log/supervisor_hanyuan2_error.log
12		-user=diors
	12	+user=paiai